From 67d5dca6fd97b0c3ddae2e9ddabaa715fce1bc8c Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 30 Jun 2025 12:07:20 +0800
Subject: [PATCH] =?UTF-8?q?opt:newcode,redisson=E9=94=81=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/common/utils/CodeUtil.java        | 7 ++-----
 .../src/main/java/org/nl/common/utils/RedissonUtils.java   | 2 +-
 .../service/coderule/impl/SysCodeRuleServiceImpl.java      | 6 ++----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
index 5fb6f7959..9f7f021c3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
@@ -28,11 +28,8 @@ public class CodeUtil {
                 String flag = "1";
                 HashMap<String, String> map = new HashMap<>();
                 map.put("flag", flag);
-                String code = HttpUtil.get("http://127.0.0.1:8011/api/codeDetail/getNewCode?code=" + ruleCode + "&flag=" + flag);
-                if (code.contains("status")){
-                    throw new BadRequestException(code);
-                }
-                return code;
+                map.put("code", ruleCode);
+                return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map);
             } else {
                 throw new BadRequestException("系统繁忙，稍后在试!");
             }
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
index 127941c1b..34ab3c830 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
@@ -32,7 +32,7 @@ public class RedissonUtils {
             if (isLock){
                 process.apply(param);
             } else {
-                return;
+                throw new BadRequestException("当前业务正在操作,稍后再试");
             }
         }catch (Exception ex){
             throw ex;
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
index 9ef728082..daace2bea 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
@@ -66,6 +66,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
 
     @SneakyThrows
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public String codeDemo(Map form) {
         String code = (String) form.get("code");
         String id = codeRuleMapper.selectOne(new LambdaQueryWrapper<SysCodeRule>().eq(SysCodeRule::getCode, code)).getId();
@@ -135,10 +136,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
             }
             demo += value;
             if ("1".equals(flag)) {
-                new Thread(()->{
-                    codeRuleDetailMapper.updateById(detail);
-                })
-                .start();
+                codeRuleDetailMapper.updateById(detail);
             }
             log.info("更新成功：更新数据{}", detail);
         }