item：确警接口调试

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -184,4 +184,8 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("clean_time")
     @ApiModelProperty(value = "消除时间")
     private Date cleanTime;
+
+    @ApiModelProperty(value = "消除状态")
+    @TableField(exist = false)
+    private String cleanStatus;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/AlarmListDataVO.java

@@ -23,6 +23,8 @@ public class AlarmListDataVO {
 
     private String alarmEquip;
 
+    private String type;
+
     private String alarmType;
 
     private String alarmInfo;
@@ -34,4 +36,6 @@ public class AlarmListDataVO {
     private String alarmTypeCode;
 
     private String cleanStatus;
-}
+
+    private String cleanStatusVal;
+}
\ No newline at end of file

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

@@ -208,11 +208,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         || AlarmTypeEnum.PB.getCode().equals(type)) {
                     dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
                 }
+                dataVO.setType(String.valueOf(x.get("type")));
                 dataVO.setAlarmInfo(x.get("fireEquipmentName") + dataVO.getAlarmType());
                 dataVO.setEquipSpeId(Long.valueOf(String.valueOf(x.get("fireEquipmentId"))));
                 dataVO.setAlarmId(Long.valueOf(String.valueOf(x.get("alarmId"))));
                 dataVO.setAlarmTypeCode(String.valueOf(x.get("fireEquipmentSpecificIndexKey")));
                 dataVO.setCleanStatus(String.valueOf(x.get("cleanStatus")));
+                dataVO.setCleanStatusVal(String.valueOf(x.get("cleanStatusVal")));
                 res.add(dataVO);
             });
         }

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

@@ -44,7 +44,9 @@
 			confirm_user,
 			confirm_user_name,
 			confirm_date,
-			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName
+			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName,
+			if(ala.clean_time is null, '未清除', '已清除') AS cleanStatus,
+			ala.clean_time
         from
             wl_equipment_specific_alarm_log as ala
         left join wl_equipment_specific as spe on spe.id = ala.equipment_specific_id

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

@@ -311,6 +311,11 @@
         '已消除',
         '未消除'
         ) cleanStatus,
+        IF (
+        wlesal.clean_time IS NOT NULL,
+        '1',
+        '2'
+        ) cleanStatusVal,
         wlesal.confirm_type AS handleType,
         wlesal.system_codes AS systemCodes,
         wlesal.equipment_index_id AS fireEquipmentIndexId,
@@ -370,7 +375,7 @@
         </choose>
         <if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if>
         <if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if>
-        <if test="param.alarmType == 'BREAKDOWN' or param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if>
+        <if test="param.alarmType != null and param.alarmType != ''">AND d.type = #{param.alarmType}</if>
         <if test="param.systemCode != null and param.systemCode != ''">
             AND find_in_set(#{param.systemCode},d.systemCodes)
         </if>