环控

.gitignore

@@ -0,0 +1,4 @@
+/huimv-admin/target/
+.idea
+*.iml
+.log

src/main/java/com/huimv/admin/controller/BasePigpenController.java

@@ -9,6 +9,7 @@ import com.huimv.admin.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -61,6 +62,26 @@ public class BasePigpenController {
         return  basePigpenService.deletePigpen(map);
     }
 
+    @PostMapping( "/listEnvData")
+    public Result deletePigpen(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
+        return  basePigpenService.listEnvData(httpServletRequest, paramsMap);
+    }
+    @PostMapping( "/listDetail")
+    public Result listDetail(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
+        return  basePigpenService.listDetail(httpServletRequest, paramsMap);
+    }
+    @PostMapping( "/listByUnit")
+    public Result listByUnit(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
+        return  basePigpenService.listByUnit(httpServletRequest, paramsMap);
+    }
+    @PostMapping( "/listChart")
+    public Result listChart(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
+        return  basePigpenService.listChart(httpServletRequest, paramsMap);
+    }
+    @PostMapping( "/listByWarning")
+    public Result listByWarning(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
+        return  basePigpenService.listByWarning(httpServletRequest, paramsMap);
+    }
     @RequestMapping(value = "/list",method = RequestMethod.POST)
     public Result list(@RequestBody Map<String, Object> paramsMap) {
         System.out.println("paramsMap>>"+paramsMap.toString());

src/main/java/com/huimv/admin/controller/EnvDeviceController.java

@@ -39,8 +39,8 @@ public class EnvDeviceController {
     }
 
     @RequestMapping("/DeviceAdd")
-    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.add(httpServletRequest,paramsMap);
+    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody EnvDevice envDevice) {
+        return envDeviceService.add(httpServletRequest,envDevice);
     }
 
     @RequestMapping("/DeviceEdit")
@@ -82,4 +82,10 @@ public class EnvDeviceController {
         envDeviceService.updateById(envDevice);
         return new Result(10000,"解绑成功",true);
     }
+
+    @RequestMapping("/selectList")
+    public Result selectList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceService.selectList(httpServletRequest,paramsMap);
+    }
+
 }

src/main/java/com/huimv/admin/controller/EnvDeviceOnlineController.java

