提交警情清除策略相关代码

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

@@ -101,4 +101,10 @@ public class Equipment extends BaseEntity {
      */
     @TableField(value = "is_iot")
     private String isIot = "0";
+
+    /**
+     * 警情消除策略 【0：收到复位信号自动消除；1：警情处理确认后消除】
+     */
+    @TableField(value = "clean_type")
+    private String cleanType = "0";
 }

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

@@ -180,4 +180,8 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("build_id")
     @ApiModelProperty(value = "建筑id")
     private String buildId;
+
+    @TableField("clean_time")
+    @ApiModelProperty(value = "消除时间")
+    private Date cleanTime;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/AlarmCleanTypeEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author keyong
+ * @title: AlarmCleanTypeEnum
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/01/05 12:04
+ */
+@AllArgsConstructor
+@Getter
+public enum AlarmCleanTypeEnum {
+
+    ZDXC("0", "收到复位信号自动消除"), QRXC("1", "警情处理确认后消除");
+
+    private String code;
+    private String name;
+}

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

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
-import com.yeejoin.equipmanage.common.entity.MaintenanceResourceData;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
@@ -200,4 +197,6 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
      * @return 指标详情
      */
     List<Map<String, String>> getBoxTropicsIndexDetails();
+
+    String getEquipmentBySpecificId(@Param("specificId") Long specificId);
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -11,16 +12,22 @@ 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.vo.AlamVideoVO;
+import com.yeejoin.equipmanage.common.enums.AlarmCleanTypeEnum;
+import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
 import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
 import com.yeejoin.equipmanage.common.enums.TopicEnum;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.mapper.ConfirmAlarmMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.mapper.VideoMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.remote.WebMqttHandler;
 import com.yeejoin.equipmanage.service.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -28,6 +35,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,6 +85,14 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Autowired
     private RuleConfirmAlarmService ruleConfirmAlamService;
 
+    @Autowired
+    private EquipmentSpecificMapper equipmentSpecificMapper;
+
+    @Autowired
+    private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
+
+
+
     @Override
     public Map<String, Object> getDetailsById(Long alarmId, Long equipId, String type, String area) {
         final String videoType = "video";
@@ -122,6 +138,27 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             if (!ObjectUtils.isEmpty(alarmLog)) {
                 Long equipmentSpecificAlarmId = alarmLog.getEquipmentSpecificAlarmId();
                 ent.setEquipmentSpecificAlarmId(equipmentSpecificAlarmId);
+                String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
+                if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {
+                    EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
+                    alarm.setStatus(AlarmStatusEnum.HF.getCode());
+                    equipmentSpecificAlarmMapper.updateById(alarm);
+                    if (isBatch == 1) {
+                        List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
+                        logs = logs.stream().map(x -> {
+                            BeanUtils.copyProperties(ent, x);
+                            x.setCleanTime(new Date());
+                            x.setStatus(AlarmStatusEnum.HF.getCode());
+                            return x;
+                        }).collect(Collectors.toList());
+                        equipmentSpecificAlarmLogService.updateBatchById(logs);
+                    } else {
+                        ent.setCleanTime(new Date());
+                        ent.setStatus(AlarmStatusEnum.HF.getCode());
+                        equipmentSpecificAlarmLogService.updateById(ent);
+                    }
+                    return;
+                }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 isBatch = ent.getIsBatch();
                 if (isBatch == 1) {

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

@@ -126,8 +126,6 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 
     @Override
     public boolean addEquipmentDef(Equipment equipment) throws IllegalArgumentException {
-        try {
-
             // 查询装备定义名陈是否重复
             nameDuplicate(equipment);
             // 设置code属性
@@ -138,18 +136,19 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
                 equipment.setCode(code);
             }
             int num = equipmentMapper.insert(equipment);
+
 //            saveEquipmentQRCodes(equipment);
             JSONObject equipRuleParams = new JSONObject();
             equipRuleParams.put("name", equipment.getName());
             equipRuleParams.put("inspectionSpecId", equipment.getInspectionSpec());
+            try {
                 patrolFeign.getEquipDetail(equipRuleParams.toJSONString());
+            } catch (Exception e) {
+                log.error("新增装备定义操作中，检测到巡检服务未启动或启动出错！");
+            }
             if (num > 0) {
                 return true;
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("录入的装备名称重复！");
-        }
             return false;
     }
 
@@ -232,7 +231,11 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
             JSONObject equipRuleParams = new JSONObject();
             equipRuleParams.put("name", equipment1.getName());
             equipRuleParams.put("inspectionSpecId", equipment1.getInspectionSpec());
+            try {
                 patrolFeign.getEquipDetail(equipRuleParams.toJSONString());
+            } catch (Exception e) {
+                log.error("编辑装备定义操作中，检测到巡检服务未启动或启动出错！");
+            }
             if (savedEquipment > 0) {
                 return true;
             }

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

@@ -2049,4 +2049,26 @@
         </sql>
     </changeSet>
 
+    <changeSet author="keyong" id="1641367742-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="clean_time"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific_alarm_log add column clean_time</comment>
+        <sql>
+            alter table `wl_equipment_specific_alarm_log` add column `clean_time` datetime DEFAULT NULL COMMENT '消除时间';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1641367742-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment" columnName="clean_type"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment add column clean_type</comment>
+        <sql>
+            ALTER TABLE wl_equipment ADD COLUMN clean_type varchar(50) DEFAULT NULL COMMENT '警情消除方式(0：收到复位信号自动消除；1：警情处理确认后消除)';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -1439,4 +1439,15 @@
         WHERE
             s.equipment_code = '92251100TZE44'
     </select>
+
+    <select id="getEquipmentBySpecificId" resultType="String">
+        select
+         we.clean_type
+        from
+         wl_Equipment we
+         LEFT JOIN `wl_equipment_detail` wed ON wed.equipment_id = we.id
+         LEFT JOIN `wl_equipment_specific` wes ON wes.equipment_detail_id = wed.id
+        where
+            wes.id = #{specificId}
+    </select>
 </mapper>
\ No newline at end of file