From 23f026fbfd81066b1f2e9662bbeff31965dda4d6 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 17:00:16 +0800
Subject: [PATCH] 仓储页面推送数据过滤查询
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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..baa53ca 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
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -18,23 +17,20 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
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;
import java.io.BufferedReader;
import java.io.InputStreamReader;
-import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.*;
import java.util.stream.Collectors;
@Slf4j
@@ -158,7 +154,7 @@
jsonObject4.append("downGlassInfos", downGlassInfos);
jsonObject4.append("engineerIdList", engineerIdList);
- //閽㈠寲寮�鍏�
+ //鎵撳嵃寮�鍏�
boolean autoPrint = false;
if (redisUtil.getCacheObject("autoPrint") == null) {
redisUtil.setCacheObject("autoPrint", false);
@@ -172,9 +168,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 +206,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