修改消缺流程代码

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/constants/TreatMethodConstant.java

@@ -10,6 +10,7 @@ public interface TreatMethodConstant {
 	 * 流程主键
 	 */
 	String DEFECT_CHECK_PRIMARY_KEY = "defect_check";
+	String DEFECT_CHECK_PRIMARY_KEY_TY = "defectDealty";
 
 	/**
 	 * 1-应急抢修处理 、2 - 检修任务处理 、 3- 检修计划处理

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperAppearanceEntity.java

@@ -0,0 +1,169 @@
+package com.hnac.hzims.operational.defect.entity;
+
+import com.baomidou.mybatisplus.annotation.SqlCondition;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.QueryField;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+/**
+ *  实体类
+ *
+ * @author Chill
+ */
+@Data
+@TableName("hzims_oper_appearance")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "现象表", description = "现象表")
+public class OperAppearanceEntity extends TenantEntity {
+
+	private static final long serialVersionUID = 8353403086998937117L;
+
+	/**
+	 * 缺陷编码
+	 */
+	@QueryField(condition = SqlCondition.LIKE)
+	@ApiModelProperty(value = "缺陷编码")
+	private String defectCode;
+	/**
+	 * 问题来源:ZB:值班管理,RCWH:日常维护,XJ:巡检管理,JX:检修管理,ZNZD:智能诊断
+	 */
+	@QueryField(condition = SqlCondition.EQUAL)
+	@ApiModelProperty(value = "问题来源: 数据字典：defectSource")
+	private String sourceCode;
+
+	/**
+	 * 问题发现人
+	 */
+	@QueryField(condition = SqlCondition.EQUAL)
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "问题发现人")
+	private Long finder;
+	/**
+	 * 问题类型：
+	 *
+	 */
+	@QueryField(condition = SqlCondition.EQUAL)
+	@ApiModelProperty(value = "问题类型：字典key : defectType")
+	private String typeCode;
+	/**
+	 * 发现时间
+	 */
+	@DateTimeFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "发现时间")
+	private Date findTime;
+
+	/**
+	 * 名称
+	 */
+	@QueryField(condition = SqlCondition.LIKE)
+	@ApiModelProperty(value = "名称,如果是设备则是设备名称。")
+	private String name;
+	/**
+	 * 设备编号
+	 */
+	@QueryField(condition = SqlCondition.LIKE)
+	@ApiModelProperty(value = "设备编号")
+	private String emCode;
+	/**
+	 * 故障编码
+	 */
+	@QueryField(condition = SqlCondition.LIKE)
+	@ApiModelProperty(value = "故障缺陷编码")
+	private String faultCode;
+	/**
+	 * 故障名称
+	 */
+	@QueryField(condition = SqlCondition.LIKE)
+	@ApiModelProperty(value = "故障缺陷名称")
+	private String faultName;
+	/**
+	 * 现象描述
+	 */
+	@ApiModelProperty(value = "现象描述")
+	private String descripiton;
+	/**
+	 * 故障文件附件，多个文件url通过,隔开
+	 */
+	@ApiModelProperty(value = "现象文件附件，多个文件url通过,隔开")
+	private String fileUrls;
+	/**
+	 * 初步分析结果
+	 */
+	@ApiModelProperty(value = "初步分析结果")
+	private String initResult;
+
+
+	/**
+	 * 甄别人
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "甄别人")
+	private Long discriminator;
+	/**
+	 * 甄别时间
+	 */
+	@DateTimeFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "甄别时间")
+	private Date discriminateTime;
+
+
+
+	/**
+	 * 甄别状态：已甄别 1 和未甄别 0 ，默认0
+	 */
+	@QueryField(condition = SqlCondition.EQUAL)
+	@ApiModelProperty(value = "甄别状态：已甄别 1 和未甄别 0 ，默认0")
+	private String discriminateStatus;
+
+	/**
+	 * 是否为缺陷
+	 */
+	@QueryField(condition = SqlCondition.EQUAL)
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "是否为缺陷，0 否，1是")
+	private Integer isDefect;
+	/**
+	 * 甄别描述
+	 */
+	@ApiModelProperty(value = "甄别描述")
+	private String discriminateDesc;
+	/**
+	 * 备注（冗余）
+	 */
+	@ApiModelProperty(value = "备注（冗余）")
+	private String remark;
+
+	/**
+	 * 是否使用智能诊断
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "是否使用智能诊断")
+	private Integer isDiagnosis;
+	/**
+	 * 智能诊断任务ID
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "智能诊断任务ID")
+	private Long diagnosisId;
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectEntity.java

@@ -4,17 +4,18 @@ import com.baomidou.mybatisplus.annotation.SqlCondition;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springblade.core.mp.support.QueryField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.springblade.core.tenant.mp.TenantEntity;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.QueryField;
+import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.YearMonth;
 import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -89,16 +90,17 @@ public class OperDefectEntity extends TenantEntity {
     private String disposeDesc;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "开始时间")
+    @ApiModelProperty(value = "缺陷创建时间-开始时间")
     private String startTime;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "结束时间")
+    @ApiModelProperty(value = "缺陷创建时间-结束时间")
     private String endTime;
 
-    @TableField(exist = false)
+//    20230612弃用该字段，无地方引用
-    @ApiModelProperty(value = "机构编号集合")
+//    @TableField(exist = false)
-    private List<Long> deptIds;
+//    @ApiModelProperty(value = "机构编号集合")
+//    private List<Long> deptIds;
 
 
     /**
@@ -113,4 +115,55 @@ public class OperDefectEntity extends TenantEntity {
     @ApiModelProperty(value = "年月")
     @TableField(exist = false)
     private YearMonth yearMonth;
+    /**
+     * 计划处理人
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "计划处理人")
+    private String planHandler;
+    /**
+     * 处理结论
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "处理结论")
+    private String handlerConclusion;
+
+    /**
+     * 缺陷等级
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "缺陷等级")
+    private String defectGrading;
+    /**
+     * 定论词条
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "定论词条")
+    private String conclusionLabel;
+
+    /**
+     * 备注（冗余）
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "备注（冗余）")
+    private String remark;
+    /**
+     * 是否使用智能诊断
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "是否使用智能诊断")
+    private Integer isDiagnosis;
+    /**
+     * 智能诊断任务ID
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "智能诊断任务ID")
+    private Long diagnosisId;
+    /**
+     * 已有缺陷编码
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "已有缺陷编码")
+    private String existDefectId;
+
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectStatisticsEntity.java

@@ -5,16 +5,15 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.NullSerializer;
-import org.springblade.core.mp.support.QueryField;
-import org.springblade.core.tenant.mp.TenantEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.QueryField;
+import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-import java.time.LocalDateTime;
 
 
 /**
@@ -227,4 +226,60 @@ public class OperDefectStatisticsEntity extends TenantEntity {
 	@ApiModelProperty(value = "定论时间")
 	private Date conclusionTime;
 
+	/**
+	 * 计划处理人
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "计划处理人")
+	private String planHandler;
+
+	/**
+	 * 处理结论
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "处理结论")
+	private String handlerConclusion;
+	/**
+	 * 是否入库
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "是否入库")
+	private Boolean isWarehousing;
+	/**
+	 * 当前处理环节
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "当前处理环节")
+	private String currentOperator;
+	/**
+	 * 当前环节处理人
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "当前环节处理人")
+	private String currentLinkHandler;
+	/**
+	 * 备注（冗余）
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "备注（冗余）")
+	private String remark;
+	/**
+	 * 是否使用智能诊断
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "是否使用智能诊断")
+	private Integer isDiagnosis;
+	/**
+	 * 智能诊断任务ID
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "智能诊断任务ID")
+	private Long diagnosisId;
+	/**
+	 * 已有缺陷编码
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "已有缺陷编码")
+	private String existDefectId;
+
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperPhenomenonEntity.java

@@ -1,23 +1,19 @@
 package com.hnac.hzims.operational.defect.entity;
 
 import com.baomidou.mybatisplus.annotation.SqlCondition;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.NullSerializer;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.springblade.core.mp.support.QueryField;
-import org.springblade.core.tenant.mp.TenantEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.QueryField;
+import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.YearMonth;
 import java.util.Date;
-import java.time.LocalDateTime;
 
 
 /**
@@ -28,7 +24,7 @@ import java.time.LocalDateTime;
 @Data
 @TableName("hzims_oper_phenomenon")
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "问题现象表", description = "问题现象表")
+@ApiModel(value = "问题现象全表", description = "问题现象全表")
 public class OperPhenomenonEntity extends TenantEntity {
 
 	private static final long serialVersionUID = 8353403086998937117L;
@@ -54,7 +50,7 @@ public class OperPhenomenonEntity extends TenantEntity {
 	/**
 	 * 甄别流程实例
 	 */
