#告警处理记录

hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.operational.alert.vo;
+package com.hnac.hzims.alarm.show.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java

@@ -6,6 +6,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity;
 import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
 import com.hnac.hzims.alarm.show.service.AlarmHandleService;
+import com.hnac.hzims.alarm.show.vo.HandleQueryVo;
 import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
@@ -55,7 +56,7 @@ public class AlarmHandleController extends BladeController {
 	@OperationAnnotation(moduleName = "分页查询告警处理记录", title = "查询告警处理记录", operatorType = OperatorType.MOBILE, businessType =
 			BusinessType.GENCODE,
 			action = "分页")
-	public R<IPage<AlarmHandleVo>> list(com.hnac.hzims.operational.alert.vo.HandleQueryVo param, Query query) {
+	public R<IPage<AlarmHandleVo>> list(HandleQueryVo param, Query query) {
 		IPage<AlarmHandleVo> pages = service.pageCondition(query, param);
 		return R.data(pages);
 	}

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java

@@ -3,7 +3,7 @@ package com.hnac.hzims.alarm.show.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity;
 import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
-import com.hnac.hzims.operational.alert.vo.HandleQueryVo;
+import com.hnac.hzims.alarm.show.vo.HandleQueryVo;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml

@@ -4,17 +4,15 @@
 
 
     <select id="selectHandlePage" resultType="com.hnac.hzims.alarm.config.vo.AlarmHandleVo">
-        SELECT H.*,HANDLE_USER,D.PHENOMENON_ID,D.ACCESS_ID,D.DELAY_TIME,D.DELAY_CAUSE,
+        SELECT H.*,HANDLE_USER,H.PHENOMENON_ID,H.ACCESS_ID,H.DELAY_TIME,H.DELAY_CAUSE,
-        D.FALSE_ALARM_DESC,D.FILE_PATH,S.NAME AS STATION_NAME,P.CHECK_PROCESS_INSTANCE_ID,A.PROCESS_INSTANCE_ID
+        H.FALSE_ALARM_DESC,H.FILE_PATH,S.NAME AS STATION_NAME,P.CHECK_PROCESS_INSTANCE_ID,A.PROCESS_INSTANCE_ID
         FROM HZIMS_ALARM_HANDLE H
-        LEFT JOIN  HZIMS_ALARM_HANDLE_DETAIL D
+        LEFT JOIN HZIMS_OPERATION.HZIMS_STATION S
-        ON H.DETAIL_ID = D.ID
-        LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_STATION S
         ON H.STATION_CODE = S.CODE
-        LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_OPER_PHENOMENON P
+        LEFT JOIN HZIMS_OPERATION.HZIMS_OPER_PHENOMENON P
-        ON D.PHENOMENON_ID = P.ID
+        ON H.PHENOMENON_ID = P.ID
-        LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_OPER_ACCESS_PLAN A
+        LEFT JOIN HZIMS_OPERATION.HZIMS_OPER_ACCESS_PLAN A
-        ON D.ACCESS_ID = A.ID
+        ON H.ACCESS_ID = A.ID
         <where>
             H.IS_DELETED = 0
             <if test="param.stationCode != null">

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity;
 import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity;
 import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
-import com.hnac.hzims.operational.alert.vo.HandleQueryVo;
+import com.hnac.hzims.alarm.show.vo.HandleQueryVo;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.system.user.entity.User;

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java

@@ -2,20 +2,18 @@ package com.hnac.hzims.alarm.show.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hnac.hzims.alarm.config.constants.AlarmHandleConstant;
 import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity;
 import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity;
+import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
 import com.hnac.hzims.alarm.show.mapper.AlarmHandleFlowMapper;
 import com.hnac.hzims.alarm.show.mapper.AlarmHandleMapper;
 import com.hnac.hzims.alarm.show.service.AlarmHandleDetailService;
 import com.hnac.hzims.alarm.show.service.AlarmHandleService;
+import com.hnac.hzims.alarm.show.vo.HandleQueryVo;
 import com.hnac.hzims.alarm.show.wrapper.HandleWrapper;
-import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
 import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.fdp.feign.IFdpDiagnoseClient;
-import com.hnac.hzims.fdp.feign.IFdpMonitorClient;
-import com.hnac.hzims.fdp.vo.UpdateFaultStateVo;
-import com.hnac.hzims.alarm.config.constants.AlarmHandleConstant;
-import com.hnac.hzims.operational.alert.vo.HandleQueryVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
@@ -24,7 +22,6 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.feign.IFlowClient;
@@ -34,7 +31,6 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
-import javax.xml.ws.WebServiceException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;