From 9e47d1426f494d68726de1d5cf7e704221a3fe3a Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 06 九月 2024 10:55:45 +0800
Subject: [PATCH] 读扫码枪socket通讯部分增加测试代码
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 96 insertions(+), 3 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 de91e91..7cfb89e 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
@@ -1,24 +1,34 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import cn.smallbun.screw.core.util.CollectionUtils;
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;
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.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
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.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;
@@ -34,6 +44,16 @@
private DownStorageCageService downStorageCageService;
@Autowired
private DownGlassInfoService downGlassInfoService;
+ @Autowired
+ private DownGlassTaskService downGlassTaskService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+
+ @Value("${mes.scan.ip}")
+ private String scanIp;
+
+ @Value("${mes.scan.port}")
+ private Integer scanPort;
@Autowired
private RedisUtil redisUtil;
@@ -43,7 +63,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");
@@ -128,11 +148,11 @@
wrapper.eq(DownGlassInfo::getWorkStationId, request.getWorkStationId());
}
List<DownGlassInfo> downGlassInfos = downGlassInfoService.list(wrapper);
- Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId));
+// Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId));
List<Object> engineerIdListTemp = downGlassInfoService.listObjs(new QueryWrapper<DownGlassInfo>().select("distinct engineer_id"));
List<String> engineerIdList = engineerIdListTemp.stream().map(String::valueOf).collect(Collectors.toList());
JSONObject jsonObject4 = new JSONObject();
- jsonObject4.append("downGlassInfos", listMap);
+ jsonObject4.append("downGlassInfos", downGlassInfos);
jsonObject4.append("engineerIdList", engineerIdList);
//閽㈠寲寮�鍏�
@@ -143,6 +163,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)
+ .lt("task_status", Const.UNLOAD_GLASS_DOWN)
+ .orderByDesc("id")
+ );
+ jsonObject4.append("takeGlass", takeGlass);
+
ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
@@ -160,6 +190,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 +203,65 @@
}
}
}
+
+ @Scheduled(fixedDelay = Long.MAX_VALUE)
+ public void scanCodeTask() {
+ log.info("鎵弿浠诲姟宸插惎鍔�");
+ while (true) {
+ new Thread(() -> {
+ try (Socket socket = new Socket(scanIp, scanPort);
+ BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
+ // 鎺ユ敹鏈嶅姟鍣ㄥ搷搴�
+ String response;
+ log.info("绛夊緟鎵爜涓�......");
+ while ((response = in.readLine()) != null) {
+ log.info("鎵弿鍒扮殑鐜荤拑id锛歿}", response);
+ List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");
+ if (CollectionUtils.isNotEmpty(sendwServer)) {
+ //鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, response).last("limit 1"));
+ if (null == glassInfo) {
+ log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", response);
+ } else {
+ sendwServer.get(0).sendMessage(glassInfo.toString());
+ }
+ }
+ }
+ } catch (Exception exception) {
+ log.info("璇诲彇寮傚父锛屽師鍥犱负{}", exception.getMessage());
+ }
+ }).start();
+ }
+ }
+
+ @Scheduled(fixedDelay = Long.MAX_VALUE)
+ public void scanCodeTaskCopy()
+ {
+ log.info("鎵弿浠诲姟宸插惎鍔�");
+ try {
+ BarcodeReadThread brt=new BarcodeReadThread(scanIp,scanPort,this);
+ brt.start();
+
+ }catch (Exception exception) {
+ log.info("鎵弿浠诲姟鍚姩寮傚父锛屽師鍥犱负{}", exception.getMessage());
+ }
+
+ }
+ //socket璇诲彇鍒版秷鎭悗浼氳皟鐢ㄨ繖涓嚱鏁�
+ public void barcodeCheckin(String response)
+ {
+ log.info("鎵弿鍒扮殑鐜荤拑id锛歿}", response);
+ List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");
+ if (CollectionUtils.isNotEmpty(sendwServer)) {
+ //鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, response).last("limit 1"));
+ if (null == glassInfo) {
+ log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", response);
+ } else {
+ sendwServer.get(0).sendMessage(glassInfo.toString());
+ }
+ }
+ }
}
--
Gitblit v1.8.0