稳压泵、管网压力、水池水箱泡沫罐告警事件添加逻辑

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentIndexMapper.java

@@ -66,4 +66,6 @@ public interface EquipmentIndexMapper extends BaseMapper<EquipmentIndex> {
     List<EquipmentIndex> getPerfQutoaIotList(Long id);
 
     List<String> getGruopName(Long equipmentId);
+
+    EquipmentIndex  getMessage(@Param("equipmentSpecificId")Long equipmentSpecificId, @Param("equipmentIndexKey")String equipmentIndexKey);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/quartz/PumpSendMessage.java

@@ -11,6 +11,7 @@ import com.yeejoin.equipmanage.common.vo.Token;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
 import com.yeejoin.equipmanage.mapper.MarqueeDataMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
@@ -36,6 +37,7 @@ public class PumpSendMessage implements Job {
             SystemctlFeign systemctlFeign = (SystemctlFeign)jobDataMap.get("systemctlFeign");
             RemoteSecurityService remoteSecurityService = (RemoteSecurityService)jobDataMap.get("remoteSecurityService");
             MarqueeDataMapper marqueeDataMapper = (MarqueeDataMapper)jobDataMap.get("marqueeDataMapper");
+            IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService = (IEquipmentSpecificAlarmLogService)jobDataMap.get("equipmentSpecificAlarmLogService");
 
             MessageModel model = new MessageModel();
             model.setSendTime(new Date());
@@ -64,6 +66,8 @@ public class PumpSendMessage implements Job {
                 marqueeData.setType("漏水提醒");
                 marqueeData.setCreateDate(new Date());
                 marqueeDataMapper.insert(marqueeData);
+                // 稳压泵漏水告警添加告警事件信息
+                equipmentSpecificAlarmLogService.pressurePumpDisposeAlarm(equipmentSpecific.getId());
             }
 
             model.setBody(body);

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentAlarmLogDto;
@@ -61,4 +62,9 @@ public interface IEquipmentSpecificAlarmLogService extends IService<EquipmentSpe
      * @return
      */
     Page<EquipmentAlarmLogDto> getEquipAlarmLog(String id, String startTime, String endTime, long pageSize, long current );
+
+
+    void pressurePumpDisposeAlarm(Long equipmentSpecificId);
+
+    void pressurePumpRestore(Long equipmentSpecificId);
 }

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

@@ -230,4 +230,21 @@
 				select equipment_detail_id from wl_equipment_specific where id = #{id})
 		)
 	</select>
+	<select id="getMessage" resultType="com.yeejoin.equipmanage.common.entity.EquipmentIndex">
+		SELECT
+			wei.id,
+		       wei.equipment_id as equipmentId,
+		       wei.name_key as perfQuotaDefinitionId,
+		       wei.emergency_level as emergencyLevel,
+		       wei.emergency_level_describe as emergencyLevelDescribe,
+		       wei.emergency_level_color as emergencyLevelColor,
+		       wei.type_code as typeCode ,
+		       wei.name as perfQuotaName
+		FROM
+			`wl_equipment_index` wei
+				LEFT JOIN wl_equipment_specific_index wesi ON wei.id = wesi.equipment_index_id
+		WHERE
+			wesi.equipment_specific_id = #{equipmentSpecificId}
+		  AND wesi.equipment_index_key = #{equipmentIndexKey}
+	</select>
 </mapper>

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

@@ -64,39 +64,39 @@
             wles.biz_org_code like concat (#{param.bizOrgCode},'%')
         </if>
     </where>
-    UNION ALL
-    SELECT
-    equipment_specific_id id,
-    NULL org_code,
-    null fireEquipmentId,
-    NULL equipDetailId,
-    NULL fireEquipmentCode,
-    null systemId,
-    NULL fireEquipmentName,
-    NULL alamContent,
-    NULL handleStatus,
-    NULL cleanStatus,
-    NULL handleType,
-    NULL fireEquipmentIndexId,
-    NULL fireEquipmentSpecificIndexKey,
-    type fireEquipmentSpecificIndexName,
-    NULL buildId,
-    NULL imgUrl,
-    NULL fireEquipmentPointValue,
-    NULL typeCode,
-    NULL type,
-    date_format( create_date, '%Y-%m-%d %H:%i:%s' ) createDate,
-    NULL warehouseStructureName,
-    NULL equipmentName,
-    NAME equipmentSpecificName,
-    position,
-    id messageId,
-    message_type messageType,
-    is_read isRead
-    FROM
-    wl_marquee_data
-    WHERE
-    is_read = '0'
+--     UNION ALL
+--     SELECT
+--     equipment_specific_id id,
+--     NULL org_code,
+--     null fireEquipmentId,
+--     NULL equipDetailId,
+--     NULL fireEquipmentCode,
+--     null systemId,
+--     NULL fireEquipmentName,
+--     NULL alamContent,
+--     NULL handleStatus,
+--     NULL cleanStatus,
+--     NULL handleType,
+--     NULL fireEquipmentIndexId,
+--     NULL fireEquipmentSpecificIndexKey,
+--     type fireEquipmentSpecificIndexName,
+--     NULL buildId,
+--     NULL imgUrl,
+--     NULL fireEquipmentPointValue,
+--     NULL typeCode,
+--     NULL type,
+--     date_format( create_date, '%Y-%m-%d %H:%i:%s' ) createDate,
+--     NULL warehouseStructureName,
+--     NULL equipmentName,
+--     NAME equipmentSpecificName,
+--     position,
+--     id messageId,
+--     message_type messageType,
+--     is_read isRead
+--     FROM
+--     wl_marquee_data
+--     WHERE
+--     is_read = '0'
     ORDER BY createDate DESC
     </select>
 </mapper>