Merge branch 'develop_dl_plan6_temp' of…

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

@@ -367,6 +367,7 @@ public class ConfigureController extends AbstractBaseController {
             item.put("startAndStopNum", 0);
             item.put("update_time", "--");
             item.put("equipment_index_name", "--");
+            if (item.containsKey("iot_code") && StringUtil.isNotEmpty(item.get("iot_code"))) {
                 String prefix = null;
                 String suffix = null;
                 String iotCode = item.get("iot_code").toString();
@@ -398,6 +399,7 @@ public class ConfigureController extends AbstractBaseController {
                     int num = collect.size();
                     item.put("startAndStopNum", num);
                 }
+            }
             resultMap.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 && Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 ? (resultMap.get("normalNum") + 1) : resultMap.get("normalNum"));
             resultMap.put("unNormalNum", (Integer) item.get("startAndStopNum") > 1 || Integer.parseInt(String.valueOf(item.get("isAlarm"))) > 0 ? (resultMap.get("unNormalNum") + 1) : resultMap.get("unNormalNum"));
             return item;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -728,7 +728,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     String key = entry.getKey();
                     List<EquipAlarmLineVo> collect = entry.getValue().stream().filter(x -> indexName.equals(x.getIndexName())).collect(Collectors.toList());
                     if (!CollectionUtils.isEmpty(collect)) {
-                        yData.add(collect.get(0).getTotal());
+                        yData.add(collect.stream().mapToInt(EquipAlarmLineVo::getTotal).sum());
                     } else {
                         yData.add(0);
                     }

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

@@ -103,6 +103,9 @@ equipment.plan.pump=92010600,92030600,92130400,92140200,92150300
 #iot.code.prefix.have.used=20210003,20210004,20210005
 # 电力使用
 iot.code.prefix.have.used=
+#装备服务在接收到站端iot推送的装备数据后进行influxdb存库
+#1.在装备接口消息处向influxdb/{productKey}/{deviceName} 消息地址推送数据，iot负责存库
+#2.配置文件添加配置项开关，默认为关闭，该功能只使用于中心及系统
 #是否向iot推送消息
 isSendIot=false
 

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

@@ -2847,7 +2847,6 @@
         LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id
         WHERE
         ed.`code` LIKE '92010800%'
-        AND es.iot_code IS NOT NULL
         AND es.biz_org_code like concat(#{bizOrgCode}, '%')
         <if test="systemCode!=null and systemCode!=''">
             AND fs.code = #{systemCode,jdbcType=VARCHAR}