-	@ApiModelProperty(value = "甄别流程实例")
+	@ApiModelProperty(value = "流程实例")
 	private String checkProcessInstanceId;
 	/**
 	 * 问题发现人
@@ -64,7 +60,7 @@ public class OperPhenomenonEntity extends TenantEntity {
 	@ApiModelProperty(value = "问题发现人")
 	private Long finder;
 	/**
-	 * 问题类型：
+	 * 问题类型：0-设备和1-非设备。
 	 *
 	 */
 	@QueryField(condition = SqlCondition.EQUAL)
@@ -287,4 +283,100 @@ public class OperPhenomenonEntity extends TenantEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@ApiModelProperty(value = "核算工时")
 	private Integer checkHours;
+	/**
+	 * 计划处理人
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "计划处理人")
+	private String planHandler;
+	/**
+	 * 实际开始时间
+	 */
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "实际开始时间")
+	private Date actStartTime;
+
+	/**
+	 * 实际结束时间
+	 */
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "实际结束时间")
+	private Date actEndTime;
+	/**
+	 * 处理结论
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "处理结论")
+	private String handlerConclusion;
+	/**
+	 * 是否入库
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "是否入库")
+	private Boolean isWarehousing;
+	/**
+	 * 缺陷等级
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "缺陷等级")
+	private String defectGrading;
+	/**
+	 * 定论词条
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "定论词条")
+	private String conclusionLabel;
+	/**
+	 * 当前处理环节
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "当前处理环节")
+	private String currentOperator;
+	/**
+	 * 当前环节处理人
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "当前环节处理人")
+	private String currentLinkHandler;
+	/**
+	 * 备注（冗余）
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "备注（冗余）")
+	private String remark;
+	/**
+	 * 是否使用智能诊断
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "是否使用智能诊断")
+	private Integer isDiagnosis;
+	/**
+	 * 智能诊断任务ID
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "智能诊断任务ID")
+	private Long diagnosisId;
+	/**
+	 * 已有缺陷编码
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ApiModelProperty(value = "已有缺陷编码")
+	private String existDefectId;
+	/**
+	 * 现象名称
+	 */
+	@QueryField(condition = SqlCondition.LIKE)
+	@ApiModelProperty(value = "现象名称")
+	private String defectName;
+
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/feign/Fallback/IOperDefectClientFallback.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.operational.defect.feign.Fallback;
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.defect.entity.OperDefectEntity;
 import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
 import com.hnac.hzims.operational.defect.feign.IOperDefectClient;
