diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java
index 270ab77..75ebc7b 100644
--- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java
+++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java
@@ -39,7 +39,7 @@ public class AlarmHandleFlowEntity extends BaseEntity {
 	@ApiModelProperty("告警内容")
 	private String alarmContent;
 
-	@ApiModelProperty("告警状态  1L,2L,3L,4L,5L  误报 、延后、缺陷 、检修、处理 ")
+	@ApiModelProperty("告警状态  1L,2L,3L,4L,5L，6L  误报 、延后、缺陷 、检修、处理、处理完成 ")
 	private Long handleWay;
 
 //	@ApiModelProperty("处理详情ID")
diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java
index cc57119..c8ae79c 100644
--- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java
+++ b/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;
@@ -28,3 +28,4 @@ public class HandleQueryVo {
     @ApiModelProperty("处理类型:1-延后 2-误报 3-缺陷 4-检修")
     private Long handleWay;
 }
+
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java
index 88f9c4e..307875d 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java
+++ b/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);
 	}
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java
index 5fd4a71..2f4527c 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java
+++ b/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;
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
index b32685f..c76c7c3 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
+++ b/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,
-        D.FALSE_ALARM_DESC,D.FILE_PATH,S.NAME AS STATION_NAME,P.CHECK_PROCESS_INSTANCE_ID,A.PROCESS_INSTANCE_ID
+        SELECT H.*,HANDLE_USER,H.PHENOMENON_ID,H.ACCESS_ID,H.DELAY_TIME,H.DELAY_CAUSE,
+        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
-        ON H.DETAIL_ID = D.ID
-        LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_STATION S
+        LEFT JOIN HZIMS_OPERATION.HZIMS_STATION S
         ON H.STATION_CODE = S.CODE
