1

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

@@ -70,6 +70,10 @@ public class BasePigpenController {
     public Result listDetail(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
         return  basePigpenService.listDetail(httpServletRequest, paramsMap);
     }
+    @PostMapping( "/listDetailZhu")
+    public Result listDetailZhu(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
+        return  basePigpenService.listDetailZhu(httpServletRequest, paramsMap);
+    }
     @PostMapping("/listUnit")
     public Result listUnit(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         return  basePigpenService.listUnit(httpServletRequest, paramsMap);

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 照明灯 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+@RestController
+@RequestMapping("/env-device-chuchou")
+public class EnvDeviceChuchouController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 照明灯 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+@RestController
+@RequestMapping("/env-device-liaota")
+public class EnvDeviceLiaotaController {
+
+}

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

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -91,5 +92,9 @@ public class EnvDevice implements Serializable {
     private Integer jiaReQiNum;
     private Integer zhaoMingDengNum;
     private Integer liaoTaNum;
+    private Integer chuChouNum;
+    //1鸡版 2猪版
+    private Integer deviceType;
+    private Long offline;
 
 }

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

@@ -0,0 +1,70 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 照明灯
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_device_chuchou")
+public class EnvDeviceChuchou implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备id
+     */
+    private String deviceCode;
+
+    /**
+     * 传感器id
+     */
+    private String chipCode;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 传感器名字
+     */
+    private String chipName;
+
+    /**
+     * 0:关闭  1:开启
+     */
+    private Integer chipStatus;
+
+    /**
+     * 值
+     */
+    private String chipValue;
+
+    private Integer farmId;
+
+    private String other1;
+
+    private String ohter2;
+
+    private String other3;
+
+
+}

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

@@ -0,0 +1,70 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 照明灯
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_device_liaota")
+public class EnvDeviceLiaota implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备id
+     */
+    private String deviceCode;
+
+    /**
+     * 传感器id
+     */
+    private String chipCode;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 传感器名字
+     */
+    private String chipName;
+
+    /**
+     * 0:关闭  1:开启
+     */
+    private Integer chipStatus;
+
+    /**
+     * 值
+     */
+    private String chipValue;
+
+    private Integer farmId;
+
+    private String other1;
+
+    private String ohter2;
+
+    private String other3;
+
+
+}

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -44,11 +45,11 @@ public class EnvElectricity implements Serializable {
 
     private BigDecimal handleValue;
 
-
-    private LocalDateTime askTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date askTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     private Integer farmId;
 

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -48,10 +49,10 @@ public class EnvWater implements Serializable {
     private BigDecimal handleValue;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime askTime;
+    private Date askTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     private Integer farmId;
 

src/main/java/com/huimv/admin/entity/vo/UnitDetailVo.java

@@ -15,4 +15,10 @@ public class UnitDetailVo {
     private String electricity;
     private String feed;
     private String deviceStatus;
+    private String dayAge;
+    private Integer stageType;
+    private String co2;
+    private String nh3;
+    private String fen;
+    private Long offline;
 }

src/main/java/com/huimv/admin/mapper/AccountGroupMapper.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
  * @since 2021-09-09
  */
 @Repository
-public interface AccountGroupMapper extends BaseMapper<AccountGroup> {
+public interface  AccountGroupMapper extends BaseMapper<AccountGroup> {
 
     void removeAccountGroup(@Param("groupIds") String groupIds);
 }

src/main/java/com/huimv/admin/mapper/EnvDeviceChuchouMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.EnvDeviceChuchou;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 照明灯 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+public interface EnvDeviceChuchouMapper extends BaseMapper<EnvDeviceChuchou> {
+
+}

src/main/java/com/huimv/admin/mapper/EnvDeviceLiaotaMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.EnvDeviceLiaota;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 照明灯 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+public interface EnvDeviceLiaotaMapper extends BaseMapper<EnvDeviceLiaota> {
+
+}

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

@@ -41,4 +41,6 @@ public interface IBasePigpenService extends IService<BasePigpen> {
     Result countAll(Map<String, String> paramsMap);
 
     Result listUnit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listDetailZhu(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.EnvDeviceChuchou;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 照明灯 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+public interface IEnvDeviceChuchouService extends IService<EnvDeviceChuchou> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.EnvDeviceLiaota;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 照明灯 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+public interface IEnvDeviceLiaotaService extends IService<EnvDeviceLiaota> {
+
+}

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

@@ -90,6 +90,11 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     private EnvDeviceDeflectorMapper deflectorMapper;//导流板
     @Autowired
     private EnvDeviceAtomizingMapper atomizingMapper;//喷雾
+    @Autowired
+    private EnvDeviceChuchouMapper envDeviceChuchouMapper;//除臭
+
+    @Autowired
+    private EnvDeviceLiaotaMapper envDeviceLiaotaMapper;//料塔
 
     @Override
     @Transactional
@@ -183,6 +188,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
                 jsonObject.put("status", null);
                 jsonObject.put("unitId", basePigpenId);
                 jsonObject.put("type", false);
+                jsonObject.put("devieType", 1);
                 jsonArray.add(jsonObject);
             } else {
                 String deviceSortCode = envDevice.getDeviceSortCode();
@@ -197,6 +203,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
                 jsonObject.put("status", envDevice.getStageType());
                 jsonObject.put("unitId", envDevice.getUnitId());
                 jsonObject.put("type", true);
+                jsonObject.put("devieType", envDevice.getDeviceType());
                 QueryWrapper<EnvWarning> warningQueryWrapper = new QueryWrapper<>();
                 warningQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpenId)/*.ge("update_time", date)*/
                         .eq("warning_type", 8).orderByDesc("update_time").last(" limit 1");
@@ -325,6 +332,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         }
         map.put("zhaomingdeng", jsonArray8);
 
+
         //实时数据
         JSONArray jsonArray3 = new JSONArray();
         QueryWrapper<EnvDeviceRecentlyData> queryWrapper = new QueryWrapper<>();
@@ -536,6 +544,22 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
                 map.put("name", "pressure");
                 map.put("value", pressures);
             }
+            if ("7".equals(dataType)){
+                QueryWrapper<EnvWater> pressureQueryWrapper = new QueryWrapper<>();
+                pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
+                List<EnvWater> waters = envWaterMapper.selectList(pressureQueryWrapper);
+                map.put("name", "water");
+                map.put("value", waters);
+            }
+            if ("8".equals(dataType)){
+                QueryWrapper<EnvElectricity> pressureQueryWrapper = new QueryWrapper<>();
+                pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
+                List<EnvElectricity> electricities = envElectricityMapper.selectList(pressureQueryWrapper);
+                map.put("name", "electr");
+                map.put("value", electricities);
+            }
 
         } else {
             //自定义查询
@@ -604,6 +628,23 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
                 map.put("name", "pressure");
                 map.put("value", pressures);
             }
+
+            if ("7".equals(dataType)){
+                QueryWrapper<EnvWater> pressureQueryWrapper = new QueryWrapper<>();
+                pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                        .between("ask_time", startTime, endTime).orderByAsc("ask_time");
+                List<EnvWater> waters = envWaterMapper.selectList(pressureQueryWrapper);
+                map.put("name", "water");
+                map.put("value", waters);
+            }
+            if ("8".equals(dataType)){
+                QueryWrapper<EnvElectricity> pressureQueryWrapper = new QueryWrapper<>();
+                pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                       .between("ask_time", startTime, endTime).orderByAsc("ask_time");
+                List<EnvElectricity> electricities = envElectricityMapper.selectList(pressureQueryWrapper);
+                map.put("name", "electr");
+                map.put("value", electricities);
+            }
         }
 
         return new Result(ResultCode.SUCCESS, map);