@@ -34,4 +35,9 @@ public class IOperDefectClientFallback implements IOperDefectClient {
 		log.error("远程调用失败，接口：" + CREATE_DEFECT);
 		return null;
 	}
+	@Override
+	public R saveDefect(ProcessWorkFlowResponse processWorkFlowResponse) {
+		log.error("远程调用失败，接口：" + SAVE_DEFECT);
+		return null;
+	}
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/feign/IOperDefectClient.java

@@ -1,6 +1,6 @@
 package com.hnac.hzims.operational.defect.feign;
 
-
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.OperationalConstants;
 import com.hnac.hzims.operational.defect.entity.OperDefectEntity;
 import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
@@ -26,6 +26,8 @@ public interface IOperDefectClient {
 	String UPDATE_DEFECT_HANDLER_STATE = API_PREFIX + "/updateDefectHandlerState";
 	String CREATE_DEFECT = API_PREFIX + "/createDefect";
 
+	String SAVE_DEFECT = API_PREFIX + "/saveDefect";
+
 	/**
 	 * 修改缺陷信息
 	 * @param entity
@@ -39,4 +41,10 @@ public interface IOperDefectClient {
 
 	@PostMapping(CREATE_DEFECT)
 	R createDefect(@RequestBody OperPhenomenonEntity phenomenon);
+
+	@PostMapping(SAVE_DEFECT)
+	R saveDefect(@RequestBody ProcessWorkFlowResponse processWorkFlowResponse);
+
+
+
 }

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java

@@ -1,7 +1,6 @@
 package com.hnac.hzims.message;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -55,6 +54,7 @@ public class MessageConstants {
 		ACCESS("access","检修消息"),
 		TICKETMESSAGE("ticket-message","工作票消息"),
 		OPERATIONTICKETMESSAGE("operation-ticket-message","操作票消息"),
+		OPERATIONDEFECTMESSAGE("operation-defect-message","消缺消息"),
 		;
 		@Getter
 		private String key;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/DefectCheckController.java

@@ -5,17 +5,16 @@ import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
 import com.hnac.hzims.operational.defect.service.IDefectCheckService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.flow.core.vo.ComleteTask;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
-
+import org.springframework.web.bind.annotation.RequestBody;
-import javax.validation.Valid;
+import org.springframework.web.bind.annotation.RequestMapping;
-import javax.validation.constraints.NotNull;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author ysj

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/feign/OperDefectClient.java

@@ -1,12 +1,13 @@
 package com.hnac.hzims.operational.defect.feign;
 
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.defect.entity.OperDefectEntity;
 import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
 import com.hnac.hzims.operational.defect.service.IDefectCheckService;
 import com.hnac.hzims.operational.defect.service.IOperDefectService;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,8 +33,15 @@ public class OperDefectClient implements IOperDefectClient {
 		return R.data(service.updateDefectHanderState(entity));
 	}
 
+	@PostMapping(CREATE_DEFECT)
 	@Override
 	public R createDefect(@RequestBody OperPhenomenonEntity entity) {
 		return R.data(defectCheckService.startCheck(entity));
 	}
+
+	@PostMapping(SAVE_DEFECT)
+	@Override
+	public R saveDefect(@RequestBody ProcessWorkFlowResponse processWorkFlowResponse) {
+		return defectCheckService.listenAndUpdateDefect(processWorkFlowResponse);
+	}
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperAppearanceMapper.java

@@ -0,0 +1,14 @@
+package com.hnac.hzims.operational.defect.mapper;
+
+import com.hnac.hzims.operational.defect.entity.OperAppearanceEntity;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author Chill
+ */
+public interface OperAppearanceMapper extends UserDataScopeBaseMapper<OperAppearanceEntity> {
+
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperAppearanceMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.operational.defect.mapper.OperAppearanceMapper">
+
+
+</mapper>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IDefectCheckService.java

@@ -1,7 +1,9 @@
 package com.hnac.hzims.operational.defect.service;
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
 import org.springblade.flow.core.vo.ComleteTask;
 
 
@@ -42,6 +44,7 @@ public interface IDefectCheckService extends BaseService<OperPhenomenonEntity> {
 	 * @param task
 	 */
 	void conclusion(ComleteTask task);
+	R listenAndUpdateDefect(ProcessWorkFlowResponse processWorkFlowResponse);
 
 
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperAppearanceService.java

@@ -0,0 +1,13 @@
+package com.hnac.hzims.operational.defect.service;
+
+import com.hnac.hzims.operational.defect.entity.OperAppearanceEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ *  服务类
+ *
+ * @author Chill
+ */
+public interface IOperAppearanceService extends BaseService<OperAppearanceEntity> {
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperAppearanceServiceImpl.java

@@ -0,0 +1,16 @@
+package com.hnac.hzims.operational.defect.service.impl;
+
+import com.hnac.hzims.operational.defect.entity.OperAppearanceEntity;
+import com.hnac.hzims.operational.defect.mapper.OperAppearanceMapper;
+import com.hnac.hzims.operational.defect.service.IOperAppearanceService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务实现类
+ *
+ * @author Chill
+ */
+@Service
+public class OperAppearanceServiceImpl extends BaseServiceImpl<OperAppearanceMapper, OperAppearanceEntity> implements IOperAppearanceService {
+}