From f16cabbae89334d823ce22183d2de3dc62ee9574 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 九月 2024 16:50:49 +0800
Subject: [PATCH] 1、替换swagger，可直接 doc.html访问接口 2、提供socket获取扫码枪数据（待测试）
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 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 c65abed..a0c7b32 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
@@ -6,12 +6,15 @@
import com.mes.common.config.Const;
import com.mes.common.utils.RedisUtil;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;
import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.tools.DateUtil;
+import com.mes.tools.SocketUtil;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -34,7 +37,10 @@
private DownStorageCageService downStorageCageService;
@Autowired
private DownGlassInfoService downGlassInfoService;
-
+ @Autowired
+ private DownGlassTaskService downGlassTaskService;
+ @Autowired
+ SocketUtil socketUtil;
@Autowired
private RedisUtil redisUtil;
@@ -43,7 +49,7 @@
log.info("鍙戦�佸伐浣嶇幓鐠冧俊鎭�");
JSONObject jsonObject = new JSONObject();
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 6);
+ List<DownWorkstation> data = downWorkstationService.list();
jsonObject.append("params", data);
log.info(jsonObject.toString());
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
@@ -143,6 +149,16 @@
autoPrint = redisUtil.getCacheObject("autoPrint");
}
jsonObject4.append("autoPrint", autoPrint);
+ //浜哄伐涓嬬墖浣嶇疆鏈�鍚庝竴鐗�
+ DownGlassTask takeGlass = downGlassTaskService.getOne(
+ new QueryWrapper<DownGlassTask>()
+ .select("Top 1 *")
+ .eq("end_cell", Const.G13_WORK_STATION)
+ .orderByDesc("id")
+
+ );
+ jsonObject4.append("takeGlass", takeGlass);
+
ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
@@ -160,6 +176,8 @@
//姝ｅ湪杩涜鐨勪换鍔�
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) {
@@ -171,4 +189,33 @@
}
}
}
+
+ @Scheduled(fixedDelay = Long.MAX_VALUE)
+ public void scanCodeTask() {
+ while (true) {
+ try {
+ if (socketUtil.openSocket()) {
+ String data = socketUtil.receiveData();
+ if (StringUtils.isNotBlank(data)) {
+ log.info("鎵弿鏁版嵁锛�" + data);
+ //鍙戦�佹壂鎻忔暟鎹�
+ //todo:鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null && webserver.session.isOpen()) {
+ webserver.sendMessage(data);
+ }
+ }
+ }
+ }
+ } else {
+ log.info("socket杩炴帴澶辫触");
+ }
+ } catch (Exception e) {
+ log.info("socke鎵ц杩囩▼涓彂鐢熷紓甯�");
+ }
+ }
+
+ }
}
--
Gitblit v1.8.0