From c583e5683bac5d11750be01b8a3c4147e8f16026 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:21:53 +0800
Subject: [PATCH] 1、opc订阅服务为阻塞模式，配置需要开启多线程 2、新增订阅回调函数，用于执行任务，完成任务时调用 3、目前测试效果来看，一个定时任务只能有一个订阅任务，可订阅多个节点，当某个节点发生变化时，回调任务仅获取变化节点的信息
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 b2693bb..9096c98 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
@@ -158,7 +158,7 @@
jsonObject4.append("downGlassInfos", downGlassInfos);
jsonObject4.append("engineerIdList", engineerIdList);
- //閽㈠寲寮�鍏�
+ //鎵撳嵃寮�鍏�
boolean autoPrint = false;
if (redisUtil.getCacheObject("autoPrint") == null) {
redisUtil.setCacheObject("autoPrint", false);
@@ -172,9 +172,11 @@
.select("Top 1 *")
.eq("end_cell", Const.G13_WORK_STATION)
.lt("task_status", Const.UNLOAD_GLASS_DOWN)
- .orderByDesc("id")
+ .orderByAsc("id")
);
- jsonObject4.append("takeGlass", takeGlass);
+ if(takeGlass!=null){
+ jsonObject4.append("takeGlass", takeGlass);
+ }
ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
@@ -208,9 +210,9 @@
@Scheduled(fixedDelay = Long.MAX_VALUE)
public void scanCodeTask() {
- JSONObject jsonObject = new JSONObject();
log.info("鎵弿浠诲姟宸插惎鍔�");
while (true) {
+ JSONObject jsonObject = new JSONObject();
try (Socket socket = new Socket(scanIp, scanPort);
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
// 鎺ユ敹鏈嶅姟鍣ㄥ搷搴�
--
Gitblit v1.8.0