From bda4a97ee41aaac639220ebc030335f9d3342fdb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 06 九月 2024 15:14:30 +0800
Subject: [PATCH] 添加线程异步执行
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index 54b5416..b210c53 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -22,6 +22,8 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -31,6 +33,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
@Slf4j
@@ -47,6 +50,13 @@
private DownGlassTaskService downGlassTaskService;
@Autowired
private GlassInfoService glassInfoService;
+ private final ExecutorService scanCodeThreadPool = new ThreadPoolExecutor(
+ 10, // core pool size
+ 20, // maximum pool size
+ 60L, TimeUnit.SECONDS,
+ new LinkedBlockingQueue<>()
+ );
+ private final ExecutorService isRunThreadPool = Executors.newFixedThreadPool(5);
@Value("${mes.scan.ip}")
private String scanIp;
@@ -167,8 +177,8 @@
new QueryWrapper<DownGlassTask>()
.select("Top 1 *")
.eq("end_cell", Const.G13_WORK_STATION)
+ .lt("task_status", Const.UNLOAD_GLASS_DOWN)
.orderByDesc("id")
-
);
jsonObject4.append("takeGlass", takeGlass);
@@ -185,44 +195,52 @@
@Scheduled(fixedDelay = 1000)
public void isRun() {
- JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- List<DownWorkstation> downWorkstation = downWorkstationService.getoneDownWorkstations(1, 6);
- jsonObject.append("downWorkstation", downWorkstation);
- List<DownGlassTask> downGlassTask = downGlassTaskService.selectOutTaskCache();
- jsonObject.append("downGlassTask", downGlassTask);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("unLoadGlassIsRun is closed");
+ isRunThreadPool.execute(() -> {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<DownWorkstation> downWorkstation = downWorkstationService.getoneDownWorkstations(1, 6);
+ jsonObject.append("downWorkstation", downWorkstation);
+ List<DownGlassTask> downGlassTask = downGlassTaskService.selectOutTaskCache();
+ jsonObject.append("downGlassTask", downGlassTask);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ } else {
+ log.info("unLoadGlassIsRun is closed");
+ }
}
}
- }
+ });
+
}
+ @Async
@Scheduled(fixedDelay = Long.MAX_VALUE)
public void scanCodeTask() {
+ JSONObject jsonObject = new JSONObject();
+ log.info("鎵弿浠诲姟宸插惎鍔�");
while (true) {
try (Socket socket = new Socket(scanIp, scanPort);
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
// 鎺ユ敹鏈嶅姟鍣ㄥ搷搴�
- String response;
- while ((response = in.readLine()) != null) {
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");
+// socket.setSoTimeout(1000);
+ log.info("绛夊緟鎵爜涓�......");
+ String glassId = in.readLine();
+ log.info("鎵弿鍒扮殑鐜荤拑id锛歿}", glassId);
+ List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
if (CollectionUtils.isNotEmpty(sendwServer)) {
//鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, response).last("limit 1"));
+ .eq(GlassInfo::getGlassId, glassId).last("limit 1"));
if (null == glassInfo) {
- log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", response);
+ log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", glassId);
} else {
- sendwServer.get(0).sendMessage(glassInfo.toString());
+ jsonObject.append("scanGlass",glassInfo);
+ sendwServer.get(0).sendMessage(jsonObject.toString());
}
}
- }
} catch (Exception exception) {
log.info("璇诲彇寮傚父锛屽師鍥犱负{}", exception.getMessage());
}
--
Gitblit v1.8.0