Newspaper 1 vuosi sitten
vanhempi
commit
756862269f

+ 3 - 3
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceController.java

@@ -81,16 +81,16 @@ public class EnvDeviceController {
         envDeviceService.save(envDevice);
         //环控设备
         if (deviceType == 1){
-            Integer[] list = (Integer[]) paramsMap.get("list");
+            String device = (String) paramsMap.get("device");
             int fan = 1;
             int tp = 1;
             int spray = 1;
-            for (int i = 0; i <list.length ; i++) {
+            for (int i = 0; i < device.length() ; i++) {
                 EnvDeviceEquipment envDeviceEquipment = new EnvDeviceEquipment();
                 envDeviceEquipment.setEquipmentPort(i+1);
                 envDeviceEquipment.setUnitId(unitId);
                 envDeviceEquipment.setDeviceCode(deviceCode);
-                switch (list[i]){
+                switch (device.charAt(i)){
                     case 1:
                         envDeviceEquipment.setEquipmentName("风机"+fan);
                         envDeviceEquipment.setDeviceAlias(unitName+"风机");

+ 13 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -197,8 +197,21 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
             resultMap.put("envTemp",envDataVo.getEnvTemp());
             resultMap.put("envHum",envDataVo.getEnvHum());
         }
+        int fanStatus = 0,tpStatus = 0,sprayStatus = 0;
         resultMap.put("energyWater", energyWaterMapper.getUnitDayWater(farmId, unitId));
         resultMap.put("energyElectricity",energyElectricityMapper.getDayUnitElectricity(farmId, unitId));
+        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",1).eq("unit_id",unitId).eq("farm_id",farmId)) >= 1) {
+            fanStatus = 1;
+        }
+        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",2).eq("unit_id",unitId).eq("farm_id",farmId)) >= 1) {
+            tpStatus = 1;
+        }
+        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",3).eq("unit_id",unitId).eq("farm_id",farmId)) >= 1) {
+            sprayStatus = 1;
+        }
+        resultMap.put("fanStatus",fanStatus);
+        resultMap.put("tpStatus",tpStatus);
+        resultMap.put("sprayStatus",sprayStatus);
         List<EnvDeviceEquipment> fanList = envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).eq("equipment_type", 1));
         resultMap.put("fanList",fanList);
         List<EnvDeviceEquipment> tpList = envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).eq("equipment_type", 2));