设备添加修改

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

@@ -9,7 +9,6 @@ import com.huimv.admin.entity.EnvWarning;
 import com.huimv.admin.entity.vo.WarningTopVo;
 import com.huimv.admin.mapper.EnvWarningMapper;
 import com.huimv.admin.service.IEnvWarningService;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -84,4 +84,12 @@ public class EnvDevice implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime disposeTime;
 
+    private Integer fengJiBianNum;
+    private Integer shiLianNum;
+    private Integer daoLiuBan;
+    private Integer penWuNum;
+    private Integer jiaReQiNum;
+    private Integer zhaoMingDengNum;
+    private Integer liaoTaNum;
+
 }

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

@@ -80,6 +80,17 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     @Autowired
     private EnvFeedMapper envFeedMapper;
 
+    @Autowired
+    private EnvDevicePadMapper padMapper;//湿帘
+    @Autowired
+    private EnvDeviceHeaterMapper heaterMapper;//加热器
+    @Autowired
+    private EnvDeviceFloodlightMapper floodlightMapper;//照明灯
+    @Autowired
+    private EnvDeviceDeflectorMapper deflectorMapper;//导流板
+    @Autowired
+    private EnvDeviceAtomizingMapper atomizingMapper;//喷雾
+
     @Override
     @Transactional
     public Result addPigpen(BasePigpenDto basePigpenDto) {
@@ -233,6 +244,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("name", envDeviceFenestrule.getChipName());
             jsonObject.put("status", envDeviceFenestrule.getChipStatus());
+            jsonObject.put("value", envDeviceFenestrule.getChipValue());
             jsonArray1.add(jsonObject);
         }
         map.put("xiaochuang", jsonArray1);
@@ -248,6 +260,69 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             jsonArray2.add(jsonObject);
         }
         map.put("other", jsonArray2);
+        //湿帘
+        JSONArray jsonArray4 = new JSONArray();
+        QueryWrapper<EnvDevicePad> padQueryWrapper = new QueryWrapper<>();
+        padQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDevicePad> envDevicePads = padMapper.selectList(padQueryWrapper);
+        for (EnvDevicePad envDevicePad : envDevicePads) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDevicePad.getChipName());
+            jsonObject.put("status", envDevicePad.getChipStatus());
+            jsonArray4.add(jsonObject);
+        }
+        map.put("shilian", jsonArray4);
+        //导流板
+        JSONArray jsonArray5 = new JSONArray();
+        QueryWrapper<EnvDeviceDeflector> deviceDeflectorQueryWrapper = new QueryWrapper<>();
+        deviceDeflectorQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceDeflector> envDeviceDeflectors = deflectorMapper.selectList(deviceDeflectorQueryWrapper);
+        for (EnvDeviceDeflector envDevicePad : envDeviceDeflectors) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDevicePad.getChipName());
+            jsonObject.put("status", envDevicePad.getChipStatus());
+            jsonObject.put("value", envDevicePad.getChipValue());
+            jsonArray5.add(jsonObject);
+        }
+        map.put("daoliuban", jsonArray5);
+        //喷雾
+        JSONArray jsonArray6 = new JSONArray();
+        QueryWrapper<EnvDeviceAtomizing> atomizingQueryWrapper = new QueryWrapper<>();
+        atomizingQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceAtomizing> atomizings = atomizingMapper.selectList(atomizingQueryWrapper);
+        for (EnvDeviceAtomizing envDevicePad : atomizings) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDevicePad.getChipName());
+            jsonObject.put("status", envDevicePad.getChipStatus());
+            jsonArray6.add(jsonObject);
+        }
+        map.put("penwu", jsonArray6);
+        //加热器
+        JSONArray jsonArray7 = new JSONArray();
+        QueryWrapper<EnvDeviceHeater> heaterQueryWrapper = new QueryWrapper<>();
+        heaterQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceHeater> heaters = heaterMapper.selectList(heaterQueryWrapper);
+        for (EnvDeviceHeater envDevicePad : heaters) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDevicePad.getChipName());
+            jsonObject.put("status", envDevicePad.getChipStatus());
+            jsonArray7.add(jsonObject);
+        }
+        map.put("jiareqi", jsonArray7);
+        //照明灯
+        JSONArray jsonArray8 = new JSONArray();
+        QueryWrapper<EnvDeviceFloodlight> floodlightQueryWrapper = new QueryWrapper<>();
+        floodlightQueryWrapper.eq("farm_id", farmId).eq("device_code", deviceSortCode);
+        List<EnvDeviceFloodlight> floodlights = floodlightMapper.selectList(floodlightQueryWrapper);
+        for (EnvDeviceFloodlight envDevicePad : floodlights) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("name", envDevicePad.getChipName());
+            jsonObject.put("status", envDevicePad.getChipStatus());
+            jsonObject.put("value", envDevicePad.getChipValue());
+            jsonArray8.add(jsonObject);
+        }
+        map.put("zhaomingdeng", jsonArray8);
+
         //实时数据
         JSONArray jsonArray3 = new JSONArray();
         QueryWrapper<EnvDeviceRecentlyData> queryWrapper = new QueryWrapper<>();

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

