From a6ca2de18f549edc1e04c41a54d654adfc04bcde Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 25 Feb 2022 17:28:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AA=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8E=E8=80=97=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectServiceImpl.java      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index e6e70e2c73..6a591d9e8d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -453,10 +453,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION,
 				ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current);
 
-		projectEntity.setStatus(ProjectConstant.CLOSED);
-		projectEntity.setClosedStatus(fromDTO.getClosedStatus());
-		projectEntity.setWorkMinutes(workMinutes);
-		baseDao.updateById(projectEntity);
+		ProjectEntity newProject = new ProjectEntity();
+		newProject.setId(fromDTO.getProjectId());
+		newProject.setStatus(ProjectConstant.CLOSED);
+		newProject.setClosedStatus(fromDTO.getClosedStatus());
+		newProject.setWorkMinutes(workMinutes);
+		baseDao.updateById(newProject);
 		//更新项目关联表
 		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
 		projectStaffEntity.setId(fromDTO.getProjectStaffId());
@@ -655,10 +657,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION,
 				ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current);
 
-		projectEntity.setStatus(ProjectConstant.CLOSED);
-		projectEntity.setClosedStatus(fromDTO.getClosedStatus());
-		projectEntity.setWorkMinutes(workMinutes);
-		baseDao.updateById(projectEntity);
+		ProjectEntity newProject = new ProjectEntity();
+		newProject.setId(fromDTO.getProjectId());
+		newProject.setStatus(ProjectConstant.CLOSED);
+		newProject.setClosedStatus(fromDTO.getClosedStatus());
+		newProject.setWorkMinutes(workMinutes);
+		baseDao.updateById(newProject);
 		//更新项目关联表
 		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
 		projectStaffEntity.setId(fromDTO.getProjectStaffId());

From 7f837051c448501ece94ab9707bac9e402c34f3b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Feb 2022 17:37:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=98=E5=8A=A8=20up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/mq/ProjectChangedCustomListener.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
index c4c0138ad0..a096dc3307 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -111,12 +112,19 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
             String customerId = msgObj.getCustomerId();
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
             lock = distributedLock.getLock(String.format("lock:project_changed:%s:%s", customerId, msgObj.getProjectId())
-                    ,30L, 30L, TimeUnit.SECONDS);
+                    ,60L, 60L, TimeUnit.SECONDS);
 
             if (StringUtils.isBlank(customerId)){
                 logger.error("consumer project_changed fail,msg:{}",customerId);
                 return;
             }
+            //睡一秒 要不然那边执行不完
+            try {
+                Thread.sleep(NumConstant.ONE_THOUSAND);
+            } catch (InterruptedException e) {
+               log.error("consumeMessage exception",e);
+            }
+
 
             ExtractOriginFormDTO extractOriginFormDTO = new ExtractOriginFormDTO();
             extractOriginFormDTO.setCustomerId(customerId);