fix: 消防给水系统实时运行状态-消防水池，二级弹窗没有数据

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -5,15 +5,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.enums.IndexStatusEnum;
 import com.yeejoin.equipmanage.common.utils.*;
 import com.yeejoin.equipmanage.config.PersonIdentify;
 import com.yeejoin.equipmanage.fegin.IotFeign;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
-import com.yeejoin.equipmanage.service.IEmergencyService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.ISupervisionVideoService;
+import com.yeejoin.equipmanage.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -50,6 +48,9 @@ public class SupervisionConfigureController extends AbstractBaseController {
     private IFireFightingSystemService iFireFightingSystemService;
 
     @Autowired
+    private IEquipmentSpecificIndexSerivce equipmentSpecificIndexService;
+
+    @Autowired
     private IEquipmentSpecificAlarmService equipmentSpecificAlarmService;
 
     @Autowired
@@ -558,6 +559,16 @@ public class SupervisionConfigureController extends AbstractBaseController {
         if (ObjectUtils.isEmpty(map) || ObjectUtils.isEmpty(map.get("iot_code"))) {
             return CommonResponseUtil.success(null);
         }
+        List<EquipmentSpecificIndex> equipmentSpecificIndexes = equipmentSpecificIndexService.getEquipmentSpeIndexByEquipmentSecificId(Long.valueOf(equipmentSpecificId));
+        String fieldKey = "";
+        for (EquipmentSpecificIndex equipmentSpecificIndex : equipmentSpecificIndexes) {
+            if (Objects.equals(equipmentSpecificIndex.getEquipmentIndexKey(), "FHS_FirePoolDevice_WaterLevel") || Objects.equals(equipmentSpecificIndex.getEquipmentIndexKey(), "FHS_WirelessliquidDetector_WaterLevel")) {
+                fieldKey = equipmentSpecificIndex.getEquipmentIndexKey();
+            }
+        }
+        if (StringUtils.isBlank(fieldKey)) {
+            return CommonResponseUtil.success(null);
+        }
         String iotCode = map.get("iot_code").toString();
         String prefix, suffix;
         if (iotCode.length() > 8) {
@@ -568,7 +579,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
         }
         ResponseModel mounthEntity;
         try {
-            mounthEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startTime, endTime, prefix, suffix, "FHS_FirePoolDevice_WaterLevel");
+            mounthEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startTime, endTime, prefix, suffix, fieldKey);
         } catch (Exception e) {
             throw new BadRequest("请求物联平台失败，请稍后重试！");
         }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -154,6 +154,7 @@
                wesi.VALUE,
                wesi.create_date,
                wesi.equipment_index_id,
+               wesi.equipment_index_key,
                wli.`name` nameKey
         FROM wl_equipment_specific_index wesi
                  LEFT JOIN wl_equipment_index wli ON wesi.equipment_index_id = wli.id