From aa519bdec180f27e11d256d9058998f9e2354bb7 Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Fri, 2 Jan 2026 16:08:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E=E5=8F=97?=
 =?UTF-8?q?=E7=90=86=E5=8F=B7=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TSBizRemListServiceImpl.java | 18 ++++++++--
 .../service/impl/TSTaskListServiceImpl.java   | 27 +++++++++++++--
 .../BizSerIllegalRemController.java           | 10 +++++-
 .../impl/TSBizSerIllegalRemServiceImpl.java   | 10 +++++-
 .../chinaweal/aiccs/common/util/UuidUtil.java | 34 +++++++++----------
 5 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java
index d32ac87..5450290 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java
@@ -672,7 +672,14 @@ public class TSBizRemListServiceImpl extends ServiceImpl<TSBizRemListMapper, TSB
                                     BeanUtils.copyProperties(tsTaskList, taskListNew);
                                     taskListNew.setTasklistid(null);
                                     //设置受理号
-                                    taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+//                                    taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+                                    //因xr_id_maker容易被锁，临时用新的生成规则生成受理编号
+                                    LocalDateTime nowLocalDateTime = LocalDateTime.now();  // 获取当前日期和时间
+                                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");  // 定义格式化模式
+                                    String formattedDate = nowLocalDateTime.format(formatter);  // 将日期格式化为字符串
+                                    String acceptno = "7" + formattedDate + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
+                                    taskListNew.setAcceptno(acceptno);
+
                                     //设置签收人信息
                                     taskListNew.setSignuserid(aicUser.getPrimaryKey());
                                     taskListNew.setSignloginname(aicUser.getName());
@@ -903,7 +910,14 @@ public class TSBizRemListServiceImpl extends ServiceImpl<TSBizRemListMapper, TSB
                                     BeanUtils.copyProperties(tsTaskList, taskListNew);
                                     taskListNew.setTasklistid(null);
                                     //设置受理号
