From 50cfe783e4331707f8656d733f81b26b5f7aa7d7 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 3 Dec 2025 16:53:26 +0800 Subject: [PATCH] =?UTF-8?q?merge:=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=9A=E8=BF=87HTTP=E8=B0=83=E7=94=A8=E3=80=81=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=8E=BB=E6=8E=891S?= =?UTF-8?q?=E7=9A=84=E7=9D=A1=E7=9C=A0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/common/utils/CodeUtil.java | 9 +++++---- .../main/java/org/nl/wms/sch/manage/AbstractAcsTask.java | 5 ----- 2 files changed, 5 insertions(+), 9 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 9f7f021c3..141043aeb 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 @@ -26,10 +26,11 @@ public class CodeUtil { try { if (tryLock) { String flag = "1"; - HashMap map = new HashMap<>(); - map.put("flag", flag); - map.put("code", ruleCode); - return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map); + String code = HttpUtil.get("http://127.0.0.1:8013/api/codeDetail/getNewCode?code=" + ruleCode + "&flag=" + flag); + if (code.contains("status")){ + throw new BadRequestException(code); + } + return code; } else { throw new BadRequestException("系统繁忙,稍后在试!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index c408337fc..eef1b73f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -126,11 +126,6 @@ public abstract class AbstractAcsTask { * */ public JSONObject immediateNotifyAcs(String task_id) { - try { - Thread.sleep(1000); - }catch (Exception ex){ - - } List taskList = this.schedule(); if (ObjectUtil.isNotEmpty(taskList)) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));