From 257de686683902bb6ef678429c20a43fb32c8bd6 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Wed, 19 Jul 2023 11:36:42 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E6=B6=88=E7=BC=BA=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81taskId=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../defect/service/impl/DefectCheckServiceImpl.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
index 0ad9bf9..a223594 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
@@ -258,7 +258,7 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
      */
     @Override
     public R listenAndUpdateDefect(ProcessWorkFlowResponse processWorkFlowResponse) {
-
+        long taskId;
         OperPhenomenonEntity operPhenomenonEntity;
         log.info("消缺消息开始转换");
         try {
@@ -291,6 +291,7 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
             Long differTime = TimeUtils.getDifferTime(operPhenomenonEntity.getPlanStartTime(), operPhenomenonEntity.getPlanEndTime());
             operPhenomenonEntity.setPlanHours(differTime.intValue());
         }
+        taskId = operPhenomenonEntity.getId();
         //缺陷库记录
         if (ObjectUtil.isNotEmpty(operPhenomenonEntity.getIsWarehousing()) && 1==(operPhenomenonEntity.getIsWarehousing())) {
             OperDefectEntity operDefectEntity = new OperDefectEntity();
@@ -300,6 +301,7 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
                 operDefectEntity.setActHours(operPhenomenonEntity.getCheckHours());
             }
             defectService.save(operDefectEntity);
+            taskId = operDefectEntity.getId();
             log.info("缺陷ID：" + operPhenomenonEntity.getDefectCode() + "入库成功");
             operPhenomenonEntity.setCurrentOperator("流程结束");
             operPhenomenonEntity.setCurrentLinkHandler(null);
@@ -317,19 +319,19 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
         statisticsService.updateById(statisticsEntity);
         operAppearanceService.updateById(appearanceEntity);
         //推送消息中心相关消息
-        sendMessage(processWorkFlowResponse, operPhenomenonEntity);
+        sendMessage(processWorkFlowResponse, operPhenomenonEntity,taskId);
         log.info("消缺消息转换结束");
         return R.success("消息保存成功");
     }
 
-    private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, OperPhenomenonEntity operPhenomenonEntity) {
+    private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, OperPhenomenonEntity operPhenomenonEntity,Long taskId) {
         //推送消息
         if (processWorkFlowResponse.getTaskId() != null) {
             BusinessMessageDTO message = new BusinessMessageDTO();
             message.setBusinessClassify("business");
             message.setBusinessKey(MessageConstants.BusinessClassifyEnum.OPERATIONDEFECTMESSAGE.getKey());
             message.setSubject(MessageConstants.BusinessClassifyEnum.OPERATIONDEFECTMESSAGE.getDescription());
-            message.setTaskId(operPhenomenonEntity.getId());
+            message.setTaskId(Optional.ofNullable(taskId).orElse(System.currentTimeMillis()));
             message.setTenantId("200000");
             String countent =
                     "您的消缺流程待审批！现象名称:".concat(Optional.ofNullable(operPhenomenonEntity.getFaultName()).orElse(""))