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));