From 6c7c48a3aae8c15499fc087f8732c6964b857716 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 10 四月 2025 15:55:18 +0800
Subject: [PATCH] 界面翻译为俄语
---
src/main/java/com/zy/core/ServerBootstrap.java | 109 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index e995d30..5f17a58 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,20 +1,27 @@
package com.zy.core;
+import com.zy.common.utils.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Created by vincent on 2020/8/4
@@ -28,18 +35,26 @@
@Autowired
private MainProcess mainProcess;
+ int CRN_COUNT = 0;
+ public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
+
+ /**
+ * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+ * @throws InterruptedException
+ */
@PostConstruct
@Async
- public void init(){
- log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ public void init() throws InterruptedException {
+ News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
mainProcess.start();
- log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
+ News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
private void initMq(){
@@ -63,30 +78,49 @@
for (Slave scale : slaveProperties.getScale()) {
MessageQueue.init(SlaveType.Scale, scale);
}
+ // 鍒濆鍖栧彴杞q
+ for (Slave car : slaveProperties.getCar()) {
+ MessageQueue.init(SlaveType.Car, car);
+ }
}
- private void initThread(){
+ private void initThread() throws InterruptedException {
// 鍒濆鍖栧爢鍨涙満绾跨▼
- log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+ News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new CrnThread(crn);
- new Thread(crnThread).start();
+ CrnThread crnThread = new MelsecCrnThread(crn);
+ Thread thread = new Thread((Runnable) crnThread);
+ thread.start();
+ map.put(crnThread, thread);
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
-
// 鍒濆鍖栬緭閫佺嚎绾跨▼
- log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+ News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new DevpThread(devp);
- new Thread(devpThread).start();
+ DevpThread devpThread = new SiemensDevpThread(devp);
+ new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
-
-// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// BarcodeThread barcodeThread = new BarcodeThread(barcode);
+ // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+ News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ BarcodeThread barcodeThread = new BarcodeThread(barcode);
// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+ SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+ }
+ // 鍒濆鍖朙ED绾跨▼
+ News.info("鍒濆鍖朙ED绾跨▼...................................................");
+ for (LedSlave led : slaveProperties.getLed()) {
+ LedThread ledThread = new LedThread(led);
+ new Thread(ledThread).start();
+ SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
+ }
+ // 鍒濆鍖栫绉ょ嚎绋�
+// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+// for (Slave scale : slaveProperties.getScale()) {
+// ScaleThread barcodeThread = new ScaleThread(scale);
+// new Thread(barcodeThread).start();
+// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
// }
}
@@ -95,5 +129,44 @@
public void destroy() {
}
+ @Component
+ class killThread {
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void kill() {
+ for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) {
+ CRN_COUNT++;
+ MelsecCrnThread key = (MelsecCrnThread) entry.getKey();
+// System.out.println("绗�"+i+"涓爢鍨涙満绾跨▼閲嶅惎绾跨▼鏉′欢锛�"+(System.currentTimeMillis() - key.getSign()));
+ if (CRN_COUNT>10000){
+ continue;
+ }
+ if (System.currentTimeMillis() - key.getSign() > 120000 && System.currentTimeMillis() - key.getSign()<1200000) {
+ System.out.println("绗�"+CRN_COUNT+"涓爢鍨涙満绾跨▼琚噸鍚�");
+
+ // 璇锋眰绾跨▼瀹夊叏鍋滄
+ key.requestStop();
+
+ // 绛夊緟绾跨▼瀹屾垚鍋滄, 鍙互杩欐牱鍋氫篃鍙互閫夋嫨涓嶈繖涔堝仛锛屽彇鍐充簬鏄惁闇�瑕佺瓑寰呯嚎绋嬬粨鏉�
+ try {
+ entry.getValue().join(20000); // 绛夊緟鏈�澶�20绉�
+ } catch (InterruptedException e) {
+// // 鍙�傚綋澶勭悊涓柇
+// Thread.currentThread().interrupt(); // 淇濈暀涓柇鐘舵��
+ entry.getValue().stop();
+ }
+
+ // 閲嶆柊鍚姩绾跨▼
+ Thread thread = new Thread((Runnable) key); // 鍋囪CrnThread瀹炵幇浜哛unnable
+ thread.start();
+
+ // 鏇挎崲鏄犲皠鍏崇郴涓殑鏃х嚎绋�
+ map.put(entry.getKey(), thread);
+ }
+ }
+ }
+
+ }
+
}
--
Gitblit v1.9.1