@@ -864,6 +905,111 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     }
 
     @Override
+    public Result listDetailZhu(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");//单元id
+        Date timesmorning = DataUill.getTimesmorning();
+        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);
+        map.put("fengji", envDeviceFans);
+        //小窗
+        QueryWrapper<EnvDeviceFenestrule> fenestruleQueryWrapper = new QueryWrapper<>();
+        fenestruleQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceFenestrule> envDeviceFenestrules = fenestruleMapper.selectList(fenestruleQueryWrapper);
+        map.put("xiaochuang", envDeviceFenestrules);
+
+        //湿帘
+        QueryWrapper<EnvDevicePad> padQueryWrapper = new QueryWrapper<>();
+        padQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDevicePad> envDevicePads = padMapper.selectList(padQueryWrapper);
+        map.put("shilian", envDevicePads);
+
+        //喷雾
+        QueryWrapper<EnvDeviceAtomizing> atomizingQueryWrapper = new QueryWrapper<>();
+        atomizingQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceAtomizing> atomizings = atomizingMapper.selectList(atomizingQueryWrapper);
+        map.put("penwu", atomizings);
+        //加热器
+        QueryWrapper<EnvDeviceHeater> heaterQueryWrapper = new QueryWrapper<>();
+        heaterQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceHeater> heaters = heaterMapper.selectList(heaterQueryWrapper);
+        map.put("jiareqi", heaters);
+        //照明灯
+        QueryWrapper<EnvDeviceFloodlight> floodlightQueryWrapper = new QueryWrapper<>();
+        floodlightQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceFloodlight> floodlights = floodlightMapper.selectList(floodlightQueryWrapper);
+        map.put("zhaomingdeng", floodlights);
+
+        //照明灯
+        QueryWrapper<EnvDeviceChuchou> chuchouQueryWrapper = new QueryWrapper<>();
+        chuchouQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceChuchou> chuchous = envDeviceChuchouMapper.selectList(chuchouQueryWrapper);
+        map.put("chuchou", chuchous);
+
+        //照明灯
+        QueryWrapper<EnvDeviceLiaota> liaotaQueryWrapper = new QueryWrapper<>();
+        liaotaQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceLiaota> liaotas = envDeviceLiaotaMapper.selectList(liaotaQueryWrapper);
+        map.put("liaota", liaotas);
+
+
+        //实时数据
+        QueryWrapper<EnvDeviceRecentlyData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceRecentlyData> envDeviceRecentlyData = envDeviceRecentlyDataMapper.selectList(queryWrapper);
+
+        //单元状况
+        UnitDetailVo unitDetailVo = new UnitDetailVo();
+        unitDetailVo.setDayAge(envDevice.getDayAge());
+        unitDetailVo.setStageType(envDevice.getStageType());
+        //目标温度
+        unitDetailVo.setTargetTemp(envDeviceRecentlyData.get(9).getChipValue());
+        //室内温蒂
+        unitDetailVo.setAvgTemp(envDeviceRecentlyData.get(10).getChipValue());
+        //室外
+        unitDetailVo.setOutsideTemp(envDeviceRecentlyData.get(8).getChipValue());
+
+        unitDetailVo.setAvgHum( envDeviceRecentlyData.get(11).getChipValue());
+
+        unitDetailVo.setCo2(envDeviceRecentlyData.get(14).getChipValue());
+        unitDetailVo.setNh3(envDeviceRecentlyData.get(17).getChipValue());
+        unitDetailVo.setFen(envDeviceRecentlyData.get(18).getChipValue());
+
+
+        BigDecimal dayWater = envWaterMapper.getWater(new QueryWrapper<EnvWater>().ge("update_time", timesmorning).eq("farm_id", farmId).eq("unit_id", unitId));
+        if (ObjectUtil.isNull(dayWater)) {
+            dayWater = BigDecimal.ZERO;
+        }
+        unitDetailVo.setWater(dayWater.toString());
+        BigDecimal dayElectricity = envElectricityMapper.getElectricity(new QueryWrapper<EnvElectricity>()
+                .ge("update_time", timesmorning)
+                .eq("farm_id", farmId)
+                .eq("unit_id", unitId));
+        if (ObjectUtil.isNull(dayElectricity)) {
+            dayElectricity = BigDecimal.ZERO;
+        }
+        unitDetailVo.setElectricity(dayElectricity.toString());
+        Long offline = envDevice.getOffline();
+        long currentTimeInSeconds = System.currentTimeMillis() / 1000;
+        if (offline ==null){
+            unitDetailVo.setOffline(0L);
+        }else {
+            unitDetailVo.setOffline(currentTimeInSeconds -offline);
+        }
+        map.put("unitDetail", unitDetailVo);
+        return new Result(ResultCode.SUCCESS, map);
+
+    }
+
+    @Override
     public Result list(String farmCode, String buildName, String stageCode) {
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(buildName), "build_name", buildName);

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.EnvDeviceChuchou;
+import com.huimv.admin.mapper.EnvDeviceChuchouMapper;
+import com.huimv.admin.service.IEnvDeviceChuchouService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 照明灯 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+@Service
+public class EnvDeviceChuchouServiceImpl extends ServiceImpl<EnvDeviceChuchouMapper, EnvDeviceChuchou> implements IEnvDeviceChuchouService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.EnvDeviceLiaota;
+import com.huimv.admin.mapper.EnvDeviceLiaotaMapper;
+import com.huimv.admin.service.IEnvDeviceLiaotaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 照明灯 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-04
+ */
+@Service
+public class EnvDeviceLiaotaServiceImpl extends ServiceImpl<EnvDeviceLiaotaMapper, EnvDeviceLiaota> implements IEnvDeviceLiaotaService {
+
+}

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

