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

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

@@ -1468,7 +1468,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     private void doWaterStationWarning(String bizOrgCode, String bizOrgName) {
         List<Map<String, Object>> result = poolStatisticController.getStationWaterPanelInfo(bizOrgCode).getResult();
         String indexValue = result.stream()
-                .map(map -> (BigDecimal) map.get("volumeBigDecimal"))
+                .map(map -> (BigDecimal) map.getOrDefault("volumeBigDecimal", new BigDecimal(0)))
                 .reduce(BigDecimal.ZERO, BigDecimal::add).toString();
         doWaterStationInfo(bizOrgCode, bizOrgName, indexValue);
     }

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

@@ -7158,7 +7158,7 @@
         FROM
             (
                 (SELECT
-                    sum( n.num )
+                    sum( n.num ) as indexNum
                 FROM
                     (
                 SELECT
@@ -7175,7 +7175,6 @@
                 GROUP BY
                     a.id
                     ) n
-                    )
                 ) AS indexNum,
                 (SELECT count( 1 ) AS equipNum FROM wl_equipment_specific es LEFT JOIN wl_equipment e ON e.`code` = es.equipment_code WHERE e.is_iot = 1
                     <if test="bizOrgCode!=null and bizOrgCode!=''">