提交警情确认缺陷相关功能

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

+package com.yeejoin.equipmanage.common.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author keyong
+ * @title: IdxBizDefectVo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/9/27 18:44
+ */
+@Data
+public class IdxBizDefectVo {
+    private String id;
+    @ApiModelProperty(value = "缺陷等级1-一般 2-严重 3-危急")
+    private Integer defectLevel;
+    @ApiModelProperty(value = "缺陷设备ids")
+    private String defectEquipmentIds;
+    @ApiModelProperty(value = "缺陷设备名称")
+    private String defectEquipmentName;
+    @ApiModelProperty(value = "缺陷设备类型1-装备2-系统3-水源")
+    private Integer defectEquipmentType;
+    @ApiModelProperty(value = "缺陷描述")
+    private String defectDescribe;
+    @ApiModelProperty(value = "缺陷来源 1-巡查 2-维保 3-消防检测 4-其他")
+    private Integer defectResource;
+    @ApiModelProperty(value = "缺陷类型")
+    private String defectType;
+    @ApiModelProperty(value = "缺陷图片")
+    private String defectImg;
+    @ApiModelProperty(value = "发现日期")
+    private Date defectDiscoverDate;
+    @ApiModelProperty(value = "发现人")
+    private String defectDiscover;
+    @ApiModelProperty(value = "计划消缺日期")
+    private Date planClearDate;
+    @ApiModelProperty(value = "责任人")
+    private String defectResponsible;
+    @ApiModelProperty(value = "处理状态(0：未处理，1：已处理，2：处理中)")
+    private Integer defectStatus;
+    @ApiModelProperty(value = "是否需要停电处理(0：不需要，1：需要)")
+    private Integer isPowerCut;
+    @ApiModelProperty(value = "换流站名称")
+    private String bizOrgName;
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+    @ApiModelProperty(value = "公司编码")
+    private String orgCode;
+    @ApiModelProperty(value = "添加时间")
+    private Date addTime;
+    @ApiModelProperty(value = "处理措施/处理情况")
+    private String handleSituation;
+    @ApiModelProperty(value = "处理-图片")
+    private String handleImg;
+    @ApiModelProperty(value = "工作票号")
+    private String handleWorkTicketNum;
+    @ApiModelProperty(value = "工作负责人")
+    private String handleWorkLeader;
+    @ApiModelProperty(value = "工作票是否已消号 1-已消号 0 -未消号")
+    private Integer handleWorkIdTicket;
+    @ApiModelProperty(value = "负责人检查日期")
+    private String handleLeaderDate;
+    @ApiModelProperty(value = "负责人")
+    private String handleLeader;
+    @ApiModelProperty(value = "消缺日期")
+    private Date handleClearDate;
+    @ApiModelProperty(value = "消缺人")
+    private String handleClearPerson;
+    @ApiModelProperty(value = "缺陷编号")
+    private String defectNum;
+    @ApiModelProperty(value = "超期提醒")
+    private String expiredWarning;
+    @ApiModelProperty(value = "缺陷状态【装备用】")
+    private String defectStatusName;
+    @ApiModelProperty(value = "告警id")
+    private String specificAlarmLogId;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml

@@ -66,6 +66,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-module-tzs-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

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

 package com.yeejoin.equipmanage.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.feign.IdxFeignService;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.MonitorEvent;
+import com.yeejoin.equipmanage.common.entity.vo.IdxBizDefectVo;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
 import com.yeejoin.equipmanage.service.IConfirmAlarmService;
 import com.yeejoin.equipmanage.service.impl.MonitorEventService;
@@ -14,6 +18,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -34,6 +39,8 @@ public class ConfirmAlarmController extends AbstractBaseController {
     EquipmentSpecificAlarmLogMapper equipmentSpecificAlarmLogMapper;
     @Autowired
     private MonitorEventService monitorEventService;
+    @Autowired
+    private IdxFeignService idxFeignService;
 
     @GetMapping(value = "/getDetailsById")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -98,4 +105,14 @@ public class ConfirmAlarmController extends AbstractBaseController {
     public Map<String, Object> getEquipSceneAndRelationVideo(@PathVariable Long equipmentSpecificId) {
         return iConfirmAlarmService.getEquipSceneAndRelationVideo(equipmentSpecificId);
     }
+
+    @GetMapping(value = "/defect/status/{id}")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "缺陷处理状态")
+    public IdxBizDefectVo getDefectStatus(@PathVariable String id) {
+        ResponseModel<JSONObject> responseModel = idxFeignService.queryDefectByAlarmLogId(id);
+        JSONObject result = responseModel.getResult();
+        IdxBizDefectVo vo = JSON.parseObject(JSON.toJSONString(result), IdxBizDefectVo.class);
+        return vo;
+    }
 }

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

@@ -8,7 +8,6 @@ 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;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
-import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
 import com.yeejoin.equipmanage.common.enums.*;
@@ -23,6 +22,7 @@ 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.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -39,16 +39,24 @@ import java.util.*;
 @Service
 public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, EquipmentSpecificAlarm> implements IConfirmAlarmService {
 
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(ConfirmAlarmServiceImpl.class);
+
     private final static String FIELD_NAME = "longitude,latitude";
 
     @Autowired
     private RemoteSecurityService remoteSecurityService;
 
+    static ConfirmAlarmMapper confirmAlarmMapper;
     @Autowired
-    ConfirmAlarmMapper confirmAlarmMapper;
+    public void setConfirmAlarmMapper(ConfirmAlarmMapper confirmAlarmMapper){
+        ConfirmAlarmServiceImpl.confirmAlarmMapper = confirmAlarmMapper;
+    }
 
+    private static JcsFeign jcsFeign;
     @Autowired
-    private JcsFeign jcsFeign;
+    public void setJcsFeign(JcsFeign jcsFeign){
+        ConfirmAlarmServiceImpl.jcsFeign = jcsFeign;
+    }
 
     @Autowired
     VideoMapper videoMapper;
@@ -66,9 +74,12 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Autowired
     private IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService;
 
+    private static IEquipmentSpecificSerivce equipmentSpecificSerivce;
     @Autowired
     @Lazy
-    private IEquipmentSpecificSerivce equipmentSpecificSerivce;
+    public void setIEquipmentSpecificIndexSerivce(IEquipmentSpecificSerivce equipmentSpecificSerivce){
+        ConfirmAlarmServiceImpl.equipmentSpecificSerivce = equipmentSpecificSerivce;
+    }
 
     @Autowired
     private IEquipmentSpecificIndexSerivce iEquipmentSpecificIndexSerivce;
@@ -88,8 +99,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Autowired
     private SystemctlFeign systemctlFeign;
 
+    private static RuleConfirmAlarmService ruleConfirmAlamService;
     @Autowired
-    private RuleConfirmAlarmService ruleConfirmAlamService;
+    public void setRuleConfirmAlamService(RuleConfirmAlarmService ruleConfirmAlamService){
+        ConfirmAlarmServiceImpl.ruleConfirmAlamService = ruleConfirmAlamService;
+    }
 
     @Autowired
     private EquipmentSpecificMapper equipmentSpecificMapper;
@@ -103,8 +117,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Autowired
     private ISignalClassifyService signalClassifyService;
 
+    private static IFormInstanceService instanceService;
     @Autowired
-    private IFormInstanceService instanceService;
+    public void setInstanceService(IFormInstanceService instanceService){
+        ConfirmAlarmServiceImpl.instanceService = instanceService;
+    }
 
     @Autowired
     private SourceSceneMapper sourceSceneMapper;
@@ -373,7 +390,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
 
 
     //查询当前建筑是否是 最顶级建筑
-    public List<FormInstance> selectBuildingById(List<FormInstance> formInstances){
+    public static List<FormInstance> selectBuildingById(List<FormInstance> formInstances){
         if (formInstances.get(0).getGroupType().equals("building")){
             return formInstances;
         }
@@ -390,7 +407,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     }
 
 
-    public void sendIotSystemAlarm(EquipmentSpecificAlarmLog ent, String userId, String appKey, String product, String token){
+    public static void sendIotSystemAlarm(EquipmentSpecificAlarmLog ent, String userId, String appKey, String product, String token){
 //        Token serverToken = remoteSecurityService.getServerToken();
         IotSystemAlarmRo confirmAlamVo = new IotSystemAlarmRo();
         confirmAlamVo.setId(ent.getId());

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.mchange.v2.beans.swing.TestBean;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentDefectAlarm;
@@ -86,8 +85,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
 
+    static EquipmentSpecificMapper equipmentSpecificMapper;
     @Autowired
-    EquipmentSpecificMapper equipmentSpecificMapper;
+    public void setEquipmentSpecificMapper(EquipmentSpecificMapper equipmentSpecificMapper){
+        MqttReceiveServiceImpl.equipmentSpecificMapper = equipmentSpecificMapper;
+    }
 
     @Autowired
     FireFightingSystemMapper FireFightingSystemMapper;
@@ -129,8 +131,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     private SystemctlFeign systemctlFeign;
 
+    private static RemoteSecurityService remoteSecurityService;
     @Autowired
-    private RemoteSecurityService remoteSecurityService;
+    public void setRemoteSecurityService(RemoteSecurityService remoteSecurityService){
+        MqttReceiveServiceImpl.remoteSecurityService = remoteSecurityService;
+    }
 
     @Autowired
     private TopographyService topographyService;
@@ -168,6 +173,12 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${isSendIot:false}")
     private Boolean isSendIot;
 
+    private static Boolean jcsSwitch;
+    @Value("${systemctl.jcs.switch}")
+    public void setJcsSwitch(Boolean jcsSwitch){
+        MqttReceiveServiceImpl.jcsSwitch = jcsSwitch;
+    }
+
     private static Boolean bool = Boolean.FALSE;
 
     @Override
@@ -407,13 +418,52 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
         List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper()
                 .selectList(queryWrapper);
+        EquipmentSpecificAlarmLog log = logs.get(0);
+        String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(log.getEquipmentSpecificId());
+        EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
+        Date date = new Date();
         logs.forEach(x -> {
             x.setCleanTime(new Date());
             x.setStatus(AlarmStatusEnum.HF.getCode());
             if (!StringUtils.isEmpty(traceId)) {
                 x.setTraceId(traceId);
             }
+            // 自动确警处理
+            if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.ZDXC.getCode().equals(cleanType)){
+                x.setConfirmType(x.getType());
+                x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
+                String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
+                if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
+                    x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
+                } else {
+                    x.setAlarmReason(equipmentName + "引起设备报警");
+                }
+                x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
+                x.setConfirmUser("");
+                x.setConfirmUserName("系统自动处理");
+                x.setConfirmDate(date);
+            }
         });
+        Token token = remoteSecurityService.getServerToken();
+        String toke = token.getToke();
+        String appKey = token.getAppKey();
+        String product = token.getProduct();
+        String userId = remoteSecurityService.getAgencyUser().getUserId();
+        if (jcsSwitch && AlarmTypeEnum.HZGJ.getCode().equals(log.getType())) {
+            // 确警消息发送
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(userId)) {
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            ConfirmAlarmServiceImpl.sendIotSystemAlarm(log, userId, appKey, product, toke);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
+            }
+        }
         if (!logs.isEmpty()) {
             equipmentSpecificAlarmLogService.updateBatchById(logs);
         }

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

@@ -2998,4 +2998,19 @@
                 ADD COLUMN `design_org_telephone` varchar(32) NULL COMMENT '设计单位联系方式';
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1664185585-1">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="wl_equipment_specific_alarm" columnName="confirm_type"/>
+        </preConditions>
+        <comment>删除不需要的属性字段</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific_alarm` DROP COLUMN `confirm_type`,
+            ALTER TABLE `wl_equipment_specific_alarm` DROP COLUMN `alam_reason`,
+            ALTER TABLE `wl_equipment_specific_alarm` DROP COLUMN `resolve_result`,
+            ALTER TABLE `wl_equipment_specific_alarm` DROP COLUMN `confirm_user`,
+            ALTER TABLE `wl_equipment_specific_alarm` DROP COLUMN `confirm_user_name`,
+            ALTER TABLE `wl_equipment_specific_alarm` DROP COLUMN `confirm_date`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/IdxFeignService.java

@@ -25,4 +25,19 @@ public interface IdxFeignService {
      */
     @RequestMapping(value = "/table/{tableId}", method = RequestMethod.GET)
     ResponseModel<JSONObject> queryByTableId(@PathVariable String tableId);
+
+    /***
+      * <pre>
+      * @Description: 根据告警id查询缺陷治理情况
+      * </pre>
+      *
+      * @MethodName:
+      * @Param:
+      * @Return: null
+      * @Throws
+      * @Author keyong
+      * @Date 2022/9/27 17:46
+      */
+    @RequestMapping(value = "/defect/alarm/{alarmLogId}", method = RequestMethod.GET)
+    ResponseModel<JSONObject> queryDefectByAlarmLogId(@PathVariable String alarmLogId);
 }