@@ -82,6 +82,10 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     @Autowired
     private EnvDeviceAtomizingMapper atomizingMapper;//喷雾
     @Autowired
+    private EnvDeviceChuchouMapper envDeviceChuchouMapper;//除臭
+    @Autowired
+    private EnvDeviceLiaotaMapper envDeviceLiaotaMapper;//料塔
+    @Autowired
     private EnvDeviceRecentlyDataMapper recentlyDataMapper;
 
 
@@ -136,44 +140,27 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     }
 
     @Override
-    public Result add(HttpServletRequest httpServletRequest, EnvDevice envDevice1) {
-
-        EnvDevice envDevice = new EnvDevice();
-        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());
-        envDevice.setFengJiNum(envDevice1.getFengJiNum());
-        envDevice.setXiaoChuangNum(envDevice1.getXiaoChuangNum());
-        envDevice.setFengJiBianNum(envDevice1.getFengJiBianNum());
-        envDevice.setShiLianNum(envDevice1.getShiLianNum());
-        envDevice.setDaoLiuBan(envDevice1.getDaoLiuBan());
-        envDevice.setPenWuNum(envDevice1.getPenWuNum());
-        envDevice.setJiaReQiNum(envDevice1.getJiaReQiNum());
-        envDevice.setZhaoMingDengNum(envDevice1.getZhaoMingDengNum());
+    @Transactional
+    public Result add(HttpServletRequest httpServletRequest, EnvDevice envDevice) {
+
+
 
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-        basePigpenQueryWrapper.eq("farm_id", envDevice1.getFarmId()).eq("id", envDevice1.getUnitId());
+        basePigpenQueryWrapper.eq("farm_id", envDevice.getFarmId()).eq("id", envDevice.getUnitId());
         BasePigpen basePigpen = basePigpenMapper.selectOne(basePigpenQueryWrapper);
         envDevice.setStageType(basePigpen.getStageCode());
 
         QueryWrapper<EnvDevice> deviceQueryWrapper = new QueryWrapper<>();
-        deviceQueryWrapper.eq("farm_id", envDevice1.getFarmId()).eq("unit_id", envDevice1.getUnitId());
+        deviceQueryWrapper.eq("farm_id", envDevice.getFarmId()).eq("unit_id", envDevice.getUnitId());
         EnvDevice device1 = envDeviceMapper.selectOne(deviceQueryWrapper);//一个栋舍只能有一个设备
         if (ObjectUtil.isEmpty(device1)) {
             QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("device_name", envDevice1.getDeviceName()).eq("farm_id", envDevice1.getFarmId())
-                    .or().eq("device_code", envDevice1.getDeviceCode());
+            queryWrapper.eq("device_name", envDevice.getDeviceName()).eq("farm_id", envDevice.getFarmId())
+                    .or().eq("device_code", envDevice.getDeviceCode());
             EnvDevice device = envDeviceMapper.selectOne(queryWrapper);//名字和编码不能重复
             if (ObjectUtil.isEmpty(device)) {
                 QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("farm_id", envDevice1.getFarmId());
+                queryWrapper1.eq("farm_id", envDevice.getFarmId());
                 Integer integer = envDeviceMapper.selectCount(queryWrapper1);
                 if (integer == 0) {
                     envDevice.setDeviceSortCode("100" + "01");
@@ -196,14 +183,14 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
 
     }
 
-    public void addAll(EnvDevice envDevice1) {
+    public void addAll(EnvDevice envDevic) {
         for (int i = 1; i < 24; i++) {
             EnvDeviceRecentlyData data = new EnvDeviceRecentlyData();
-            data.setDeviceCode(envDevice1.getDeviceSortCode());
+            data.setDeviceCode(envDevic.getDeviceSortCode());
             if (i < 10) {
-                data.setChipCode(envDevice1.getDeviceSortCode() + "140" + i);
+                data.setChipCode(envDevic.getDeviceSortCode() + "140" + i);
             } else {
-                data.setChipCode(envDevice1.getDeviceSortCode() + "14" + i);
+                data.setChipCode(envDevic.getDeviceSortCode() + "14" + i);
             }
             data.setChipStatus(0);
             data.setChipType(i);
@@ -276,186 +263,233 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             if (i == 23) {
                 data.setChipName("体感温度");
             }
-            data.setFarmId(envDevice1.getFarmId());
+            data.setFarmId(envDevic.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() + "140" + i);//温度1-8
-            temp.setUnitId(envDevice1.getUnitId().toString());
-            temp.setFarmId(envDevice1.getFarmId());
+            temp.setDeviceCode(envDevic.getDeviceSortCode());
+            temp.setChipCode(envDevic.getDeviceSortCode() + "140" + i);//温度1-8
+            temp.setUnitId(envDevic.getUnitId().toString());
+            temp.setFarmId(envDevic.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());
+        temp.setDeviceCode(envDevic.getDeviceSortCode());
+        temp.setChipCode(envDevic.getDeviceSortCode() + "1423");//体感温度
+        temp.setUnitId(envDevic.getUnitId().toString());
+        temp.setFarmId(envDevic.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());
+            humi.setChipCode(envDevic.getDeviceSortCode() + "14" + i);//湿度
+            humi.setDeviceCode(envDevic.getDeviceSortCode());
+            humi.setUnitId(envDevic.getUnitId().toString());
+            humi.setFarmId(envDevic.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());
+        ammonia.setChipCode(envDevic.getDeviceSortCode() + "1418");//氨气
+        ammonia.setDeviceCode(envDevic.getDeviceSortCode());
+        ammonia.setUnitId(envDevic.getUnitId().toString());
+        ammonia.setFarmId(envDevic.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());
+        co2.setChipCode(envDevic.getDeviceSortCode() + "1415");//co2
+        co2.setDeviceCode(envDevic.getDeviceSortCode());
+        co2.setUnitId(envDevic.getUnitId().toString());
+        co2.setFarmId(envDevic.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());
+        stive.setChipCode(envDevic.getDeviceSortCode() + "1417");//粉尘
+        stive.setDeviceCode(envDevic.getDeviceSortCode());
+        stive.setUnitId(envDevic.getUnitId().toString());
+        stive.setFarmId(envDevic.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());
+        pressure.setChipCode(envDevic.getDeviceSortCode() + "1416");//压力
+        pressure.setDeviceCode(envDevic.getDeviceSortCode());
+        pressure.setUnitId(envDevic.getUnitId().toString());
+        pressure.setFarmId(envDevic.getFarmId());
         pressureMapper.insert(pressure);
 
 
-        for (int i = 1; i < envDevice1.getFengJiNum() + 1; i++) {
+        for (int i = 1; i < envDevic.getFengJiNum() + 1; i++) {
             EnvDeviceFan fan = new EnvDeviceFan();
-            fan.setDeviceCode(envDevice1.getDeviceSortCode());
+            fan.setDeviceCode(envDevic.getDeviceSortCode());
             if (i < 10) {
-                fan.setChipCode(envDevice1.getDeviceSortCode() + "110" + i);
+                fan.setChipCode(envDevic.getDeviceSortCode() + "110" + i);
             } else {
-                fan.setChipCode(envDevice1.getDeviceSortCode() + "11" + i);
+                fan.setChipCode(envDevic.getDeviceSortCode() + "11" + i);
             }
             fan.setChipName("风机" + i);
-            fan.setFarmId(envDevice1.getFarmId());
+            fan.setFarmId(envDevic.getFarmId());
             fan.setChipStatus(0);
             fan.setFengType(1);
             fan.setOther1(String.valueOf(i));
             fanMapper.insert(fan);
         }
         int j = 1;
-        for (int i = envDevice1.getFengJiNum() + 1; i < envDevice1.getFengJiNum() + envDevice1.getFengJiBianNum() + 1; i++) {
+        for (int i = envDevic.getFengJiNum() + 1; i < envDevic.getFengJiNum() + envDevic.getFengJiBianNum() + 1; i++) {
             EnvDeviceFan fan = new EnvDeviceFan();
-            fan.setDeviceCode(envDevice1.getDeviceSortCode());
+            fan.setDeviceCode(envDevic.getDeviceSortCode());
             if (i < 10) {
-                fan.setChipCode(envDevice1.getDeviceSortCode() + "110" + i);
+                fan.setChipCode(envDevic.getDeviceSortCode() + "110" + i);
             } else {
-                fan.setChipCode(envDevice1.getDeviceSortCode() + "11" + i);
+                fan.setChipCode(envDevic.getDeviceSortCode() + "11" + i);
             }
             fan.setChipName("变频风机" + j);
-            fan.setFarmId(envDevice1.getFarmId());
+            fan.setFarmId(envDevic.getFarmId());
             fan.setChipStatus(0);
             fan.setFengType(2);
             fan.setOther1(String.valueOf(i));
             fanMapper.insert(fan);
             j++;
         }
-        for (int i = 1; i < envDevice1.getXiaoChuangNum() + 1; i++) {
-            EnvDeviceFenestrule fenestrulen = new EnvDeviceFenestrule();
-            fenestrulen.setDeviceCode(envDevice1.getDeviceSortCode());
+        if (envDevic.getXiaoChuangNum() != null) {
+            for (int i = 1; i < envDevic.getXiaoChuangNum() + 1; i++) {
+                EnvDeviceFenestrule fenestrulen = new EnvDeviceFenestrule();
+                fenestrulen.setDeviceCode(envDevic.getDeviceSortCode());
 
-            if (i < 10) {
-                fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "120" + i);
-            } else {
-                fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "12" + i);
+                if (i < 10) {
+                    fenestrulen.setChipCode(envDevic.getDeviceSortCode() + "120" + i);
+                } else {
+                    fenestrulen.setChipCode(envDevic.getDeviceSortCode() + "12" + i);
+                }
+                fenestrulen.setFarmId(envDevic.getFarmId());
+                fenestrulen.setChipStatus(0);
+                fenestrulen.setChipName("小窗" + i);
+                fenestrulen.setOther1(String.valueOf(i));
+                fenestruleMapper.insert(fenestrulen);
+            }
+        }
+        if (envDevic.getShiLianNum() != null) {
+            for (int i = 1; i < envDevic.getShiLianNum() + 1; i++) {
+                EnvDevicePad devicePad = new EnvDevicePad();
+                devicePad.setDeviceCode(envDevic.getDeviceSortCode());
+                if (i < 10) {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "200" + i);
+                } else {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "20" + i);
+                }
+                devicePad.setFarmId(envDevic.getFarmId());
+                devicePad.setChipStatus(0);
+                devicePad.setChipName("湿帘" + i);
+                devicePad.setOther1(String.valueOf(i));
+                padMapper.insert(devicePad);
+            }
+        }
+        if (envDevic.getDaoLiuBan() != null) {
+            for (int i = 1; i < envDevic.getDaoLiuBan() + 1; i++) {
+                EnvDeviceDeflector devicePad = new EnvDeviceDeflector();
+                devicePad.setDeviceCode(envDevic.getDeviceSortCode());
+                if (i < 10) {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "210" + i);
+                } else {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "21" + i);
+                }
+                devicePad.setFarmId(envDevic.getFarmId());
+                devicePad.setChipStatus(0);
+                devicePad.setChipName("导流板" + i);
+                devicePad.setOther1(String.valueOf(i));
+                deflectorMapper.insert(devicePad);
+            }
+        }
+        if (envDevic.getPenWuNum() != null) {
+            for (int i = 1; i < envDevic.getPenWuNum() + 1; i++) {
+                EnvDeviceAtomizing devicePad = new EnvDeviceAtomizing();
+                devicePad.setDeviceCode(envDevic.getDeviceSortCode());
+                if (i < 10) {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "220" + i);
+                } else {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "22" + i);
+                }
+                devicePad.setFarmId(envDevic.getFarmId());
+                devicePad.setChipStatus(0);
+                devicePad.setChipName("喷雾" + i);
+                devicePad.setOther1(String.valueOf(i));
+                atomizingMapper.insert(devicePad);
+            }
+        }
+        if (envDevic.getJiaReQiNum() != null) {
+            for (int i = 1; i < envDevic.getJiaReQiNum() + 1; i++) {
+                EnvDeviceHeater devicePad = new EnvDeviceHeater();
+                devicePad.setDeviceCode(envDevic.getDeviceSortCode());
+                if (i < 10) {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "230" + i);
+                } else {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "23" + i);
+                }
+                devicePad.setFarmId(envDevic.getFarmId());
+                devicePad.setChipStatus(0);
+                devicePad.setChipName("加热器" + i);
+                devicePad.setOther1(String.valueOf(i));
+                heaterMapper.insert(devicePad);
+            }
+        }
+        if (envDevic.getZhaoMingDengNum() != null) {
+            for (int i = 1; i < envDevic.getZhaoMingDengNum() + 1; i++) {
+                EnvDeviceFloodlight devicePad = new EnvDeviceFloodlight();
+                devicePad.setDeviceCode(envDevic.getDeviceSortCode());
+                if (i < 10) {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "240" + i);
+                } else {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "24" + i);
+                }
+                devicePad.setFarmId(envDevic.getFarmId());
+                devicePad.setChipStatus(0);
+                devicePad.setChipName("照明灯" + i);
+                devicePad.setOther1(String.valueOf(i));
+                floodlightMapper.insert(devicePad);
+            }
+        }
+        if (envDevic.getChuChouNum() != null){
+            for (int i = 1; i < envDevic.getChuChouNum() + 1; i++) {
+                EnvDeviceChuchou devicePad = new EnvDeviceChuchou();
+                devicePad.setDeviceCode(envDevic.getDeviceSortCode());
+                if (i < 10) {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "250" + i);
+                } else {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "25" + i);
+                }
+                devicePad.setFarmId(envDevic.getFarmId());
+                devicePad.setChipStatus(0);
+                devicePad.setChipName("除臭" + i);
+                devicePad.setOther1(String.valueOf(i));
+                envDeviceChuchouMapper.insert(devicePad);
             }