-        LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_OPER_PHENOMENON P
-        ON D.PHENOMENON_ID = P.ID
-        LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_OPER_ACCESS_PLAN A
-        ON D.ACCESS_ID = A.ID
+        LEFT JOIN HZIMS_OPERATION.HZIMS_OPER_PHENOMENON P
+        ON H.PHENOMENON_ID = P.ID
+        LEFT JOIN HZIMS_OPERATION.HZIMS_OPER_ACCESS_PLAN A
+        ON H.ACCESS_ID = A.ID
         <where>
             H.IS_DELETED = 0
             <if test="param.stationCode != null">
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java
index 82d85e3..e196455 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java
+++ b/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;
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java
index 0286009..f8fe32b 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java
@@ -35,103 +35,106 @@ import java.util.*;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class AlarmHandleFlowServiceImpl extends BaseServiceImpl<AlarmHandleFlowMapper, AlarmHandleFlowEntity> implements AlarmHandleFlowService{
+public class AlarmHandleFlowServiceImpl extends BaseServiceImpl<AlarmHandleFlowMapper, AlarmHandleFlowEntity> implements AlarmHandleFlowService {
 
 
-	private final IMessageClient messageClient;
+    private final IMessageClient messageClient;
 
-	private final ISysClient sysClient;
+    private final ISysClient sysClient;
 
-	private final IFlowClient processClient;
-	@Autowired
-	private  AlarmHandleMapper alarmHandleMapper;
+    private final IFlowClient processClient;
+    @Autowired
+    private AlarmHandleMapper alarmHandleMapper;
 
-	private final IFdpDiagnoseClient iFdpDiagnoseClient;
+    private final IFdpDiagnoseClient iFdpDiagnoseClient;
 
-	@Override
-	public R listenAndUpdate(ProcessWorkFlowResponse processWorkFlowResponse) {
-		long taskId;
-		AlarmHandleFlowEntity alarmHandleFlowEntity;
-		log.info("消缺消息开始转换"+processWorkFlowResponse);
-		try {
-			Map<String, Object> variables = (Map<String, Object>) processWorkFlowResponse.getVariables();
-			//现象缺陷全表更新
-			alarmHandleFlowEntity= JSONObject.parseObject(JSONObject.toJSONString(variables), new TypeReference<AlarmHandleFlowEntity>(){});
-		} catch (Exception e) {
-			log.info("消息转换失败："+e.getMessage());
-			return R.fail("消息转换失败");
-		}
-		taskId=alarmHandleFlowEntity.getId();
-		//设置当前环节+当前环节处理人
-		if (StringUtils.isNotEmpty(processWorkFlowResponse.getNextStepOperator())) {
-			alarmHandleFlowEntity.setCurrentOperator(processWorkFlowResponse.getTaskName());
-			alarmHandleFlowEntity.setCurrentLinkHandler(processWorkFlowResponse.getNextStepOperator());
-		}else {
-			alarmHandleFlowEntity.setCurrentOperator("流程结束");
-			alarmHandleFlowEntity.setCurrentLinkHandler("");
-			// 预警
-			if(AlarmHandleConstant.EARLY_WARNING.equals(alarmHandleFlowEntity.getAlarmType())){
-				Map<String, Object> map=new HashMap<>();
-				map.put("uuid",alarmHandleFlowEntity.getAlarmId());
-				map.put("result",alarmHandleFlowEntity.getHandleWay());
-				if (1l==alarmHandleFlowEntity.getHandleWay()){
-					//处理发现误报，修改对应状态
-					map.put("result_info",alarmHandleFlowEntity.getDealDesc());
-					alarmHandleMapper.update(null,Wrappers.<AlarmHandleEntity>lambdaUpdate()
-							.set(AlarmHandleEntity::getHandleWay, alarmHandleFlowEntity.getHandleWay())
-							.set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc())
-							.eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId()));
+    @Override
+    public R listenAndUpdate(ProcessWorkFlowResponse processWorkFlowResponse) {
+        long taskId;
+        AlarmHandleFlowEntity alarmHandleFlowEntity;
+        log.info("消缺消息开始转换" + processWorkFlowResponse);
+        try {
+            Map<String, Object> variables = (Map<String, Object>) processWorkFlowResponse.getVariables();
+            //现象缺陷全表更新
+            alarmHandleFlowEntity = JSONObject.parseObject(JSONObject.toJSONString(variables), new TypeReference<AlarmHandleFlowEntity>() {
+            });
+        } catch (Exception e) {
+            log.info("消息转换失败：" + e.getMessage());
+            return R.fail("消息转换失败");
+        }
+        taskId = alarmHandleFlowEntity.getId();
+        //设置当前环节+当前环节处理人
+        if (StringUtils.isNotEmpty(processWorkFlowResponse.getNextStepOperator())) {
+            alarmHandleFlowEntity.setCurrentOperator(processWorkFlowResponse.getTaskName());
+            alarmHandleFlowEntity.setCurrentLinkHandler(processWorkFlowResponse.getNextStepOperator());
+        } else {
+            alarmHandleFlowEntity.setCurrentOperator("流程结束");
+            alarmHandleFlowEntity.setCurrentLinkHandler("");
+            if (1l == alarmHandleFlowEntity.getHandleWay()) {
+                //如果是误诊，把处理结果复制到误报原因
+                alarmHandleFlowEntity.setFalseAlarmDesc(alarmHandleFlowEntity.getDealDesc());
+                alarmHandleMapper.update(null, Wrappers.<AlarmHandleEntity>lambdaUpdate()
+                        .set(AlarmHandleEntity::getHandleWay, alarmHandleFlowEntity.getHandleWay())
+                        .set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc())
+                        .eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId()));
+            } else {
+                //流程结束把告警状态修改为结束
+                alarmHandleFlowEntity.setHandleWay(6L);
+                //设置处理完成
+                alarmHandleMapper.update(null, Wrappers.<AlarmHandleEntity>lambdaUpdate()
+                        .set(AlarmHandleEntity::getHandleWay, 6l)
+                        .set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc())
+                        .eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId()));
+            }
+            // 预警，调用fdp
+            if (AlarmHandleConstant.EARLY_WARNING.equals(alarmHandleFlowEntity.getAlarmType())) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("uuid", alarmHandleFlowEntity.getAlarmId());
+                map.put("result", alarmHandleFlowEntity.getHandleWay());
+                map.put("result_info", alarmHandleFlowEntity.getDealDesc());
+                //流程结束后才，调用fdp修改状态的接口
+                R r = iFdpDiagnoseClient.setFaultStatusInfo(map);
+                if (!r.isSuccess()) {
+                    throw new ServiceException("修改告警状态异常，请稍后重试！");
+                }
+            }
 
-				}else {
-					//设置处理完成
-					alarmHandleMapper.update(null,Wrappers.<AlarmHandleEntity>lambdaUpdate()
-							.set(AlarmHandleEntity::getHandleWay, 6l)
-							.set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc())
-							.eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId()));
-					map.put("result_info",alarmHandleFlowEntity.getDealDesc());
-				}
-				//流程结束后才，调用fdp修改状态的接口
-				R r = iFdpDiagnoseClient.setFaultStatusInfo(map);
-				if (!r.isSuccess()){
-					throw new ServiceException("修改告警状态异常，请稍后重试！");
-				}
-			}
-		}
-		this.updateById(alarmHandleFlowEntity);
-		//推送消息中心相关消息
-		sendMessage(processWorkFlowResponse, alarmHandleFlowEntity,taskId);
-		log.info("消缺消息转换结束"+processWorkFlowResponse);
-		return R.success("消息保存成功");
-	}
+        }
+        this.updateById(alarmHandleFlowEntity);
+        //推送消息中心相关消息
+        sendMessage(processWorkFlowResponse, alarmHandleFlowEntity, taskId);
+        log.info("消缺消息转换结束" + processWorkFlowResponse);
+        return R.success("消息保存成功");
+    }
 
 
-	private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, AlarmHandleFlowEntity alarmHandleFlowEntity,Long taskId) {
-		//推送消息
-		if (processWorkFlowResponse.getTaskId() != null) {
-			BusinessMessageDTO message = new BusinessMessageDTO();
-			message.setBusinessClassify("system");
-			message.setBusinessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey());
-			message.setSubject(MessageConstants.BusinessClassifyEnum.WARNING.getDescription());
-			message.setTaskId(Optional.ofNullable(taskId).orElse(System.currentTimeMillis()));
-			message.setTenantId("200000");
-			String countent =
-					"您的告警处理流程待审批！告警内容:".concat(Optional.ofNullable(alarmHandleFlowEntity.getAlarmContent()).orElse(""))
-							.concat("，审批环节：")
-							.concat(processWorkFlowResponse.getTaskName());
-			message.setContent(countent);
-			message.setDeptId(alarmHandleFlowEntity.getCreateDept());
-			R<String> deptName = sysClient.getDeptName(alarmHandleFlowEntity.getCreateDept());
-			if (deptName.isSuccess()) {
-				message.setDeptName(deptName.getData());
-			}
-			String userIds = processWorkFlowResponse.getUserId();
-			if (StringUtils.isBlank(userIds)) {
-				log.error("推送的消息不能为空哦,{}", userIds);
-				return;
-			}
-			message.setUserIds(userIds);
-			message.setCreateUser(alarmHandleFlowEntity.getCreateUser());
-			messageClient.sendAppAndWsMsgByUsers(message);
-		}
-	}
+    private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, AlarmHandleFlowEntity alarmHandleFlowEntity, Long taskId) {
+        //推送消息
+        if (processWorkFlowResponse.getTaskId() != null) {
+            BusinessMessageDTO message = new BusinessMessageDTO();
+            message.setBusinessClassify("system");
+            message.setBusinessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey());
+            message.setSubject(MessageConstants.BusinessClassifyEnum.WARNING.getDescription());
+            message.setTaskId(Optional.ofNullable(taskId).orElse(System.currentTimeMillis()));
+            message.setTenantId("200000");
+            String countent =
+                    "您的告警处理流程待审批！告警内容:".concat(Optional.ofNullable(alarmHandleFlowEntity.getAlarmContent()).orElse(""))
+                            .concat("，审批环节：")
+                            .concat(processWorkFlowResponse.getTaskName());
+            message.setContent(countent);
+            message.setDeptId(alarmHandleFlowEntity.getCreateDept());
+            R<String> deptName = sysClient.getDeptName(alarmHandleFlowEntity.getCreateDept());
+            if (deptName.isSuccess()) {
+                message.setDeptName(deptName.getData());
+            }
+            String userIds = processWorkFlowResponse.getUserId();
+            if (StringUtils.isBlank(userIds)) {
+                log.error("推送的消息不能为空哦,{}", userIds);
+                return;
+            }
+            message.setUserIds(userIds);
+            message.setCreateUser(alarmHandleFlowEntity.getCreateUser());
+            messageClient.sendAppAndWsMsgByUsers(message);
+        }
+    }
 }
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java
index cc247c4..23a6ebc 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java
+++ b/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;
@@ -57,7 +53,7 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
 
 	private final IUserClient userClient;
 
