bug修改

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

@@ -531,7 +531,7 @@ public class ConfigureController extends AbstractBaseController {
     }
     @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "物联监控大屏3大-获取某站下未消除的告警信息")
+    @ApiOperation(value = "物联监控大屏3大-获取某站下待确认的告警信息")
     @GetMapping("/todayAlarmUnEliminateMessage")
     public ResponseModel todayAlarmUnEliminateMessage(@RequestParam(required = false) String bizOrgCode) {
 

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

@@ -367,6 +367,15 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 carTransactionSynch(carProperties, carPropertyVos);
             }
         });
+        // 需要在事务提交之后，否侧事务隔离查询不出数据
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+            @Override
+            public void afterCommit() {
+                // 组态大屏消息推送，设备表实时指标修改
+//                intePageSysDataRefresh(equipmentSpecificIndexList, topicEntity);
+                mqttSendGateway.sendToMqtt(TopicEnum.EQXXTJ.getTopic(), "");
+            }
+        });
     }
 
     public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,

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

@@ -2571,12 +2571,13 @@
     <select id="getPressurePumpInfo3Small" resultType="java.util.Map">
         SELECT
             ed.`name`,
-            ed.area,
+            CONCAT( ws.`name`, ed.area ) area,
             es.iot_code,
             es.id
         FROM
             wl_equipment_detail ed
                 LEFT JOIN wl_equipment_specific es ON es.equipment_detail_id = ed.id
+                LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
         WHERE
             ed.`code` LIKE '92010800%'
           AND biz_org_code like concat(#{bizOrgCode}, '%')
@@ -3108,7 +3109,7 @@
     </select>
     <select id="todayAlarmUnEliminateEquipment" resultType="java.util.Map">
         SELECT
-        `a`.`currentDateNum` AS `currentDateNum`,
+        `a`.`unclearTotalNum` AS `currentDateNum`,
         (
         abs(
         (
@@ -3170,6 +3171,17 @@
         FROM
         `wl_equipment_specific_alarm_log`
         WHERE
+        status = 1
+        <if test="bizOrgCode != null and bizOrgCode != ''">
+            and equipment_specific_id in(SELECT id FROM wl_equipment_specific WHERE biz_org_code like concat(#{bizOrgCode}, '%'))
+        </if>
+        ) AS `unclearTotalNum`,
+        (
+        SELECT
+        count( DISTINCT `wl_equipment_specific_alarm_log`.`equipment_specific_id` )
+        FROM
+        `wl_equipment_specific_alarm_log`
+        WHERE
 
 
         create_date LIKE concat( cast( ( curdate( ) + INTERVAL - ( 1 ) DAY ) AS date ), '%' )
@@ -3214,7 +3226,7 @@
     </select>
     <select id="todayAlarmUnEliminateMessage" resultType="java.util.Map">
         SELECT
-        `a`.`currentDateNum` AS `currentDateNum`,
+        `a`.`unConfirmTotalNum` AS `currentDateNum`,
         (
         abs(
         (
@@ -3275,6 +3287,17 @@
         FROM
         `wl_equipment_specific_alarm_log`
         WHERE
+        confirm_date IS NULL
+        <if test="bizOrgCode != null and bizOrgCode != ''">
+            and equipment_specific_id in(SELECT id FROM wl_equipment_specific WHERE biz_org_code like concat(#{bizOrgCode}, '%'))
+        </if>
+        ) AS `unConfirmTotalNum`,
+        (
+        SELECT
+        count( `wl_equipment_specific_alarm_log`.`equipment_specific_id` )
+        FROM
+        `wl_equipment_specific_alarm_log`
+        WHERE
 
 
         create_date LIKE concat( cast( ( curdate( ) + INTERVAL - ( 1 ) DAY ) AS date ), '%' )