@@ -71,6 +71,20 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
     private EnvDeviceFenestruleMapper fenestruleMapper;//小窗
     @Autowired
     private EnvDeviceOtherMapper otherMapper;//
+    @Autowired
+    private EnvDevicePadMapper padMapper;//湿帘
+    @Autowired
+    private EnvDeviceHeaterMapper heaterMapper;//加热器
+    @Autowired
+    private EnvDeviceFloodlightMapper floodlightMapper;//照明灯
+    @Autowired
+    private EnvDeviceDeflectorMapper deflectorMapper;//导流板
+    @Autowired
+    private EnvDeviceAtomizingMapper atomizingMapper;//喷雾
+    @Autowired
+    private EnvDeviceRecentlyDataMapper recentlyDataMapper;
+
+
 //    @Autowired
 //    private RestTemplate restTemplate;
 
@@ -137,6 +151,12 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         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());
 
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
         basePigpenQueryWrapper.eq("farm_id", envDevice1.getFarmId()).eq("id", envDevice1.getUnitId());
@@ -292,7 +312,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         pressureMapper.insert(pressure);
 
 
-        for (int i = 1; i < envDevice1.getFengJiNum() + 5; i++) {
+        for (int i = 1; i < envDevice1.getFengJiNum() + 1; i++) {
             EnvDeviceFan fan = new EnvDeviceFan();
             fan.setDeviceCode(envDevice1.getDeviceSortCode());
             if (i < 10) {
@@ -300,27 +320,116 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             } else {
                 fan.setChipCode(envDevice1.getDeviceSortCode() + "11" + i);
             }
-            if (i < 20) {
-                fan.setChipName("风机" + i);
+            fan.setChipName("风机" + i);
+            fan.setFarmId(envDevice1.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++) {
+            EnvDeviceFan fan = new EnvDeviceFan();
+            fan.setDeviceCode(envDevice1.getDeviceSortCode());
+            if (i < 10) {
+                fan.setChipCode(envDevice1.getDeviceSortCode() + "110" + i);
             } else {
-                fan.setChipName("变频风机" + i);
+                fan.setChipCode(envDevice1.getDeviceSortCode() + "11" + i);
             }
+            fan.setChipName("变频风机" + j);
             fan.setFarmId(envDevice1.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());
-            fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "12" + i);
+
+            if (i < 10) {
+                fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "120" + i);
+            } else {
+                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 < 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);
+            }
+            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());
@@ -341,7 +450,6 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             if (i == 5) {
                 other.setChipName("锅炉");
             }
-
             other.setChipStatus(0);
             other.setOther1(String.valueOf(i));
             otherMapper.insert(other);
@@ -427,6 +535,26 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         QueryWrapper<EnvDeviceFenestrule> queryWrapper9 = new QueryWrapper<>();
         queryWrapper9.eq("device_code", deviceCode).eq("farm_id", farmId);
         fenestruleMapper.delete(queryWrapper9);//小窗
+
+        QueryWrapper<EnvDevicePad> queryWrapper11 = new QueryWrapper<>();
+        queryWrapper11.eq("device_code", deviceCode).eq("farm_id", farmId);
+        padMapper.delete(queryWrapper11);//湿帘
+        QueryWrapper<EnvDeviceDeflector> queryWrapper12 = new QueryWrapper<>();
+        queryWrapper12.eq("device_code", deviceCode).eq("farm_id", farmId);
+        deflectorMapper.delete(queryWrapper12);//导流板
+        QueryWrapper<EnvDeviceAtomizing> queryWrapper13 = new QueryWrapper<>();
+        queryWrapper13.eq("device_code", deviceCode).eq("farm_id", farmId);
+        atomizingMapper.delete(queryWrapper13);//喷雾
+        QueryWrapper<EnvDeviceHeater> queryWrapper14 = new QueryWrapper<>();
+        queryWrapper14.eq("device_code", deviceCode).eq("farm_id", farmId);
+        heaterMapper.delete(queryWrapper14);//加热器
+        QueryWrapper<EnvDeviceFloodlight> queryWrapper15 = new QueryWrapper<>();
+        queryWrapper15.eq("device_code", deviceCode).eq("farm_id", farmId);
+        floodlightMapper.delete(queryWrapper15);//照明灯
+        QueryWrapper<EnvDeviceRecentlyData> queryWrapper16 = new QueryWrapper<>();
+        queryWrapper16.eq("device_code", deviceCode).eq("farm_id", farmId);
+        recentlyDataMapper.delete(queryWrapper16);//
+
         QueryWrapper<EnvDeviceOther> queryWrapper10 = new QueryWrapper<>();
         queryWrapper10.eq("device_code", deviceCode).eq("farm_id", farmId);
         otherMapper.delete(queryWrapper10);//其他

src/main/resources/mapper/EnvDeviceMapper.xml

@@ -32,6 +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
           from `env_device` d left join `env_dayage_peizhi` dp
           on d.dispose_time  = dp.time_dayage
             ${ew.customSqlSegment}