-            fenestrulen.setFarmId(envDevice1.getFarmId());
-            fenestrulen.setChipStatus(0);
-            fenestrulen.setChipName("小窗" + i);
-            fenestrulen.setOther1(String.valueOf(i));
-            fenestruleMapper.insert(fenestrulen);
         }
+        if (envDevic.getLiaoTaNum() != null) {
 
-        for (int i = 1; i < envDevice1.getShiLianNum() + 1; i++) {
-            EnvDevicePad devicePad = new EnvDevicePad();
-            devicePad.setDeviceCode(envDevice1.getDeviceSortCode());
-            if (i < 10) {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "200" + i);
-            } else {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "20" + i);
-            }
-            devicePad.setFarmId(envDevice1.getFarmId());
-            devicePad.setChipStatus(0);
-            devicePad.setChipName("湿帘" + i);
-            devicePad.setOther1(String.valueOf(i));
-            padMapper.insert(devicePad);
-        }
-        for (int i = 1; i < envDevice1.getDaoLiuBan() + 1; i++) {
-            EnvDeviceDeflector devicePad = new EnvDeviceDeflector();
-            devicePad.setDeviceCode(envDevice1.getDeviceSortCode());
-            if (i < 10) {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "210" + i);
-            } else {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "21" + i);
-            }
-            devicePad.setFarmId(envDevice1.getFarmId());
-            devicePad.setChipStatus(0);
-            devicePad.setChipName("导流板" + i);
-            devicePad.setOther1(String.valueOf(i));
-            deflectorMapper.insert(devicePad);
-        }
-        for (int i = 1; i < envDevice1.getPenWuNum() + 1; i++) {
-            EnvDeviceAtomizing devicePad = new EnvDeviceAtomizing();
-            devicePad.setDeviceCode(envDevice1.getDeviceSortCode());
-            if (i < 10) {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "220" + i);
-            } else {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "22" + i);
-            }
-            devicePad.setFarmId(envDevice1.getFarmId());
-            devicePad.setChipStatus(0);
-            devicePad.setChipName("喷雾" + i);
-            devicePad.setOther1(String.valueOf(i));
-            atomizingMapper.insert(devicePad);
-        }
-        for (int i = 1; i < envDevice1.getJiaReQiNum() + 1; i++) {
-            EnvDeviceHeater devicePad = new EnvDeviceHeater();
-            devicePad.setDeviceCode(envDevice1.getDeviceSortCode());
-            if (i < 10) {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "230" + i);
-            } else {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "23" + i);
-            }
-            devicePad.setFarmId(envDevice1.getFarmId());
-            devicePad.setChipStatus(0);
-            devicePad.setChipName("加热器" + i);
-            devicePad.setOther1(String.valueOf(i));
-            heaterMapper.insert(devicePad);
-        }
-        for (int i = 1; i < envDevice1.getZhaoMingDengNum() + 1; i++) {
-            EnvDeviceFloodlight devicePad = new EnvDeviceFloodlight();
-            devicePad.setDeviceCode(envDevice1.getDeviceSortCode());
-            if (i < 10) {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "240" + i);
-            } else {
-                devicePad.setChipCode(envDevice1.getDeviceSortCode() + "24" + i);
+            for (int i = 1; i < envDevic.getLiaoTaNum() + 1; i++) {
+                EnvDeviceLiaota devicePad = new EnvDeviceLiaota();
+                devicePad.setDeviceCode(envDevic.getDeviceSortCode());
+                if (i < 10) {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "260" + i);
+                } else {
+                    devicePad.setChipCode(envDevic.getDeviceSortCode() + "26" + i);
+                }
+                devicePad.setFarmId(envDevic.getFarmId());
+                devicePad.setChipStatus(0);
+                devicePad.setChipName("料塔" + i);
+                devicePad.setOther1(String.valueOf(i));
+                envDeviceLiaotaMapper.insert(devicePad);
             }
