From 5c19d31d85903152eb08336ba5d058461b1f34ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Wed, 15 Sep 2021 17:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AbnormalBillServiceImpl.java     | 15 +++++----------
 .../service/impl/AnomalyJobServiceImpl.java       |  5 ++---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 6e9f81fd..ac4a2bca 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -491,7 +491,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         LocalDateTime now = LocalDateTime.now();
         abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
 
-
         if(!StringUtil.isBlank(abnormalBillDispose.getRouterBo())){
             //分割该工艺路线
             String[] routerSplit = abnormalBillDispose.getRouterBo().split(",");
@@ -507,7 +506,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             }
         }
 
-
         //判断返修工单是否正确
         if(!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
             ShopOrder shopOrder = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBillDispose.getResolveShopOrder()));
@@ -527,8 +525,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBill.setStatus(Constants.PROGRAM_CONFIRM);
         abnormalBill.setProgram("true");
 
-
-
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
         this.saveOrUpdate(abnormalBill);
 
@@ -1018,6 +1014,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalMessage.setMessageType(messageType.getMessageType());
         //格式化消息
         String message = this.formatMessage(abnormalBill, abnormalMessage.getMessageType(), site);
+        //得到消息触发的时间
+        abnormalMessage.setResponseDateTime(now);
+        //得到要发送的消息
+        abnormalMessage.setContent(message);
+
         //设置发送的用户组和异常节点
         switch (abnormalBill.getStatus()){
             //新建
@@ -1080,12 +1081,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
 
 
-        //得到消息触发的时间
-        abnormalMessage.setResponseDateTime(now);
-
-        //得到要发送的消息
-        abnormalMessage.setContent(message);
-
         //设置状态，新建是N，响应为N，纠防确认是N，方案确认是Y，取消是Y,N为可以升级，Y为不可以升级
         if(Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getNode()) ||
            Constants.ABNORMAL_MESSAGE_REPORT.equals(abnormalMessage.getNode())){
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java
index 08f4016b..3e7921f9 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java
@@ -70,8 +70,6 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
         abnormalMessageQueryWrapper.lt("UP_DATE_TIME",now);
 //        AbnormalBill abnormalBill = new AbnormalBill();
         List<Message> abnormalMessages = messageMapper.selectList(abnormalMessageQueryWrapper);
-
-
         for(Message _abnormalMessage : abnormalMessages){
             String uuid = UUID.randomUUID().toString();
             Message abnormalMessage = new Message();
@@ -119,7 +117,8 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
             if(Constants.ABNORMAL_MESSAGE_REPORT.equals(abnormalMessage.getNode())){
                 abnormalMessage.setContent(message+",现已超时未响应");
             }else if(Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getNode())){
-                abnormalMessage.setContent(message+",现已响应超时");
+                //走判责提交和方案确认
+                abnormalMessage.setContent(message+",现已响应超时未方案确认");
             };
 
             //设置时间