From ab09a3065390a817dba0efed6cf320eb94637d4b Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期四, 16 五月 2024 20:04:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/ServerBootstrap.java | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java index c7cec42..7600ceb 100644 --- a/src/main/java/com/zy/core/ServerBootstrap.java +++ b/src/main/java/com/zy/core/ServerBootstrap.java @@ -32,6 +32,8 @@ @Autowired private MainProcess mainProcess; + int CRN_COUNT = 0; + public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>(); @@ -94,13 +96,13 @@ map.put(crnThread, thread); SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread); } - // 鍒濆鍖栫┛姊溅绾跨▼ - log.info("鍒濆鍖朢GV绾跨▼..................................................."); - for (RgvSlave rgv : slaveProperties.getRgv()) { - RgvThread rgvThread = new RgvThread(rgv); - new Thread((Runnable) rgvThread).start(); - SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread); - } +// // 鍒濆鍖栫┛姊溅绾跨▼ +// log.info("鍒濆鍖朢GV绾跨▼..................................................."); +// for (RgvSlave rgv : slaveProperties.getRgv()) { +// RgvThread rgvThread = new RgvThread(rgv); +// new Thread((Runnable) rgvThread).start(); +// SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread); +// } // 鍒濆鍖栬緭閫佺嚎绾跨▼ log.info("鍒濆鍖栬緭閫佺嚎绾跨▼..................................................."); for (DevpSlave devp : slaveProperties.getDevp()) { @@ -142,13 +144,15 @@ @Scheduled(cron = "0/3 * * * * ? ") public void kill() { - int i = 0; for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) { - i++; + CRN_COUNT++; SiemensCrnThread key = (SiemensCrnThread) entry.getKey(); // System.out.println("绗�"+i+"涓爢鍨涙満绾跨▼閲嶅惎绾跨▼鏉′欢锛�"+(System.currentTimeMillis() - key.getSign())); - if (System.currentTimeMillis() - key.getSign() > 120000) { - System.out.println("绗�"+i+"涓爢鍨涙満绾跨▼琚噸鍚�"); + if (CRN_COUNT>10000){ + continue; + } + if (System.currentTimeMillis() - key.getSign() > 120000 && System.currentTimeMillis() - key.getSign()<1200000) { + System.out.println("绗�"+CRN_COUNT+"涓爢鍨涙満绾跨▼琚噸鍚�"); // 璇锋眰绾跨▼瀹夊叏鍋滄 key.requestStop(); -- Gitblit v1.9.1