-	private final IFdpMonitorClient fdpMonitorClient;
+//	private final IFdpMonitorClient fdpMonitorClient;
 
 	private final IFlowClient processClient;
 
@@ -106,13 +102,13 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
 //		entity.setAccessId(param.getAccessId());
 //		entity.setPhenomenonId(param.getPhenomenonId());
 		entity.setHandleUser(param.getHandleUser());
-		entity.setHandleUser(param.getHandleUser());
 		entity.setDelayTime(param.getDelayTime());
 		entity.setDelayCause(param.getDelayCause());
 		entity.setFalseAlarmDesc(param.getFalseAlarmDesc());
 		entity.setFilePath(param.getFilePath());
 		if (StringUtils.isNotBlank(AuthUtil.getUserName())){
-			entity.setCreateUserName(AuthUtil.getNickName());
+			entity.setCreateUserName(AuthUtil.getUserName());
+			param.setCreateUserName(AuthUtil.getUserName());
 			entity.setCreateDeptName(param.getCreateDeptName());
 		}
 		this.save(entity);
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
index 4cf5689..9e8d089 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
@@ -91,6 +91,7 @@ public class FdpAlarmServiceImpl implements FdpAlarmService {
         entity.setDeviceCode(item.getDeviceId());
         entity.setDeviceName(item.getDeviceName());
         entity.setAlarmStatus(Integer.valueOf(item.getStatus()));
+        entity.setAlarmValue(item.getInfo());
         entity.setStationId(item.getStation());
         entity.setAlarmSource(EARLY_WARNING);
         entity.setTenantId("200000");
diff --git a/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql b/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql
index f3d977f..cfbc886 100644
--- a/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql
+++ b/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql
@@ -207,42 +207,42 @@ CREATE TABLE `HZIMS_INTERRUPTION_ALARM`  (
 
 DROP TABLE IF EXISTS `hzims_alarm_handle_flow`;
 CREATE TABLE `hzims_alarm_handle_flow`  (
-                                            `ID` bigint(20) NOT NULL COMMENT '主键ID',
-                                            `ALARM_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警主键ID',
-                                            `STATION_CODE` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号',
-                                            `ALARM_TYPE` smallint(6) NULL DEFAULT NULL COMMENT '告警类型',
-                                            `ALARM_TIME` datetime(0) NULL DEFAULT NULL COMMENT '告警时间',
-                                            `ALARM_CONTENT` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警内容',
-                                            `TYPE` tinyint(1) NULL DEFAULT NULL COMMENT '类型：0-系统告警 1-智能告警',
-                                            `HANDLE_WAY` smallint(6) NULL DEFAULT NULL COMMENT '告警状态  1L,2L,3L,4L,5L  误报 、延后、缺陷 、检修、处理',
-                                            `HANDLE_USER` bigint(20) NULL DEFAULT NULL COMMENT '通知处理人',
-                                            `PHENOMENON_ID` bigint(20) NULL DEFAULT NULL COMMENT '现象ID',
-                                            `ACCESS_ID` bigint(20) NULL DEFAULT NULL COMMENT '检修ID',
-                                            `DELAY_TIME` datetime(0) NULL DEFAULT NULL COMMENT '延后时间',
-                                            `DELAY_CAUSE` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '延后原因',
-                                            `FALSE_ALARM_DESC` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '误报描述',
-                                            `FILE_PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件路径',
-                                            `DEAL_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理方式',
-                                            `DEAL_RESULT` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理结果',
-                                            `DEAL_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理描述',
-                                            `DEAL_PATH` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理附件',
-                                            `CHECK_FLAG` tinyint(4) NULL DEFAULT NULL COMMENT '审批结果 0，不通过；1为通过',
-                                            `CHECK_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批说明',
-                                            `CURRENT_OPERATOR` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前处理环节',
-                                            `CURRENT_LINK_HANDLER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前环节处理人',
-                                            `PROCESS_INSTANCE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例',
-                                            `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建用户姓名',
-                                            `HANDLE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理人姓名',
-                                            `APPROVAL_USER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批人',
-                                            `APPROVAL_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批人姓名',
-                                            `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID',
-                                            `CREATE_TIME` datetime(0) NOT NULL COMMENT '创建时间',
-                                            `UPDATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-                                            `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人',
-                                            `UPDATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
-                                            `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除',
-                                            `STATUS` tinyint(4) NOT NULL DEFAULT 0 COMMENT '状态',
-                                            `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门',
-                                            `CREATE_DEPT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建机构名称',
-                                            PRIMARY KEY (`ID`) USING BTREE
+    `ID` bigint(20) NOT NULL COMMENT '主键ID',
+    `ALARM_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警主键ID',
+    `STATION_CODE` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号',
+    `ALARM_TYPE` smallint(6) NULL DEFAULT NULL COMMENT '告警类型',
+    `ALARM_TIME` datetime(0) NULL DEFAULT NULL COMMENT '告警时间',
+    `ALARM_CONTENT` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警内容',
+    `TYPE` tinyint(1) NULL DEFAULT NULL COMMENT '类型：0-系统告警 1-智能告警',
+    `HANDLE_WAY` smallint(6) NULL DEFAULT NULL COMMENT '告警状态  1L,2L,3L,4L,5L  误报 、延后、缺陷 、检修、处理',
+    `HANDLE_USER` bigint(20) NULL DEFAULT NULL COMMENT '通知处理人',
+    `PHENOMENON_ID` bigint(20) NULL DEFAULT NULL COMMENT '现象ID',
+    `ACCESS_ID` bigint(20) NULL DEFAULT NULL COMMENT '检修ID',
+    `DELAY_TIME` datetime(0) NULL DEFAULT NULL COMMENT '延后时间',
+    `DELAY_CAUSE` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '延后原因',
+    `FALSE_ALARM_DESC` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '误报描述',
+    `FILE_PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件路径',
+    `DEAL_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理方式',
+    `DEAL_RESULT` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理结果',
+    `DEAL_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理描述',
+    `DEAL_PATH` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理附件',
+    `CHECK_FLAG` tinyint(4) NULL DEFAULT NULL COMMENT '审批结果 0，不通过；1为通过',
+    `CHECK_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批说明',
+    `CURRENT_OPERATOR` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前处理环节',
+    `CURRENT_LINK_HANDLER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前环节处理人',
+    `PROCESS_INSTANCE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例',
+    `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建用户姓名',
+    `HANDLE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理人姓名',
+    `APPROVAL_USER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批人',
+    `APPROVAL_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批人姓名',
+    `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID',
+    `CREATE_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+    `UPDATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+    `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人',
+    `UPDATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
+    `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `STATUS` tinyint(4) NOT NULL DEFAULT 0 COMMENT '状态',
+    `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门',
+    `CREATE_DEPT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建机构名称',
+    PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE = INNODB CHARACTER SET = UTF8 COLLATE = UTF8_GENERAL_CI ROW_FORMAT = DYNAMIC;
\ No newline at end of file
diff --git a/hzims-service/inspect/src/main/resources/db/2.0.0.sql.1 b/hzims-service/inspect/src/main/resources/db/2.0.0.sql.1
new file mode 100644
index 0000000..ac96636
--- /dev/null
+++ b/hzims-service/inspect/src/main/resources/db/2.0.0.sql.1
@@ -0,0 +1,3 @@
+ALTER TABLE `hzims-inspect`.`hz_st_ex_task_user` MODIFY COLUMN `CLAIM_STATUS` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '领用状态 0:未领用  1:已领用 每条任务可以存在多个用户，但是只有一个领用人' AFTER `USER_ID`;
+
+ALTER TABLE `hzims-inspect`.`hz_st_ex_task_user` ADD COLUMN `user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `TENANT_ID`;
\ No newline at end of file