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/ConfigureController.java

@@ -362,6 +362,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();
@@ -393,6 +394,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/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}