Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

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

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.constant.Constant;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
+import com.yeejoin.equipmanage.common.entity.vo.IotIndexInfoVo;
 import com.yeejoin.equipmanage.common.utils.*;
 import com.yeejoin.equipmanage.fegin.IotFeign;
 import lombok.extern.slf4j.Slf4j;
@@ -430,35 +431,39 @@ public class EquipmentSpecificController extends AbstractBaseController {
     public ResponseModel getEquipmentIotIndexInfo(@PathVariable String equipSpeId, @RequestParam String beginDate,  @RequestParam String endDate,
                                                   @RequestParam(required = false) Integer isTrend, @RequestParam(required = false) String fieldKey) {
 
-        // 1.根据 equipSpeId 查询装备iotCode
-        EquipmentSpecific equipmentSpecific = equipmentSpecificMapper.selectById(equipSpeId);
-        if (ObjectUtils.isEmpty(equipmentSpecific)) {
-            return CommonResponseUtil.failure("未查询到装备信息!");
+        List<IotIndexInfoVo> indexInfoList = new ArrayList<>();
+        List<String> split= Arrays.asList(equipSpeId.split(","));
+        for (String s : split) {
+            // 1.根据 equipSpeId 查询装备iotCode
+            EquipmentSpecific equipmentSpecific = equipmentSpecificMapper.selectById(equipSpeId);
+            if (ObjectUtils.isEmpty(equipmentSpecific)) {
+                return CommonResponseUtil.failure("未查询到装备信息!");
+            }
+            String iotCode = equipmentSpecific.getIotCode();
+            String prefix = null;
+            String suffix = null;
+            if (StringUtil.isNotEmpty(iotCode) && iotCode.length() > 8) {
+                prefix = iotCode.substring(0, 8);
+                suffix = iotCode.substring(8);
+            } else {
+                return CommonResponseUtil.failure("装备物联编码错误，请确认！");
+            }
+            ResponseModel entity = null;
+            try {
+                entity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), beginDate, endDate, prefix, suffix, null);
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("调用iot服务出错");
+                return CommonResponseUtil.failure("请求失败");
+            }
+
+            if (RESULT_SUCCESS_CODE != entity.getStatus() && ObjectUtils.isEmpty(entity.getResult())) {
+                log.error("查询物联日志数据为空或iotCode为 (" + iotCode + ") 的装备不存在于物联系统中！");
+                return CommonResponseUtil.failure("物联日志数据为空");
+            }
+            indexInfoList.addAll(equipmentSpecificSerivce.getIndexInfoList(iotCode, entity, isTrend, fieldKey));
         }
-        String iotCode = equipmentSpecific.getIotCode();
-        String prefix = null;
-        String suffix = null;
-        if (StringUtil.isNotEmpty(iotCode) && iotCode.length() > 8) {
-            prefix = iotCode.substring(0, 8);
-            suffix = iotCode.substring(8);
-        } else {
-            return CommonResponseUtil.failure("装备物联编码错误，请确认！");
-        }
-        ResponseModel entity = null;
-        try {
-            entity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), beginDate, endDate, prefix, suffix, null);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("调用iot服务出错");
-            return CommonResponseUtil.failure("请求失败");
-        }
-
-        if (RESULT_SUCCESS_CODE != entity.getStatus() && ObjectUtils.isEmpty(entity.getResult())) {
-            log.error("查询物联日志数据为空或iotCode为 (" + iotCode + ") 的装备不存在于物联系统中！");
-            return CommonResponseUtil.failure("物联日志数据为空");
-        }
-
-        return CommonResponseUtil.success(equipmentSpecificSerivce.getIndexInfoList(iotCode, entity, isTrend, fieldKey));
+        return CommonResponseUtil.success(indexInfoList);
     }
 
 

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -121,4 +121,7 @@ state.code=GW190301
 state.name=\u9526\u5c4f\u6362\u6d41\u7ad9
 
 # 是否开启遥测数据上报
-is.open.telemetering=false
+is.open.telemetering=false
\ No newline at end of file
+
+# 水池液位相关信号
+water.level.indexKey=FHS_FirePoolDevice_WaterLevel,FHS_LevelDetector_WaterLevel,FHS_WirelessliquidDetector_WaterLevel,CAFS_FoamTank_FoamTankLevel,CAFS_WaterTank_WaterTankLevel
\ No newline at end of file

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

@@ -225,7 +225,7 @@
 			group_name
 	</select>
     <select id="getPerfQutoaIotList" resultType="com.yeejoin.equipmanage.common.entity.EquipmentIndex">
-		select id,name as perfQuotaName, name_key as perfQuotaDefinitionId,is_trend as isTrend,emergency_level_color as emergencyLevelColor  from wl_equipment_index s where equipment_id  = (
+		select id,name as perfQuotaName, name_key as perfQuotaDefinitionId,is_trend as isTrend,emergency_level_color as emergencyLevelColor, type_name as typeName, type_code as typeCode  from wl_equipment_index s where equipment_id  = (
 			select equipment_id from wl_equipment_detail wei where id = (
 				select equipment_detail_id from wl_equipment_specific where id = #{id})
 		)