-                                    taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+//                                    taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+                                    //因xr_id_maker容易被锁，临时用新的生成规则生成受理编号
+                                    LocalDateTime nowLocalDateTime = LocalDateTime.now();  // 获取当前日期和时间
+                                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");  // 定义格式化模式
+                                    String formattedDate = nowLocalDateTime.format(formatter);  // 将日期格式化为字符串
+                                    String acceptno = "7" + formattedDate + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
+                                    taskListNew.setAcceptno(acceptno);
+
                                     //设置签收人信息
                                     taskListNew.setSignuserid(aicUser.getPrimaryKey());
                                     taskListNew.setSignloginname(aicUser.getName());
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java
index c94434e..55cc815 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java
@@ -120,7 +120,14 @@ public class TSTaskListServiceImpl extends BaseServiceImpl<TSTaskListMapper, TST
     @Override
     public String startWorkFlow(TSTaskList taskListModel, AICUser user, String definitionName) {
         //受理编号
-        taskListModel.setAcceptno(user.getRegionID().substring(0, 6) + uuidUtil.getCurAcceptNo());
+//        taskListModel.setAcceptno(user.getRegionID().substring(0, 6) + uuidUtil.getCurAcceptNo());
+        //因xr_id_maker容易被锁，临时用新的生成规则生成受理编号
+        LocalDateTime nowLocalDateTime = LocalDateTime.now();  // 获取当前日期和时间
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");  // 定义格式化模式
+        String formattedDate = nowLocalDateTime.format(formatter);  // 将日期格式化为字符串
+        String acceptno = "7" + formattedDate + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
+        taskListModel.setAcceptno(acceptno);
+
         ResultMap resultMap = workFlowService.startAndClaim(user.getPrimaryKey(), null, definitionName, null);
         String workflowid = resultMap.getWorkflowid();
         taskListModel.setWorkflowid(workflowid);
@@ -139,7 +146,14 @@ public class TSTaskListServiceImpl extends BaseServiceImpl<TSTaskListMapper, TST
     @Override
     public String startWorkFlow(TSTaskList taskListModel, List<String> userids, String decorg, String definitionName) {
         //受理编号
-        taskListModel.setAcceptno(decorg.substring(0, 6) + uuidUtil.getCurAcceptNo());
+//        taskListModel.setAcceptno(decorg.substring(0, 6) + uuidUtil.getCurAcceptNo());
+        //因xr_id_maker容易被锁，临时用新的生成规则生成受理编号
+        LocalDateTime nowLocalDateTime = LocalDateTime.now();  // 获取当前日期和时间
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");  // 定义格式化模式
+        String formattedDate = nowLocalDateTime.format(formatter);  // 将日期格式化为字符串
+        String acceptno = "7" + formattedDate + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
+        taskListModel.setAcceptno(acceptno);
+
         ResultMap resultMap = workFlowService.startAndClaim(userids.get(0), userids, definitionName, null);
         String workflowid = resultMap.getWorkflowid();
         taskListModel.setWorkflowid(workflowid);
@@ -308,7 +322,14 @@ public class TSTaskListServiceImpl extends BaseServiceImpl<TSTaskListMapper, TST
     @Override
     public String startWorkFlowApp(TSTaskList taskListModel, String definitionName) {
         //受理编号
-        taskListModel.setAcceptno("400000" + uuidUtil.getCurAcceptNo());
+//        taskListModel.setAcceptno("400000" + uuidUtil.getCurAcceptNo());
+        //因xr_id_maker容易被锁，临时用新的生成规则生成受理编号
+        LocalDateTime nowLocalDateTime = LocalDateTime.now();  // 获取当前日期和时间
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");  // 定义格式化模式
+        String formattedDate = nowLocalDateTime.format(formatter);  // 将日期格式化为字符串
+        String acceptno = "7" + formattedDate + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
+        taskListModel.setAcceptno(acceptno);
+
 //        ResultMap resultMap = workFlowService.startAndClaim(user.getPrimaryKey(), null, definitionName, null);
         ResultMap resultMap = workFlowService.startAndClaimApp(null, null, definitionName, null);
         String workflowid = resultMap.getWorkflowid();
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java
index e4973d1..d1a91be 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java
@@ -60,6 +60,7 @@ import javax.servlet.ServletContextListener;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -707,7 +708,14 @@ public class BizSerIllegalRemController extends BaseController implements Servle
                                 BeanUtils.copyProperties(tsTaskList, taskListNew);
                                 taskListNew.setTasklistid(null);
                                 //设置受理号
-                                taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+//                                taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+                                //因xr_id_maker容易被锁，临时用新的生成规则生成受理编号
+                                LocalDateTime nowLocalDateTime = LocalDateTime.now();  // 获取当前日期和时间
+                                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");  // 定义格式化模式
+                                String formattedDate = nowLocalDateTime.format(formatter);  // 将日期格式化为字符串
+                                String acceptno = "7" + formattedDate + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
+                                taskListNew.setAcceptno(acceptno);
+
                                 //设置签收人信息
                                 taskListNew.setSignuserid(aicUser.getPrimaryKey());
                                 taskListNew.setSignloginname(aicUser.getName());
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java
index acdfe6c..90981fd 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java
@@ -54,6 +54,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -664,7 +665,14 @@ public class TSBizSerIllegalRemServiceImpl extends BaseServiceImpl<TSBizSerIlleg
                                 BeanUtils.copyProperties(tsTaskList, taskListNew);
                                 taskListNew.setTasklistid(null);
                                 //设置受理号
-                                taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+//                                taskListNew.setAcceptno(aicUser.getRegionID().substring(0, Math.min(aicUser.getRegionID().length(), 6)) + uuidUtil.getCurAcceptNo());
+                                //因xr_id_maker容易被锁，临时用新的生成规则生成受理编号
+                                LocalDateTime nowLocalDateTime = LocalDateTime.now();  // 获取当前日期和时间
+                                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");  // 定义格式化模式
+                                String formattedDate = nowLocalDateTime.format(formatter);  // 将日期格式化为字符串
+                                String acceptno = "7" + formattedDate + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 8);
+                                taskListNew.setAcceptno(acceptno);
+
                                 //设置签收人信息
                                 taskListNew.setSignuserid(aicUser.getPrimaryKey());
                                 taskListNew.setSignloginname(aicUser.getName());
diff --git a/src/main/java/com/chinaweal/aiccs/common/util/UuidUtil.java b/src/main/java/com/chinaweal/aiccs/common/util/UuidUtil.java
index 35ee0b9..bcd3fbf 100644
--- a/src/main/java/com/chinaweal/aiccs/common/util/UuidUtil.java
+++ b/src/main/java/com/chinaweal/aiccs/common/util/UuidUtil.java
@@ -74,29 +74,29 @@ public class UuidUtil {
      *
      * @return 新产生的流水号
      */
-//    public synchronized String getCurAcceptNo() {
-//        return getTridmaker("acceptNoForCase");
-//    }
+    public synchronized String getCurAcceptNo() {
+        return getTridmaker("acceptNoForCase");
+    }
 
     /**
      * 规则年月日+5位顺序号。例如：13060400001
      *
      * @return 新产生的流水号(Redis)  todo: 新的一年要重新获取
      */
-    public String getCurAcceptNo() {
-        String key = "Redis_acceptNoForCase";
-        String num = null;
-        if (redisService.exists(key)) {
-            num = redisService.incr(key);
-
-            // 根据规则生成受理号
-            LocalDate localDate = LocalDate.now();
-            int year = localDate.getYear();
-            return "7" + String.valueOf(year).substring(2, 4) + beforeZeroFill(num, 8);
-        } else {
-            throw new RuntimeException("获取新产生的流水号异常");
-        }
-    }
+//    public String getCurAcceptNo() {
+//        String key = "Redis_acceptNoForCase";
+//        String num = null;
+//        if (redisService.exists(key)) {
+//            num = redisService.incr(key);
+//
+//            // 根据规则生成受理号
+//            LocalDate localDate = LocalDate.now();
+//            int year = localDate.getYear();
+//            return "7" + String.valueOf(year).substring(2, 4) + beforeZeroFill(num, 8);
+//        } else {
+//            throw new RuntimeException("获取新产生的流水号异常");
+//        }
+//    }
 
 
 //    /**