From 24c61f2fe5b6d22dcd591f7d5a96086796f23d2f Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Tue, 30 Jul 2024 17:08:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=AD=E8=BF=9E=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E9=95=BF=E5=A4=84=E7=90=86=E3=80=81?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E7=BC=96=E5=8F=B7=E5=90=8C=E6=AD=A5=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/opc/OpcServerServiceImpl.java | 2 +- .../src/main/java/org/nl/acs/opc/OpcUtl.java | 10 +++------- .../main/java/org/nl/common/utils/CodeUtil.java | 14 ++++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java index 72275e2cc..dadd54d3f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java @@ -232,7 +232,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn } catch (Exception var4) { this.clearServer(code); log.warn("写入出错opc server {} 重新加载", code, var4); - ThreadUtl.sleep(5000L); + ThreadUtl.sleep(3000L); throw var4; } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java index 87646a162..d92564514 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java @@ -42,13 +42,9 @@ public class OpcUtl { Map e = null; try { e = group.write(requests); - group.write(requests); +// group.write(requests); } catch (Exception e1) { - try { - e = group.write(requests); - } catch (Exception e2) { - e = group.write(requests); - } + e1.printStackTrace(); } boolean is_success = true; @@ -77,7 +73,7 @@ public class OpcUtl { log.info("下发信号失败：" + message.toString()); throw new BadRequestException(message.toString()); } - } catch (JIException arg7) { + } catch (Exception arg7) { log.info("下发信号失败：" + arg7.getMessage()); System.out.println("下发信号失败原因：" + arg7.getMessage()); throw new BadRequestException(arg7.toString()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java index 8f5e2d082..a9c653db2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java @@ -8,12 +8,14 @@ import java.util.*; public class CodeUtil { - public static String getNewCode(String ruleCode){ - String flag = CommonFinalParam.ONE; - HashMap map = new HashMap<>(); - map.put("flag",flag); - map.put("code",ruleCode); - return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map); + public static String getNewCode(String ruleCode) { + synchronized (ruleCode) { + String flag = CommonFinalParam.ONE; + HashMap map = new HashMap<>(); + map.put("flag", flag); + map.put("code", ruleCode); + return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map); + } }