1.确警确认类型落库，确警页面及故障告警及火灾告警使用到

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

@@ -57,6 +57,9 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("confirm_type")
     private String confirmType;
 
+    @ApiModelProperty(value = "确认类型名称，前端已确认时回填用")
+    private String confirmTypeName;
+
     @ApiModelProperty(value = "报警原因")
     @TableField("alarm_reason")
     private String alarmReason;

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

@@ -45,7 +45,6 @@ public class ConfirmAlarmController extends AbstractBaseController {
     public void confirmAlam(@RequestBody EquipmentSpecificAlarmLog ent) {
         String appKey = getAppKey();
         String product = getProduct();
-        String token = getToken();
         iConfirmAlarmService.confirmAlam(ent, appKey, product, getToken(), getUserId());
     }
 

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

@@ -138,7 +138,6 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
 
     Page<Map<String, Object>> page(Page page, @Param("param") CommonPageInfoParam param);
 
-    int count(CommonPageInfoParam param);
 
     List<HashMap<String, Object>> getAlarmList(CommonPageInfoParam param);
 

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

@@ -116,7 +116,6 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Override
     public Map<String, Object> getDetailsById(Long alarmId, Long equipId, String type, String area) {
         final String videoType = "video";
-        final String alarmType = "IOT_CORE_PARAM";
         Map<String, Object> res = new HashMap<>();
         if (videoType.equals(type)) {
             List<AlamVideoVO> video = videoMapper.getVideoBySpeId(equipId);

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

@@ -177,11 +177,6 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         Page<Map<String, Object>> resultPage = this.baseMapper.page(result, param);
         if (resultPage.getTotal() > 0) {
             for (Map<String, Object> x : resultPage.getRecords()) {
-                Object type = x.get("type");
-                if (AlarmTypeEnum.HZGJ.getCode().equals(type) || AlarmTypeEnum.GZGJ.getCode().equals(type)) {
-                    x.put("typeCode", type);
-                    x.put("type", AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
-                }
                 LocalDateTime createDate = (LocalDateTime) x.get("createDate");
                 x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
                 x.put("handleType", ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2343,4 +2343,15 @@
             where sd.description is null;
         </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1646291252942-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="confirm_type_name"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific_alarm_log add column confirm_type_name 确认类型名称前端回显用</comment>
+        <sql>
+            ALTER TABLE wl_equipment_specific_alarm_log ADD COLUMN `confirm_type_name` varchar(255) DEFAULT NULL COMMENT '确认类型名称前端回显用';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -32,6 +32,7 @@
 			) as protectName,
 			if(confirm_type is null,'去确认','已处理') isConfirm,
 			confirm_type,
+		    (select type_name from wl_signal_classify sc where sc.type_code = ala.confirm_type limit 1) as confirmTypeName,
 			alarm_reason,
 			resolve_result,
 			confirm_user,
@@ -61,6 +62,7 @@
         set
         confirm_date = now(),
         confirm_type = #{confirmType},
+		confirm_type_name = #{confirmTypeName},
         alarm_reason = #{alarmReason},
         resolve_result = #{resolveResult},
         confirm_user = #{confirmUser},

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

@@ -197,7 +197,8 @@
         WHEN 'false' THEN '否'
         ELSE wlesal.equipment_specific_index_value END
         AS fireEquipmentPointValue,
-        wlesal.type AS type,
+        wlesal.type AS typeCode,
+        (select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as type,
         wlesal.create_date AS createDate,
         CONCAT_WS(' ', wles.position,wled.area) AS warehouseStructureName, /*告警列表拼接详细地址*/
         (select
@@ -223,10 +224,10 @@
             </if>
             <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'">AND d.type = #{param.alarmType}</if>
-            <if test="param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if>
+            <if test="param.alarmType == 'BREAKDOWN'">AND d.typeCode = #{param.alarmType}</if>
+            <if test="param.alarmType == 'FIREALARM'">AND d.typeCode = #{param.alarmType}</if>
             <if test="param.orgCode != null and param.orgCode != ''">AND d.org_code = #{param.orgCode}</if>
-            <if test="param.type != null and param.type != ''">AND d.type = #{param.type}</if>
+            <if test="param.type != null and param.type != ''">AND d.typeCode = #{param.type}</if>
             <if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 1">AND
                 d.handleStatus = '已处理'
             </if>
@@ -250,43 +251,11 @@
                 d.cleanStatus = '未消除'
             </if>
             <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
-                d.type != 'SHIELD'
+                d.typeCode != 'SHIELD'
             </if>
         </where>
         ORDER BY d.createDate DESC
     </select>
-    <select id="count" resultType="java.lang.Integer">
-        SELECT
-        count(1) AS total_num
-        FROM
-        (
-        SELECT
-        wlesa.id,
-        wlesa.equipment_specific_id AS fireEquipmentId,
-        wles.code AS fireEquipmentCode,
-        wlesa.equipment_index_id AS fireEquipmentIndexId,
-        wlesa.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
-        wlesa.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
-        wlesa.type AS type,
-        wlesa.create_date AS createDate,
-        wlesa.location AS warehouseStructureName
-        FROM wl_equipment_specific_alarm_log wlesa
-        left join wl_equipment_specific wles ON wlesa.equipment_specific_id = wles.id
-        ) d
-        <where>
-            <if test="warehouseStructureName != null and warehouseStructureName != ''"> d.warehouseStructureName like
-                concat(concat("%",#{warehouseStructureName}),"%")
-            </if>
-            <if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
-                concat(concat("%",#{equipCode}),"%")
-            </if>
-            <if test="beginDate!=null">AND d.createDate >= #{beginDate}</if>
-            <if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
-            <if test="alarmType == 'BREAKDOWN'">AND d.type = #{alarmType}</if>
-            <if test="alarmType == 'FIREALARM'">AND d.type = #{alarmType}</if>
-        </where>
-    </select>
-    
     <select id="pageAlarmsInfo" resultType="Map">
         SELECT
         d.*