@@ -4,11 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvDeviceOnlineService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-device-online")
+@CrossOrigin
 public class EnvDeviceOnlineController {
 
     @Autowired

src/main/java/com/huimv/admin/controller/EnvElectricityController.java

@@ -4,11 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvElectricityService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-electricity")
+@CrossOrigin
 public class EnvElectricityController {
 
     @Autowired

src/main/java/com/huimv/admin/controller/EnvFeedController.java

@@ -4,11 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvFeedService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-feed")
+@CrossOrigin
 public class EnvFeedController {
 
     @Autowired

src/main/java/com/huimv/admin/controller/EnvWarningController.java

@@ -4,11 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvWarningService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-warning")
+@CrossOrigin
 public class EnvWarningController {
     @Autowired
     private IEnvWarningService envWarningService;

src/main/java/com/huimv/admin/controller/EnvWaterController.java

@@ -4,11 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvWaterService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-water")
+@CrossOrigin
 public class EnvWaterController {
 
     @Autowired

src/main/java/com/huimv/admin/entity/EnvAmmonia.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_ammonia")
-@ApiModel(value="EnvAmmonia对象", description="")
+
 public class EnvAmmonia implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +33,23 @@ public class EnvAmmonia implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
+
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
+
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
+
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvCo2.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,6 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_co2")
-@ApiModel(value="EnvCo2对象", description="")
 public class EnvCo2 implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +32,24 @@ public class EnvCo2 implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
+
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
+
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
+
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvDevice.java

@@ -73,5 +73,10 @@ public class EnvDevice implements Serializable {
 
     private String ohter3;
 
+    private String deviceSortCode;
+
+    private Integer dayAge;
+
+    private Integer stageType;
 
 }

src/main/java/com/huimv/admin/entity/EnvDeviceFan.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,7 +21,6 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_device_fan")
-@ApiModel(value="EnvDeviceFan对象", description="")
 public class EnvDeviceFan implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -31,22 +28,21 @@ public class EnvDeviceFan implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "传感器id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "更新时间")
+
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "传感器名字")
+
     private String chipName;
 
-    @ApiModelProperty(value = "0:未安装  1:异常 2:开启  3:关闭 4:异常")
     private Integer chipStatus;
 
-    @ApiModelProperty(value = "值")
+
     private String chipValue;
 
     private Integer farmId;
@@ -57,5 +53,5 @@ public class EnvDeviceFan implements Serializable {
 
     private String other3;
 
-
+    private Integer fengType;
 }

src/main/java/com/huimv/admin/entity/EnvDeviceFenestrule.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,7 +21,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_device_fenestrule")
-@ApiModel(value="EnvDeviceFenestrule对象", description="")
+
 public class EnvDeviceFenestrule implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -31,22 +29,22 @@ public class EnvDeviceFenestrule implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "传感器id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "更新时间")
+
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "传感器名字")
+
     private String chipName;
 
-    @ApiModelProperty(value = "0:未安装  1:异常 2:开启  3:关闭")
+
     private Integer chipStatus;
 
-    @ApiModelProperty(value = "值")
+
     private String chipValue;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvDeviceOther.java

@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_device_other")
-@ApiModel(value="EnvDeviceOther对象", description="")
+
 public class EnvDeviceOther implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -31,19 +30,19 @@ public class EnvDeviceOther implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "传感器id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "更新时间")
+
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "传感器名字")
+
     private String chipName;
 
-    @ApiModelProperty(value = "0:未安装  1:开启 2:关闭  3:异常")
+
     private Integer chipStatus;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvDeviceRecentlyData.java

@@ -5,8 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,7 +24,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_device_recently_data")
-@ApiModel(value="EnvDeviceRecentlyData对象", description="")
+
 public class EnvDeviceRecentlyData implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -31,26 +32,24 @@ public class EnvDeviceRecentlyData implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "传感器id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "值")
+
     private String chipValue;
 
-    @ApiModelProperty(value = "1:温度1   2:温度2  3:温度3  4:温度4  5:温度5  6:温度6  7:室外温度  8:湿度  9:压力  10:粉尘  11:氨气  12:co2  13:平均温度  14:目标湿度  15:通风级别  16:加热  17:水暖湿度")
+
     private Integer chipType;
 
-    @ApiModelProperty(value = "传感器名字")
     private String chipName;
 
-    @ApiModelProperty(value = "0:未安装 1:正常  2:异常")
     private Integer chipStatus;
 
-    @ApiModelProperty(value = "更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date updateTime;
 
     private Integer farmId;
 

src/main/java/com/huimv/admin/entity/EnvElectricity.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +23,6 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_electricity")
-@ApiModel(value="EnvElectricity对象", description="")
 public class EnvElectricity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +30,21 @@ public class EnvElectricity implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
+
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
+
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
+
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvFeed.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,6 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_feed")
-@ApiModel(value="EnvFeed对象", description="")
 public class EnvFeed implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +32,18 @@ public class EnvFeed implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
     private LocalDateTime askTime;
-
-    @ApiModelProperty(value = "入库时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvHumi.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,6 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_humi")
-@ApiModel(value="EnvHumi对象", description="")
 public class EnvHumi implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +32,24 @@ public class EnvHumi implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
+
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
+
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
+
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvPressure.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_pressure")
-@ApiModel(value="EnvPressure对象", description="")
+
 public class EnvPressure implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +33,26 @@ public class EnvPressure implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
+
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
+
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
+
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
+
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvStive.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_stive")
-@ApiModel(value="EnvStive对象", description="")
+
 public class EnvStive implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +33,25 @@ public class EnvStive implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
+
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
+
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
+
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvTemp.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_temp")
-@ApiModel(value="EnvTemp对象", description="")
+
 public class EnvTemp implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +33,25 @@ public class EnvTemp implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
+
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
-    private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
-    private BigDecimal handleValue;
+    private String originalValue;
+
 
-    @ApiModelProperty(value = "应答时间")
+    private String handleValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
+
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/EnvWarning.java

@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_warning")
-@ApiModel(value="EnvWarning对象", description="")
+
 public class EnvWarning implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/huimv/admin/entity/EnvWater.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("env_water")
-@ApiModel(value="EnvWater对象", description="")
+
 public class EnvWater implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,25 +33,24 @@ public class EnvWater implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "芯片id")
+
     private String chipCode;
 
-    @ApiModelProperty(value = "设备id")
+
     private String deviceCode;
 
-    @ApiModelProperty(value = "栋舍id")
+
     private String unitId;
 
-    @ApiModelProperty(value = "原始值记录")
     private BigDecimal originalValue;
 
-    @ApiModelProperty(value = "处理后的值")
+
     private BigDecimal handleValue;
 
-    @ApiModelProperty(value = "应答时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime askTime;
 
-    @ApiModelProperty(value = "入库时间")
+
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/entity/MemberInfo.java

@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("member_info")
-@ApiModel(value="MemberInfo对象", description="")
+
 public class MemberInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/huimv/admin/entity/SysAccountMultilevel.java

@@ -45,5 +45,6 @@ public class SysAccountMultilevel extends Model {
 
     private String userName;
     private Integer type;
+    private String farmNames;
 
 }

src/main/java/com/huimv/admin/entity/dto/ListChartDto.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class ListChartDto {
+
+    /*设备总数*/
+    private String temp;
+
+    /*在线设备*/
+    private String humi;
+
+    private String NH3;
+
+    private String CO2;
+
+    private String stive;
+
+    private String pressure;
+
+
+}

src/main/java/com/huimv/admin/service/IBasePigpenService.java

@@ -5,6 +5,7 @@ import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.BasePigpen;
 import com.huimv.admin.entity.dto.BasePigpenDto;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -25,5 +26,17 @@ public interface IBasePigpenService extends IService<BasePigpen> {
 
     Result deletePigpen(Map<String, Integer> map);
 
+
+    //环控
+    Result listEnvData(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listDetail(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);//鸡舍内部构造详情
+
+    Result listByUnit(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);//单元数据详情
+
+    Result listChart(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);//图表详情
+
+    Result listByWarning(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);//预警信息
+
     Result countAll(Map<String, String> paramsMap);
 }

src/main/java/com/huimv/admin/service/IEnvDeviceService.java

@@ -20,7 +20,7 @@ public interface IEnvDeviceService extends IService<EnvDevice> {
 
     Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    Result add(HttpServletRequest httpServletRequest, EnvDevice envDevice);
 
     Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
@@ -34,6 +34,8 @@ public interface IEnvDeviceService extends IService<EnvDevice> {
 
 //    Result sync(Map<String, String> params) throws Exception;
 
+    Result selectList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
     Result bandingUnitId(HttpServletRequest httpServletRequest, EnvDevice envDevice);
 
     Result listPigpenAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);

src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -2,9 +2,14 @@ package com.huimv.admin.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
@@ -15,21 +20,20 @@ import com.huimv.admin.entity.dto.BasePigpenDto;
 import com.huimv.admin.entity.vo.BasePigpenCountVo;
 import com.huimv.admin.entity.vo.TreeBasePigpen;
 import com.huimv.admin.mapper.*;
-import com.huimv.admin.service.*;
+import com.huimv.admin.service.IBasePigpenService;
+import com.huimv.admin.service.IEnvWarningService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -42,6 +46,29 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     @Autowired
     private EnvDeviceMapper envDeviceMapper;
     @Autowired
+    private EnvDeviceRecentlyDataMapper envDeviceRecentlyDataMapper;
+    @Autowired
+    private EnvWarningMapper envWarningMapper;
+    @Autowired
+    private EnvDeviceFanMapper fanMapper;//feng
+    @Autowired
+    private EnvDeviceFenestruleMapper fenestruleMapper;//chuang
+    @Autowired
+    private EnvDeviceOtherMapper otherMapper;//other
+    @Autowired
+    private EnvTempMapper tempMapper;
+    @Autowired
+    private EnvHumiMapper humiMapper;
+    @Autowired
+    private EnvCo2Mapper co2Mapper;
+    @Autowired
+    private EnvAmmoniaMapper ammoniaMapper;
+    @Autowired
+    private EnvStiveMapper stiveMapper;
+    @Autowired
+    private EnvPressureMapper pressureMapper;
+
+    @Autowired
     private IBasePigpenService basePigpenService;
     @Autowired
     private IEnvWarningService envWarningService;
@@ -55,12 +82,12 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     @Override
     @Transactional
     public Result addPigpen(BasePigpenDto basePigpenDto) {
-        Integer  num = basePigpenMapper.selectCount(new QueryWrapper<BasePigpen>().eq("build_name", basePigpenDto.getBuildName()));
-        if (num  > 0){
+        Integer num = basePigpenMapper.selectCount(new QueryWrapper<BasePigpen>().eq("build_name", basePigpenDto.getBuildName()));
+        if (num > 0) {
             return ResultUtil.exist();
         }
         BasePigpen basePigpen = new BasePigpen();
-        BeanUtil.copyProperties(basePigpenDto,basePigpen);
+        BeanUtil.copyProperties(basePigpenDto, basePigpen);
         basePigpen.setParentId(0);
         basePigpen.setFType(1);
         basePigpen.setOther2("0");
@@ -72,9 +99,9 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             BasePigpen basePigpen1 = new BasePigpen();
             basePigpen1.setFType(2);
             basePigpen1.setParentId(id);
-            basePigpen1.setBuildName(buildName+Convert.numberToChinese(integer,false) +"层");
-            basePigpen1.setOther1(Convert.numberToChinese(integer,false) +"层");
-            basePigpen1.setOther2("0,"+id);
+            basePigpen1.setBuildName(buildName + Convert.numberToChinese(integer, false) + "层");
+            basePigpen1.setOther1(Convert.numberToChinese(integer, false) + "层");
+            basePigpen1.setOther2("0," + id);
             basePigpen1.setFarmId(basePigpen.getFarmId());
             basePigpen1.setStageCode(basePigpen.getStageCode());
             basePigpenMapper.insert(basePigpen1);
@@ -89,10 +116,10 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         Integer id = basePigpen.getId();
         List<BasePigpen> parentId = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().eq("parent_id", id));
         String buildName = basePigpen.getBuildName();
-        if (StringUtils.isNotBlank(buildName)){
+        if (StringUtils.isNotBlank(buildName)) {
             for (BasePigpen pigpen : parentId) {
                 String other1 = pigpen.getOther1();
-                pigpen.setBuildName(buildName+other1);
+                pigpen.setBuildName(buildName + other1);
                 basePigpenMapper.updateById(pigpen);
             }
         }
@@ -104,14 +131,14 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     public Result deletePigpen(Map<String, Integer> map) {
         Integer integer = map.get("id");
         Integer integer1 = envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("unit_id", integer));
-        if (integer1 > 0){
-            return new Result(10001,"删除失败，该栋舍下有采集器",false);
+        if (integer1 > 0) {
+            return new Result(10001, "删除失败，该栋舍下有采集器", false);
         }
         List<BasePigpen> other2 = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().like("other2", integer));
         for (BasePigpen basePigpen : other2) {
             Integer count = envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("unit_id", basePigpen.getId()));
-            if (count > 0){
-                return new Result(10001,"删除失败，该栋舍下有采集器",false);
+            if (count > 0) {
+                return new Result(10001, "删除失败，该栋舍下有采集器", false);
             }
             basePigpenMapper.deleteById(basePigpen);
         }
@@ -120,6 +147,313 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     }
 
     @Override
+    public Result listEnvData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("f_type", 3);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//拿到了所有的单元的集合
+        JSONArray jsonArray = new JSONArray();
+        for (BasePigpen basePigpen : basePigpens) {
+            Integer basePigpenId = basePigpen.getId();
+            QueryWrapper<EnvDevice> deviceQueryWrapper = new QueryWrapper<>();
+            deviceQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpenId);
+            EnvDevice envDevice = envDeviceMapper.selectOne(deviceQueryWrapper);//拿到单元绑定的设备
+            if (ObjectUtil.isEmpty(envDevice)) {
+                QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).eq("id", basePigpen.getParentId());
+                BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", basePigpen1.getBuildName() + basePigpen.getBuildName());
+                jsonObject.put("value", 0);
+                jsonObject.put("warning", "未绑定设备");
+                jsonObject.put("dayAge", null);
+                jsonObject.put("status", null);
+                jsonObject.put("unitId", basePigpenId);
+                jsonObject.put("type", false);
+                jsonArray.add(jsonObject);
+            } else {
+                String deviceSortCode = envDevice.getDeviceSortCode();
+                QueryWrapper<EnvDeviceRecentlyData> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).eq("device_code", deviceSortCode)
+                        .orderByAsc("chip_type");
+                List<EnvDeviceRecentlyData> envDeviceRecentlyData = envDeviceRecentlyDataMapper.selectList(queryWrapper1);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", envDevice.getBuildLocation());
+                jsonObject.put("value", envDeviceRecentlyData);
+                jsonObject.put("dayAge", envDevice.getDayAge());
+                jsonObject.put("status", envDevice.getStageType());
+                jsonObject.put("unitId", envDevice.getUnitId());
+                jsonObject.put("type", true);
+                QueryWrapper<EnvWarning> warningQueryWrapper = new QueryWrapper<>();
+                warningQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpenId)
+                        .eq("warning_type", 8).orderByDesc("update_time").last(" limit 1");
+                EnvWarning envWarning = envWarningMapper.selectOne(warningQueryWrapper);
+                if (ObjectUtil.isEmpty(envWarning)) {
+                    jsonObject.put("warning", null);
+                } else {
+                    jsonObject.put("warning", envWarning.getWarningContent());
+                }
+                jsonArray.add(jsonObject);
+            }
+        }
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
+
+    @Override
+    public Result listDetail(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");//单元id
+        QueryWrapper<EnvDevice> deviceQueryWrapper = new QueryWrapper<>();
+        deviceQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId);
+        EnvDevice envDevice = envDeviceMapper.selectOne(deviceQueryWrapper);//单元对应的设备
+        String deviceSortCode = envDevice.getDeviceSortCode();//生成的设备编码
+
+        Map<String, Object> map = new HashMap<>();
+
+        //风机
+        QueryWrapper<EnvDeviceFan> fanQueryWrapper = new QueryWrapper<>();
+        fanQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceFan> envDeviceFans = fanMapper.selectList(fanQueryWrapper);
+        JSONArray jsonArray = new JSONArray();
+        for (EnvDeviceFan envDeviceFan : envDeviceFans) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDeviceFan.getChipName());
+            jsonObject.put("status", envDeviceFan.getChipStatus());
+            jsonObject.put("type", envDeviceFan.getFengType());
+            jsonArray.add(jsonObject);
+        }
+        map.put("fengji", jsonArray);
+        //小窗
+        JSONArray jsonArray1 = new JSONArray();
+        QueryWrapper<EnvDeviceFenestrule> fenestruleQueryWrapper = new QueryWrapper<>();
+        fenestruleQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceFenestrule> envDeviceFenestrules = fenestruleMapper.selectList(fenestruleQueryWrapper);
+        for (EnvDeviceFenestrule envDeviceFenestrule : envDeviceFenestrules) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDeviceFenestrule.getChipName());
+            jsonObject.put("status", envDeviceFenestrule.getChipStatus());
+            jsonArray1.add(jsonObject);
+        }
+        map.put("xiaochuang", jsonArray1);
+        //其他
+        JSONArray jsonArray2 = new JSONArray();
+        QueryWrapper<EnvDeviceOther> otherQueryWrapper = new QueryWrapper<>();
+        otherQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceOther> envDeviceOthers = otherMapper.selectList(otherQueryWrapper);
+        for (EnvDeviceOther envDeviceOther : envDeviceOthers) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDeviceOther.getChipName());
+            jsonObject.put("status", envDeviceOther.getChipStatus());
+            jsonArray2.add(jsonObject);
+        }
+        map.put("other", jsonArray2);
+        //实时数据
+        JSONArray jsonArray3 = new JSONArray();
+        QueryWrapper<EnvDeviceRecentlyData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceRecentlyData> envDeviceRecentlyData = envDeviceRecentlyDataMapper.selectList(queryWrapper);
+        for (int i = 0; i < envDeviceRecentlyData.size(); i++) {
+            if (i < 11) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", envDeviceRecentlyData.get(i).getChipName());
+                jsonObject.put("value", envDeviceRecentlyData.get(i).getChipValue());
+                jsonObject.put("unit", "℃");
+                jsonArray3.add(jsonObject);
+            } else if (i > 10 && i < 14) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", envDeviceRecentlyData.get(i).getChipName());
+                jsonObject.put("value", envDeviceRecentlyData.get(i).getChipValue());
+                jsonObject.put("unit", "RH");
+                jsonArray3.add(jsonObject);
+            } else {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", envDeviceRecentlyData.get(i).getChipName());
+                jsonObject.put("value", envDeviceRecentlyData.get(i).getChipValue());
+                jsonObject.put("unit", "");
+                jsonArray3.add(jsonObject);
+            }
+        }
+        map.put("price", jsonArray3);
+        return new Result(ResultCode.SUCCESS, map);
+    }
+
+    @Override
+    public Result listByUnit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId);
+        EnvDevice envDevice = envDeviceMapper.selectOne(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("name", envDevice.getBuildLocation());
+        jsonObject.put("dayAge", envDevice.getDayAge());
+        jsonObject.put("status", envDevice.getStageType());
+        QueryWrapper<EnvDeviceRecentlyData> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).eq("device_code", envDevice.getDeviceSortCode())
+                .orderByAsc("chip_type");
+        List<EnvDeviceRecentlyData> envDeviceRecentlyData = envDeviceRecentlyDataMapper.selectList(queryWrapper1);
+        for (int i = 0; i < envDeviceRecentlyData.size(); i++) {
+            jsonObject.put("targetTemp", envDeviceRecentlyData.get(9).getChipValue());
+            jsonObject.put("aveTemp", envDeviceRecentlyData.get(10).getChipValue());
+            jsonObject.put("bodyTemp", envDeviceRecentlyData.get(22).getChipValue());
+            jsonObject.put("humi", envDeviceRecentlyData.get(11).getChipValue());
+        }
+
+        DateTime dateTime = DateUtil.beginOfDay(new Date());
+        QueryWrapper<EnvTemp> tempQueryWrapper = new QueryWrapper<>();
+        tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).ge("ask_time", dateTime)
+                .orderByDesc("handle_value").last(" limit 1");
+        EnvTemp temp = tempMapper.selectOne(tempQueryWrapper);
+        jsonObject.put("maxTemp", temp.getHandleValue());
+        QueryWrapper<EnvTemp> tempQueryWrapper1 = new QueryWrapper<>();
+
+        tempQueryWrapper1.eq("farm_id", farmId).eq("unit_id", unitId).ge("ask_time", dateTime)
+                .orderByAsc("handle_value").last(" limit 1");
+        EnvTemp temp1 = tempMapper.selectOne(tempQueryWrapper1);
+        jsonObject.put("minTemp", temp1.getHandleValue());
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @Override
+    public Result listChart(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String dataType = paramsMap.get("dataType");//数据类型
+        String unitId = paramsMap.get("unitId");
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+        if (dataType == "" || dataType == null) {
+            dataType = "1";
+        }
+        Map map = new HashMap<>();
+        if (startTime == null || startTime == "") {
+            //今日数据展示
+            Date timesmorning = DataUill.getTimesmorning();
+            if ("1".equals(dataType)) {
+                QueryWrapper<EnvTemp> tempQueryWrapper = new QueryWrapper<>();
+                tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                List<EnvTemp> envTemps = tempMapper.selectList(tempQueryWrapper);
+                map.put("name", "temp");
+                map.put("value", envTemps);
+            }
+            if ("2".equals(dataType)) {
+                QueryWrapper<EnvHumi> humiQueryWrapper = new QueryWrapper<>();
+                humiQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                List<EnvHumi> envHumis = humiMapper.selectList(humiQueryWrapper);
+                map.put("name", "humi");
+                map.put("value", envHumis);
+            }
+            if ("3".equals(dataType)) {
+                QueryWrapper<EnvAmmonia> ammoniaQueryWrapper = new QueryWrapper<>();
+                ammoniaQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                List<EnvAmmonia> ammonias = ammoniaMapper.selectList(ammoniaQueryWrapper);
+                map.put("name", "ammonias");
+                map.put("value", ammonias);
+            }
+            if ("4".equals(dataType)) {
+                QueryWrapper<EnvCo2> co2QueryWrapper = new QueryWrapper<>();
+                co2QueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                List<EnvCo2> co2s = co2Mapper.selectList(co2QueryWrapper);
+                map.put("name", "CO2");
+                map.put("value", co2s);
+            }
+            if ("5".equals(dataType)) {
+                QueryWrapper<EnvStive> stiveQueryWrapper = new QueryWrapper<>();
+                stiveQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                List<EnvStive> stives = stiveMapper.selectList(stiveQueryWrapper);
+                map.put("name", "stive");
+                map.put("value", stives);
+            }
+            if ("6".equals(dataType)) {
+                QueryWrapper<EnvPressure> pressureQueryWrapper = new QueryWrapper<>();
+                pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                List<EnvPressure> pressures = pressureMapper.selectList(pressureQueryWrapper);
+                map.put("name", "pressure");
+                map.put("value", pressures);
+            }
+
+        } else {
+            //自定义查询
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            if ("1".equals(dataType)) {
+                QueryWrapper<EnvTemp> tempQueryWrapper = new QueryWrapper<>();
+                tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                List<EnvTemp> envTemps = tempMapper.selectList(tempQueryWrapper);
+                map.put("name", "temp");
+                map.put("value", envTemps);
+            }
+            if ("2".equals(dataType)) {
+                QueryWrapper<EnvHumi> humiQueryWrapper = new QueryWrapper<>();
+                humiQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                List<EnvHumi> envHumis = humiMapper.selectList(humiQueryWrapper);
+                map.put("name", "humi");
+                map.put("value", envHumis);
+            }
+            if ("3".equals(dataType)) {
+                QueryWrapper<EnvAmmonia> ammoniaQueryWrapper = new QueryWrapper<>();
+                ammoniaQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                List<EnvAmmonia> ammonias = ammoniaMapper.selectList(ammoniaQueryWrapper);
+                map.put("name", "ammonias");
+                map.put("value", ammonias);
+            }
+            if ("4".equals(dataType)) {
+                QueryWrapper<EnvCo2> co2QueryWrapper = new QueryWrapper<>();
+                co2QueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                List<EnvCo2> co2s = co2Mapper.selectList(co2QueryWrapper);
+                map.put("name", "CO2");
+                map.put("value", co2s);
+            }
+            if ("5".equals(dataType)) {
+                QueryWrapper<EnvStive> stiveQueryWrapper = new QueryWrapper<>();
+                stiveQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                List<EnvStive> stives = stiveMapper.selectList(stiveQueryWrapper);
+                map.put("name", "stive");
+                map.put("value", stives);
+            }
+            if ("6".equals(dataType)) {
+                QueryWrapper<EnvPressure> pressureQueryWrapper = new QueryWrapper<>();
+                pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                List<EnvPressure> pressures = pressureMapper.selectList(pressureQueryWrapper);
+                map.put("name", "pressure");
+                map.put("value", pressures);
+            }
+        }
+
+        return new Result(ResultCode.SUCCESS, map);
+    }
+
+    @Override
+    public Result listByWarning(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if (pageNum == null || pageNum == "") {
+            pageNum = "1";
+        }
+        if (pageSize == null || pageSize == "") {
+            pageSize = "20";
+        }
+        QueryWrapper<EnvWarning> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId);
+        Page<EnvWarning> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        Page<EnvWarning> envWarningPage = envWarningMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS, envWarningPage);
+    }
+
+    @Override
     public Result countAll(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         Date timesMonthmorning = DataUill.getTimesMonthmorning();
@@ -128,85 +462,86 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         //牧场栋舍
         basePigpenCountVo.setBuildingNum(basePigpenService.count(new QueryWrapper<BasePigpen>()
                 .eq("f_type", 1)
-                .eq("farm_id",farmId)));
+                .eq("farm_id", farmId)));
         basePigpenCountVo.setStoreyNum(basePigpenService.count(new QueryWrapper<BasePigpen>()
-                .eq("f_type",2)
-                .eq("farm_id",farmId)));
+                .eq("f_type", 2)
+                .eq("farm_id", farmId)));
         basePigpenCountVo.setUnitNum(basePigpenService.count(new QueryWrapper<BasePigpen>()
-                .eq("f_type",3)
-                .eq("farm_id",farmId)));
+                .eq("f_type", 3)
+                .eq("farm_id", farmId)));
         //牧场预警
         basePigpenCountVo.setMonthWarning(envWarningService.count(new QueryWrapper<EnvWarning>()
-                .ge("update_time",timesMonthmorning)
-                .eq("farm_id",farmId)));
+                .ge("update_time", timesMonthmorning)
+                .eq("farm_id", farmId)));
         basePigpenCountVo.setDayWarning(envWarningService.count(new QueryWrapper<EnvWarning>()
-                .ge("update_time",timesmorning)
-                .eq("farm_id",farmId)));
+                .ge("update_time", timesmorning)
+                .eq("farm_id", farmId)));
         BigDecimal monthWater = envWaterMapper.getWater(new QueryWrapper<EnvWater>().ge("update_time", timesMonthmorning).eq("farm_id", farmId));