-            devicePad.setFarmId(envDevice1.getFarmId());
-            devicePad.setChipStatus(0);
-            devicePad.setChipName("照明灯" + i);
-            devicePad.setOther1(String.valueOf(i));
-            floodlightMapper.insert(devicePad);
         }
+
+
+
         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());
+            other.setDeviceCode(envDevic.getDeviceSortCode());
+            other.setChipCode(envDevic.getDeviceSortCode() + "13" + i);
+            other.setFarmId(envDevic.getFarmId());
             if (i == 1) {
                 other.setChipName("照明");
             }
@@ -479,12 +513,6 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
 
     }
 
-    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) {
@@ -576,6 +604,14 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         queryWrapper16.eq("device_code", deviceCode).eq("farm_id", farmId);
         recentlyDataMapper.delete(queryWrapper16);//
 
+        QueryWrapper<EnvDeviceChuchou> queryWrapper17 = new QueryWrapper<>();
+        queryWrapper17.eq("device_code", deviceCode).eq("farm_id", farmId);
+        envDeviceChuchouMapper.delete(queryWrapper17);//除臭
+
+        QueryWrapper<EnvDeviceLiaota> queryWrapper18 = new QueryWrapper<>();
+        queryWrapper18.eq("device_code", deviceCode).eq("farm_id", farmId);
+        envDeviceLiaotaMapper.delete(queryWrapper18);//料塔
+
         QueryWrapper<EnvDeviceOther> queryWrapper10 = new QueryWrapper<>();
         queryWrapper10.eq("device_code", deviceCode).eq("farm_id", farmId);
         otherMapper.delete(queryWrapper10);//其他

src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 server:
   port: 8096
   ssl:
-    key-store: classpath:14187298_newenv.ifarmcloud.com.jks
+    key-store: classpath:15519580_newenv.ifarmcloud.com.jks
     key-store-type: jks
-    key-store-password: w9mtl7u9
+    key-store-password: eee7get9
 
 spring:
   application:

src/main/resources/mapper/EnvDeviceChuchouMapper.xml

@@ -0,0 +1,20 @@
+<?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.EnvDeviceChuchouMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvDeviceChuchou">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="chip_code" property="chipCode" />
+        <result column="update_time" property="updateTime" />
+        <result column="chip_name" property="chipName" />
+        <result column="chip_status" property="chipStatus" />
+        <result column="chip_value" property="chipValue" />
+        <result column="farm_id" property="farmId" />
+        <result column="other1" property="other1" />
+        <result column="ohter2" property="ohter2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

src/main/resources/mapper/EnvDeviceLiaotaMapper.xml

@@ -0,0 +1,20 @@
+<?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.EnvDeviceLiaotaMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvDeviceLiaota">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="chip_code" property="chipCode" />
+        <result column="update_time" property="updateTime" />
+        <result column="chip_name" property="chipName" />
+        <result column="chip_status" property="chipStatus" />
+        <result column="chip_value" property="chipValue" />
+        <result column="farm_id" property="farmId" />
+        <result column="other1" property="other1" />
+        <result column="ohter2" property="ohter2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

src/main/resources/mapper/EnvDeviceMapper.xml

@@ -32,7 +32,7 @@
 
     <select id="list" resultType="com.huimv.admin.entity.vo.EnvDeviceVo">
           select d.id,d.device_code,d.device_sort_code,d.unit_id,d.device_name,d.build_location,d.device_status,d.feng_ji_num,d.xiao_chuang_num,d.dispose_time,dp.deploy_name
-          ,d.feng_ji_bian_num,d.shi_lian_num,d.dao_liu_ban,d.pen_wu_num,d.jia_re_qi_num,d.zhao_ming_deng_num
+          ,d.feng_ji_bian_num,d.shi_lian_num,d.dao_liu_ban,d.pen_wu_num,d.jia_re_qi_num,d.zhao_ming_deng_num,d.liao_ta_num,d.chu_chou_num,d.device_type
           from `env_device` d left join `env_dayage_peizhi` dp
           on d.dispose_time  = dp.time_dayage
             ${ew.customSqlSegment}