-        if (ObjectUtil.isNull(monthWater)){
+        if (ObjectUtil.isNull(monthWater)) {
             monthWater = BigDecimal.ZERO;
         }
         basePigpenCountVo.setMonthWater(monthWater);
         BigDecimal dayWater = envWaterMapper.getWater(new QueryWrapper<EnvWater>().ge("update_time", timesmorning).eq("farm_id", farmId));
-        if (ObjectUtil.isNull(dayWater)){
+        if (ObjectUtil.isNull(dayWater)) {
             dayWater = BigDecimal.ZERO;
         }
         basePigpenCountVo.setDayWater(dayWater);
         BigDecimal monthElectricity = envElectricityMapper.getElectricity(new QueryWrapper<EnvElectricity>()
                 .ge("update_time", timesMonthmorning)
                 .eq("farm_id", farmId));
-        if (ObjectUtil.isNull(monthElectricity)){
+        if (ObjectUtil.isNull(monthElectricity)) {
             monthElectricity = BigDecimal.ZERO;
         }
         basePigpenCountVo.setMonthElectricity(monthElectricity);
         BigDecimal dayElectricity = envElectricityMapper.getElectricity(new QueryWrapper<EnvElectricity>()
                 .ge("update_time", timesmorning)
                 .eq("farm_id", farmId));
-        if (ObjectUtil.isNull(dayElectricity)){
+        if (ObjectUtil.isNull(dayElectricity)) {
             dayElectricity = BigDecimal.ZERO;
         }
         basePigpenCountVo.setDayElectricity(dayElectricity);
         BigDecimal monthFeed = envFeedMapper.getFeed(new QueryWrapper<EnvFeed>()
                 .ge("update_time", timesMonthmorning)
                 .eq("farm_id", farmId));
-        if (ObjectUtil.isNull(monthFeed)){
+        if (ObjectUtil.isNull(monthFeed)) {
             monthFeed = BigDecimal.ZERO;
         }
         basePigpenCountVo.setMonthFeed(monthFeed);
         BigDecimal dayFeed = envFeedMapper.getFeed(new QueryWrapper<EnvFeed>()
                 .ge("update_time", timesmorning)
                 .eq("farm_id", farmId));
-        if (ObjectUtil.isNull(dayFeed)){
+        if (ObjectUtil.isNull(dayFeed)) {
             dayFeed = BigDecimal.ZERO;
         }
         basePigpenCountVo.setDayFeed(dayFeed);
-        return new Result(ResultCode.SUCCESS,basePigpenCountVo);
+        return new Result(ResultCode.SUCCESS, basePigpenCountVo);
     }
 
     @Override
     public Result list(String farmCode, String buildName, String stageCode) {
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(buildName),"build_name", buildName);
-        queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
-        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_id", farmCode);
+        queryWrapper.like(StringUtils.isNotBlank(buildName), "build_name", buildName);
+        queryWrapper.like(StringUtils.isNotBlank(stageCode), "stage_code", stageCode);
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode), "farm_id", farmCode);
         queryWrapper.orderByAsc("sort");
         //创建排序
         List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
         //将结果List改为树
         List<TreeBasePigpen> treeBasePigpens = parseBizBaseArea(basePigpens);
-        return new Result(ResultCode.SUCCESS,treeBasePigpens);
+        return new Result(ResultCode.SUCCESS, treeBasePigpens);
     }
 
     /**
      * 查询结果 转换成树形结构
+     *
      * @param bizBaseAreas 原始数据
      * @return 树
      */
-    private List<TreeBasePigpen> parseBizBaseArea(List<BasePigpen> bizBaseAreas){
+    private List<TreeBasePigpen> parseBizBaseArea(List<BasePigpen> bizBaseAreas) {
         //构建需要展示的树形节点结构
         Map<String, TreeBasePigpen> nodeMap = bizBaseAreas.stream().map(basePigpen -> {
-            TreeBasePigpen  baseVo = new TreeBasePigpen();
-            baseVo.setId(basePigpen.getId()+"");
+            TreeBasePigpen baseVo = new TreeBasePigpen();
+            baseVo.setId(basePigpen.getId() + "");
             baseVo.setFarmCode(basePigpen.getFarmId());
             baseVo.setParentId(basePigpen.getParentId());
             baseVo.setSort(basePigpen.getSort());
@@ -215,16 +550,16 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             baseVo.setType(basePigpen.getFType());
             baseVo.setChildNode(new ArrayList<>());
             return baseVo;
-        }).collect(Collectors.toMap(TreeBasePigpen::getId, b -> b,(k1, k2)->k1));
+        }).collect(Collectors.toMap(TreeBasePigpen::getId, b -> b, (k1, k2) -> k1));
         //创建数组存父亲节点
         ArrayList<TreeBasePigpen> roots = new ArrayList<>();
         //构建树形
-        nodeMap.values().forEach(item->{
-            String parentCode = item.getParentId()+"";
-            if (nodeMap.get(parentCode) == null){
+        nodeMap.values().forEach(item -> {
+            String parentCode = item.getParentId() + "";
+            if (nodeMap.get(parentCode) == null) {
                 //父节点为空，说明当前节点就已经是父节点了 将该节点存起来
                 roots.add(item);
-            }else {
+            } else {
                 //父节点 不为空，说明有父节点，拿到该节点的父节点的孩子节点（就是我自己),将该节点存起来
                 nodeMap.get(parentCode).getChildNode().add(item);
             }

src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -13,12 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
-import com.huimv.admin.entity.BasePigpen;
-import com.huimv.admin.entity.EnvData;
-import com.huimv.admin.entity.EnvDevice;
-import com.huimv.admin.mapper.BasePigpenMapper;
-import com.huimv.admin.mapper.EnvDataMapper;
-import com.huimv.admin.mapper.EnvDeviceMapper;
+import com.huimv.admin.entity.*;
+import com.huimv.admin.mapper.*;
 import com.huimv.admin.service.IEnvDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
@@ -52,6 +48,26 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     private BasePigpenMapper basePigpenMapper;
     @Autowired
     private EnvDataMapper dataMapper;
+    @Autowired
+    private EnvDeviceRecentlyDataMapper envDeviceRecentlyDataMapper;
+    @Autowired
+    private EnvCo2Mapper co2Mapper;//CO2
+    @Autowired
+    private EnvAmmoniaMapper ammoniaMapper;//氨气
+    @Autowired
+    private EnvTempMapper tempMapper;//温度
+    @Autowired
+    private EnvHumiMapper humiMapper;//湿度
+    @Autowired
+    private EnvStiveMapper stiveMapper;//粉尘
+    @Autowired
+    private EnvPressureMapper pressureMapper;//压力
+    @Autowired
+    private EnvDeviceFanMapper fanMapper;//风机
+    @Autowired
+    private EnvDeviceFenestruleMapper fenestruleMapper;//小窗
+    @Autowired
+    private EnvDeviceOtherMapper otherMapper;//
 //    @Autowired
 //    private RestTemplate restTemplate;
 
@@ -71,12 +87,12 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("device_status", 1);
             Integer count1 = envDeviceMapper.selectCount(queryWrapper1);
-            Integer OffDeviceCount = count- count1;
+            Integer OffDeviceCount = count - count1;
             //创建一个数值格式化对象
             NumberFormat numberFormat = NumberFormat.getInstance();
             //设置精确到小数点后两位
             numberFormat.setMaximumFractionDigits(2);
-            String onDeviceRate = numberFormat.format((float)count1 / (float) count* 100) + "%";
+            String onDeviceRate = numberFormat.format((float) count1 / (float) count * 100) + "%";
             jsonObject.put("DeviceCount", count);
             jsonObject.put("OnDeviceCount", count1);
             jsonObject.put("OffDeviceCount", OffDeviceCount);
@@ -90,53 +106,238 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         String farmId = paramsMap.get("farmId");
         String pageSize = paramsMap.get("pageSize");
         String pageNo = paramsMap.get("pageNo");
-        if (pageSize==null||pageSize=="") {
+        if (pageSize == null || pageSize == "") {
             pageSize = "10";
         }
-        if (pageNo==null||pageNo=="") {
+        if (pageNo == null || pageNo == "") {
             pageNo = "1";
         }
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,envDeviceMapper.selectPage(page, queryWrapper));
+        Page<EnvDevice> page = new Page(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, envDeviceMapper.selectPage(page, queryWrapper));
     }
 
     @Override
-    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
-        String DeviceName = paramsMap.get("DeviceName");
-        String BuildLocation = paramsMap.get("BuildLocation");
-        String DeviceBrand = paramsMap.get("DeviceBrand");
-        String remark = paramsMap.get("remark");
-        if (remark == null || remark == "") {
-            remark = null;
-        }
+    public Result add(HttpServletRequest httpServletRequest, EnvDevice envDevice1) {
 
         EnvDevice envDevice = new EnvDevice();
-        envDevice.setFarmId(Integer.parseInt(farmId));
-        envDevice.setDeviceName(DeviceName);
-        envDevice.setBuildLocation(BuildLocation);
-        envDevice.setDeviceBrand(DeviceBrand);
-        envDevice.setRemark(remark);
+        envDevice.setFarmId(envDevice1.getFarmId());
+        envDevice.setDeviceCode(envDevice1.getDeviceCode());
+        envDevice.setDeviceName(envDevice1.getDeviceName());
+        envDevice.setBuildLocation(envDevice1.getBuildLocation());
+        envDevice.setUnitId(envDevice1.getUnitId());
+        envDevice.setUnitName(envDevice1.getUnitName());
+        envDevice.setDeviceBrand(envDevice1.getDeviceBrand());
+        envDevice.setRemark(envDevice1.getRemark());
+        envDevice.setDeviceStatus(0);
+        envDevice.setDayAge(envDevice1.getDayAge());
+
+        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+        basePigpenQueryWrapper.eq("farm_id", envDevice1.getFarmId()).eq("id", envDevice1.getUnitId());
+        BasePigpen basePigpen = basePigpenMapper.selectOne(basePigpenQueryWrapper);
+        envDevice.setStageType(basePigpen.getStageCode());
+
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_name", DeviceName).eq("farm_id",farmId);
+        queryWrapper.eq("device_name", envDevice1.getDeviceName()).eq("farm_id", envDevice1.getFarmId())
+                .or().eq("device_code", envDevice1.getDeviceCode());
         EnvDevice device = envDeviceMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(device)) {
+            QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", envDevice1.getFarmId());
+            Integer integer = envDeviceMapper.selectCount(queryWrapper1);
+            if (integer == 0) {
+                envDevice.setDeviceSortCode("100" + 01);
+                addAll(envDevice);
+            } else {
+                queryWrapper1.orderByDesc("id").last(" limit 1");
+                EnvDevice envDevice2 = envDeviceMapper.selectOne(queryWrapper1);
+                envDevice.setDeviceSortCode(envDevice2.getDeviceSortCode() + 1);
+                addAll(envDevice);
+            }
             envDeviceMapper.insert(envDevice);
+
+            return new Result(ResultCode.SUCCESS, "添加成功");
         } else {
-            return new Result(ResultCode.FAIL, "设备名称已存在");
+            return new Result(ResultCode.FAIL, "添加失败，设备名称或设备编码已存在");
         }
-        return new Result(ResultCode.SUCCESS,"添加成功");
+
     }
+    public void addAll(EnvDevice envDevice1) {
+        for (int i = 1; i < 24; i++) {
+            EnvDeviceRecentlyData data = new EnvDeviceRecentlyData();
+            data.setDeviceCode(envDevice1.getDeviceSortCode());
+            data.setChipCode(envDevice1.getDeviceSortCode()+ "14" + i);
+            data.setChipStatus(0);
+            data.setChipType(i);
+            if (i < 9) {
+                data.setChipName("温度" + i);
+            }
+            if (i == 9) {
+                data.setChipName("室外温度");
+            }
+            if (i == 10) {
+                data.setChipName("目标温度");
+            }
+            if (i == 11) {
+                data.setChipName("平均温度");
+            }
+            if (i == 12) {
+                data.setChipName("湿度1");
+            }
+            if (i == 13) {
+                data.setChipName("湿度2");
+            }
+            if (i == 14) {
+                data.setChipName("湿度3");
+            }
+            if (i == 15) {
+                data.setChipName("CO2");
+            }
+            if (i == 16) {
+                data.setChipName("压力");
+            }
+            if (i == 17) {
+                data.setChipName("粉尘");
+            }
+            if (i == 18) {
+                data.setChipName("氨气");
+            }
+            if (i == 19) {
+                data.setChipName("通风级别");
+            }
+            if (i == 20) {
+                data.setChipName("加热");
+            }
+            if (i == 21) {
+                data.setChipName("水暖温度");
+            }
+            if (i == 22) {
+                data.setChipName("室内光照");
+            }
+            if (i==23) {
+                data.setChipName("体感温度");
+            }
+            data.setFarmId(envDevice1.getFarmId());
+            data.setUpdateTime(new Date());
+            envDeviceRecentlyDataMapper.insert(data);
+        }
+        for (int i = 1; i < 9; i++) {
+            EnvTemp temp = new EnvTemp();
+            temp.setDeviceCode(envDevice1.getDeviceSortCode());
+            temp.setChipCode(envDevice1.getDeviceSortCode() + "14" + i);//温度1-8
+            temp.setUnitId(envDevice1.getUnitId().toString());
+            temp.setFarmId(envDevice1.getFarmId());
+            tempMapper.insert(temp);
+        }
+        EnvTemp temp = new EnvTemp();
+        temp.setDeviceCode(envDevice1.getDeviceSortCode());
+        temp.setChipCode(envDevice1.getDeviceSortCode() + "1423");//体感温度
+        temp.setUnitId(envDevice1.getUnitId().toString());
+        temp.setFarmId(envDevice1.getFarmId());
+        tempMapper.insert(temp);
+
+        for (int i = 12; i < 15; i++) {
+            EnvHumi humi = new EnvHumi();
+            humi.setChipCode(envDevice1.getDeviceSortCode() + "14"+i);//湿度
+            humi.setDeviceCode(envDevice1.getDeviceSortCode());
+            humi.setUnitId(envDevice1.getUnitId().toString());
+            humi.setFarmId(envDevice1.getFarmId());
+            humiMapper.insert(humi);
+        }
+
+        EnvAmmonia ammonia = new EnvAmmonia();
+        ammonia.setChipCode(envDevice1.getDeviceSortCode() + "1418");//氨气
+        ammonia.setDeviceCode(envDevice1.getDeviceSortCode());
+        ammonia.setUnitId(envDevice1.getUnitId().toString());
+        ammonia.setFarmId(envDevice1.getFarmId());
+        ammoniaMapper.insert(ammonia);
+
+        EnvCo2 co2 = new EnvCo2();
+        co2.setChipCode(envDevice1.getDeviceSortCode() + "1415");//co2
+        co2.setDeviceCode(envDevice1.getDeviceSortCode());
+        co2.setUnitId(envDevice1.getUnitId().toString());
+        co2.setFarmId(envDevice1.getFarmId());
+        co2Mapper.insert(co2);
+
+        EnvStive stive = new EnvStive();
+        stive.setChipCode(envDevice1.getDeviceSortCode() + "1417");//粉尘
+        stive.setDeviceCode(envDevice1.getDeviceSortCode());
+        stive.setUnitId(envDevice1.getUnitId().toString());
+        stive.setFarmId(envDevice1.getFarmId());
+        stiveMapper.insert(stive);
+
+        EnvPressure pressure = new EnvPressure();
+        pressure.setChipCode(envDevice1.getDeviceSortCode() + "1416");//压力
+        pressure.setDeviceCode(envDevice1.getDeviceSortCode());
+        pressure.setUnitId(envDevice1.getUnitId().toString());
+        pressure.setFarmId(envDevice1.getFarmId());
+        pressureMapper.insert(pressure);
+
+
+        for (int i = 1; i < 21; i++) {
+            EnvDeviceFan fan = new EnvDeviceFan();
+            fan.setDeviceCode(envDevice1.getDeviceSortCode());
+            fan.setChipCode(envDevice1.getDeviceSortCode() + "11" + i);
+            fan.setFarmId(envDevice1.getFarmId());
+            fan.setChipStatus(0);
+            fan.setChipName("风机" + i);
+            fan.setOther1(String.valueOf(i));
+            fanMapper.insert(fan);
+        }
+        for (int i = 1; i < 9; i++) {
+            EnvDeviceFenestrule fenestrulen = new EnvDeviceFenestrule();
+            fenestrulen.setDeviceCode(envDevice1.getDeviceSortCode());
+            fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "12" + i);
+            fenestrulen.setFarmId(envDevice1.getFarmId());
+            fenestrulen.setChipStatus(0);
+            fenestrulen.setChipName("小窗" + i);
+            fenestrulen.setOther1(String.valueOf(i));
+            fenestruleMapper.insert(fenestrulen);
+        }
+        for (int i = 1; i < 6; i++) {
+            EnvDeviceOther other = new EnvDeviceOther();
+            other.setDeviceCode(envDevice1.getDeviceSortCode());
+            other.setChipCode(envDevice1.getDeviceSortCode() + "13" + i);
+            other.setFarmId(envDevice1.getFarmId());
+            if (i==1) {
+                other.setChipName("照明");
+            }
+            if (i==2) {
+                other.setChipName("加热");
+            }
+            if (i==3) {
+                other.setChipName("湿帘");
+            }
+            if (i==4) {
+                other.setChipName("喷雾");
+            }
+            if (i==5) {
+                other.setChipName("锅炉");
+            }
+
+            other.setChipStatus(0);
+            other.setOther1(String.valueOf(i));
+            otherMapper.insert(other);
+        }
 
+
+    }
+
+    public static void main(String[] args) {
+        String farm = "1000" + 01;
+        System.out.println(farm);
+       String farm2=String.valueOf((Integer.valueOf(farm) + 9));
+        System.out.println(farm2);
+    }
     @Override
     public Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String id = paramsMap.get("id");
-        String DeviceName = paramsMap.get("DeviceName");
-        String BuildLocation = paramsMap.get("BuildLocation");
-        String DeviceBrand = paramsMap.get("DeviceBrand");
+        String DeviceCode = paramsMap.get("deviceCode");
+        String DeviceName = paramsMap.get("deviceName");
+        String BuildLocation = paramsMap.get("buildLocation");
+        String DeviceBrand = paramsMap.get("deviceBrand");
         String remark = paramsMap.get("remark");
         if (remark == null || remark == "") {
             remark = null;
@@ -145,20 +346,23 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", id);
         EnvDevice envDevice = envDeviceMapper.selectOne(queryWrapper);
+        envDevice.setId(Integer.parseInt(id));
         envDevice.setFarmId(Integer.parseInt(farmId));
         envDevice.setDeviceName(DeviceName);
+        envDevice.setDeviceCode(DeviceCode);
         envDevice.setDeviceBrand(DeviceBrand);
         envDevice.setBuildLocation(BuildLocation);
         envDevice.setRemark(remark);
 
         QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("device_name", DeviceName);
+        queryWrapper1.ne("id",id).and(i ->i.eq("device_name", DeviceName).or().eq("device_code", DeviceCode));
         if (ObjectUtil.isEmpty(envDeviceMapper.selectOne(queryWrapper1))) {
             envDeviceMapper.updateById(envDevice);
+            return new Result(ResultCode.SUCCESS,"修改成功");
         } else {
-            return new Result(ResultCode.FAIL, "设备名称已存在");
+            return new Result(ResultCode.FAIL, "设备名称或者设备编码已存在");
         }
-        return new Result(ResultCode.SUCCESS);
+
     }
 
     @Override
@@ -167,8 +371,41 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         String id = paramsMap.get("id");
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", id).eq("farm_id", farmId);
+        EnvDevice envDevice = envDeviceMapper.selectOne(queryWrapper);
+        String deviceCode = envDevice.getDeviceSortCode();
+        QueryWrapper<EnvDeviceRecentlyData> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("device_code", deviceCode).eq("farm_id", farmId);
+        envDeviceRecentlyDataMapper.delete(queryWrapper1);//实时数据
+        QueryWrapper<EnvTemp> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("device_code", deviceCode).eq("farm_id", farmId);
+        tempMapper.delete(queryWrapper2);//温度
+        QueryWrapper<EnvHumi> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("device_code", deviceCode).eq("farm_id", farmId);
+        humiMapper.delete(queryWrapper3);//湿度
+        QueryWrapper<EnvAmmonia> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.eq("device_code", deviceCode).eq("farm_id", farmId);
+        ammoniaMapper.delete(queryWrapper4);//氨气
+        QueryWrapper<EnvCo2> queryWrapper5 = new QueryWrapper<>();
+        queryWrapper5.eq("device_code", deviceCode).eq("farm_id", farmId);
+        co2Mapper.delete(queryWrapper5);//co2
+        QueryWrapper<EnvStive> queryWrapper6 = new QueryWrapper<>();
+        queryWrapper6.eq("device_code", deviceCode).eq("farm_id", farmId);
+        stiveMapper.delete(queryWrapper6);//粉尘
+        QueryWrapper<EnvPressure> queryWrapper7 = new QueryWrapper<>();
+        queryWrapper7.eq("device_code", deviceCode).eq("farm_id", farmId);
+        pressureMapper.delete(queryWrapper7);//压力
+        QueryWrapper<EnvDeviceFan> queryWrapper8 = new QueryWrapper<>();
+        queryWrapper8.eq("device_code", deviceCode).eq("farm_id", farmId);
+        fanMapper.delete(queryWrapper8);//风机
+        QueryWrapper<EnvDeviceFenestrule> queryWrapper9 = new QueryWrapper<>();
+        queryWrapper9.eq("device_code", deviceCode).eq("farm_id", farmId);
+        fenestruleMapper.delete(queryWrapper9);//小窗
+        QueryWrapper<EnvDeviceOther> queryWrapper10 = new QueryWrapper<>();
+        queryWrapper10.eq("device_code", deviceCode).eq("farm_id", farmId);
+        otherMapper.delete(queryWrapper10);//其他
+
         envDeviceMapper.delete(queryWrapper);
-        return new Result(ResultCode.SUCCESS,"删除成功");
+        return new Result(ResultCode.SUCCESS, "删除成功");
     }
 
     @Override
@@ -191,7 +428,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             EnvDevice envDevice = envDeviceMapper.selectOne(queryWrapper1);//找到栋舍绑定的设备，利用单元id*/
 
             QueryWrapper<EnvData> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("unit_id",basePigpens.get(i).getId()).orderByDesc("create_time").last(" limit 1");//通过设备id来拿取数据
+            queryWrapper2.eq("unit_id", basePigpens.get(i).getId()).orderByDesc("create_time").last(" limit 1");//通过设备id来拿取数据
             EnvData envData = dataMapper.selectOne(queryWrapper2);
             JSONObject jsonObject = new JSONObject();
             if (ObjectUtil.isEmpty(envData)) {
@@ -207,7 +444,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             }
             jsonArray.add(jsonObject);
         }
-        return new Result(ResultCode.SUCCESS,jsonArray);
+        return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
     @Override
@@ -254,7 +491,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         else if ("2".equals(type)) {
             Calendar calendar = Calendar.getInstance();
             calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-            queryWrapper.ge("create_time",calendar.getTime());
+            queryWrapper.ge("create_time", calendar.getTime());
             List<EnvData> envData = dataMapper.listDay(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
@@ -268,7 +505,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
         }
-        return new Result(ResultCode.SUCCESS,map);
+        return new Result(ResultCode.SUCCESS, map);
     }
 
     @Override
@@ -286,7 +523,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的楼层
             for (int j = 0; j < basePigpens1.size(); j++) {
                 QueryWrapper<EnvDevice> deviceQueryWrapper = new QueryWrapper<>();
-                deviceQueryWrapper.eq("unit_id",basePigpens1.get(j).getId());
+                deviceQueryWrapper.eq("unit_id", basePigpens1.get(j).getId());
                 EnvDevice envDevice = envDeviceMapper.selectOne(deviceQueryWrapper);
                 if (ObjectUtil.isNotEmpty(envDevice)) {
                     if (envDevice.getDeviceStatus() == 0) {
@@ -298,14 +535,38 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
 
             }
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("location",basePigpens.get(i).getBuildName());
+            jsonObject.put("location", basePigpens.get(i).getBuildName());
             jsonObject.put("onDevice", onCount);
             jsonObject.put("offDevice", offCount);
             jsonArray.add(jsonObject);
             offCount = 0;
             onCount = 0;
         }
-        return new Result(ResultCode.SUCCESS,jsonArray);
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
+
+    @Override
+    public Result selectList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String name = paramsMap.get("name");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if (pageNum == null || pageNum == "") {
+            pageNum = "1";
+        }
+        if (pageSize == null || pageSize == "") {
+            pageSize = "20";
+        }
+
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        if (name == "" || name == null) {
+            queryWrapper.eq("farm_id", farmId);
+        } else {
+            queryWrapper.eq("farm_id", farmId);
+            queryWrapper.like("device_code", name).or().like("device_name", name);
+        }
+        Page<EnvDevice> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, envDeviceMapper.selectPage(page, queryWrapper));
     }
 
 //    @Override
@@ -351,28 +612,28 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     public Result bandingUnitId(HttpServletRequest httpServletRequest, EnvDevice envDevice) {
         Integer unitId = envDevice.getUnitId();
         int count = this.count(new QueryWrapper<EnvDevice>().eq("unit_id", unitId));
-        if (count>0){
-            return new Result(10001,"绑定失败，该栋舍已有设备",false);
+        if (count > 0) {
+            return new Result(10001, "绑定失败，该栋舍已有设备", false);
         }
         this.updateById(envDevice);
-        return new Result(10000,"绑定成功",true);
+        return new Result(10000, "绑定成功", true);
     }
 
     @Override
     public Result listPigpenAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         List objects = new ArrayList<>();
-        List<BasePigpen> basePigpens = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().eq("farm_id", farmId).eq("f_type",3));
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().eq("farm_id", farmId).eq("f_type", 3));
         for (BasePigpen basePigpen : basePigpens) {
             Integer id = basePigpen.getId();
             EnvData envData = dataMapper.selectOne(new QueryWrapper<EnvData>().eq("unit_id", id).orderByDesc("id").last("limit 1"));
             JSONObject jsonObject = new JSONObject();
-            if (ObjectUtil.isNotEmpty(envData)){
+            if (ObjectUtil.isNotEmpty(envData)) {
                 jsonObject.put("temp", envData.getEnvTemp());//温度
                 jsonObject.put("hum", envData.getEnvHum());//湿度
                 jsonObject.put("location", basePigpen.getBuildName());
                 jsonObject.put("unit_id", basePigpen.getId());//单元id
-            }else {
+            } else {
                 jsonObject.put("temp", 0);//温度
                 jsonObject.put("hum", 0);//湿度
                 jsonObject.put("location", basePigpen.getBuildName());
@@ -380,7 +641,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             }
             objects.add(jsonObject);
         }
-        return new Result(ResultCode.SUCCESS,objects);
+        return new Result(ResultCode.SUCCESS, objects);
     }
 
 //    //添加新的设备

src/main/resources/com/huimv/admin/mapper/BasePigpenMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.BasePigpenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.BasePigpen">
+        <id column="id" property="id" />
+        <result column="build_name" property="buildName" />
+        <result column="parent_id" property="parentId" />
+        <result column="f_type" property="fType" />
+        <result column="farm_id" property="farmId" />
+        <result column="stage_code" property="stageCode"/>
+        <result column="sort" property="sort" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+    <select id="listChart" resultType="com.huimv.admin.entity.dto.ListChartDto">
+
+    </select>
+</mapper>

src/main/resources/mapper/EnvAmmoniaMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvAmmoniaMapper">
-
-</mapper>

src/main/resources/mapper/EnvCo2Mapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvCo2Mapper">
-
-</mapper>

src/main/resources/mapper/EnvDeviceFanMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvDeviceFanMapper">
-
-</mapper>

src/main/resources/mapper/EnvDeviceFenestruleMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvDeviceFenestruleMapper">
-
-</mapper>

src/main/resources/mapper/EnvDeviceOtherMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvDeviceOtherMapper">
-
-</mapper>

src/main/resources/mapper/EnvDeviceRecentlyDataMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvDeviceRecentlyDataMapper">
-
-</mapper>

src/main/resources/mapper/EnvHumiMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvHumiMapper">
-
-</mapper>

src/main/resources/mapper/EnvPressureMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvPressureMapper">
-
-</mapper>

src/main/resources/mapper/EnvStiveMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvStiveMapper">
-
-</mapper>

src/main/resources/mapper/EnvTempMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.EnvTempMapper">
-
-</mapper>

src/main/resources/mapper/MemberInfoMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.MemberInfoMapper">
-
-</mapper>