From 5e7fbf67672353f5d22687b45dc416f2e65dc3d1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 九月 2024 14:01:15 +0800
Subject: [PATCH] 1、更新扫码枪代码， 使用readline(), 扫码枪录入的信息需要有回车作为结束标志
---
/dev/null | 168 ------------------------------------------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 52 +++++++-----
2 files changed, 31 insertions(+), 189 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/SocketConfig.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/SocketConfig.java
deleted file mode 100644
index e5cfb80..0000000
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/SocketConfig.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mes.config;
-
-import com.mes.tools.SocketUtil;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author : zhoush
- * @Date: 2024/9/2 15:42
- * @Description:
- */
-@Configuration
-public class SocketConfig {
-
- @Value("${mes.scan.ip}")
- private String scanIp;
-
- @Value("${mes.scan.port}")
- private Integer scanPort;
-
- @Bean
- public SocketUtil getSocketUtil() {
- return new SocketUtil(scanIp, scanPort);
- }
-}
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 a0c7b32..54b5416 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,6 +1,7 @@
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;
@@ -13,15 +14,20 @@
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.SocketUtil;
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.Socket;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -40,7 +46,14 @@
@Autowired
private DownGlassTaskService downGlassTaskService;
@Autowired
- SocketUtil socketUtil;
+ private GlassInfoService glassInfoService;
+
+ @Value("${mes.scan.ip}")
+ private String scanIp;
+
+ @Value("${mes.scan.port}")
+ private Integer scanPort;
+
@Autowired
private RedisUtil redisUtil;
@@ -193,29 +206,26 @@
@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);
- }
- }
+ 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");
+ 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());
}
}
- } else {
- log.info("socket杩炴帴澶辫触");
}
- } catch (Exception e) {
- log.info("socke鎵ц杩囩▼涓彂鐢熷紓甯�");
+ } catch (Exception exception) {
+ log.info("璇诲彇寮傚父锛屽師鍥犱负{}", exception.getMessage());
}
}
-
}
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/SocketUtil.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/SocketUtil.java
deleted file mode 100644
index cbed75a..0000000
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/SocketUtil.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.mes.tools;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-
-/**
- * @Author : zhoush
- * @Date: 2024/9/2 15:32
- * @Description:
- */
-
-@Slf4j
-public class SocketUtil {
- private final String host;
- private final int port;
-
- private final int connectionTimeout;
- private final int soTimeout;
-
- private Socket socket;
-
- private DataOutputStream dataOutputStream;
-
- private DataInputStream dataInputStream;
-
- public SocketUtil(String host, int port) {
- this(host, port, 5000, 5000);
- }
-
- public SocketUtil(String host, int port, int connectionTimeout, int soTimeout) {
- this.host = host;
- this.port = port;
- this.connectionTimeout = connectionTimeout;
- this.soTimeout = soTimeout;
- }
-
- /**
- * 鎵撳紑Socket杩炴帴
- *
- * @return 鏄惁鎴愬姛鎵撳紑Socket杩炴帴
- */
- public boolean openSocket() {
- try {
- socket = new Socket();
- InetSocketAddress socketAddress = new InetSocketAddress(host, port);
- socket.setReuseAddress(true);
- socket.setSoTimeout(soTimeout);
- socket.connect(socketAddress, connectionTimeout);
- dataOutputStream = new DataOutputStream(socket.getOutputStream());
- dataInputStream = new DataInputStream(socket.getInputStream());
- } catch (Exception e) {
- log.error("鎵撳紑Socket杩炴帴澶辫触:", e);
- return false;
- }
- return true;
- }
-
- public boolean sendData(String data) {
- return sendData(data, "utf-8");
- }
-
- /**
- * 鍙戦�佽姹傛暟鎹��
- *
- * @param data 鏁版嵁
- * @param charset 瀛楃闆�
- * @return 鏄惁鍙戦�佹垚鍔�
- */
- public boolean sendData(String data, String charset) {
- boolean isSend = true;
- try {
- byte[] bytes = data.getBytes(charset);
- dataOutputStream.writeInt(bytes.length);
- dataOutputStream.write(bytes);
- } catch (IOException e) {
- log.error("鍙戦�佹暟鎹け璐�:", e);
- isSend = false;
- }
- return isSend;
- }
-
- /**
- * 鎺ユ敹鍝嶅簲鏁版嵁
- */
- public String receiveData() {
- return receiveData("UTF-8");
- }
-
- /**
- * 鎺ユ敹鍝嶅簲鏁版嵁
- */
- public String receiveData(String charset) {
- String returnStr = null;
- byte[] data;
- try {
- int length = dataInputStream.readInt();
- if (length > 0) {
- data = new byte[length];
- dataInputStream.readFully(data);
- returnStr = new String(data, charset);
- }
- } catch (IOException e) {
- log.error("鎺ユ敹鏁版嵁澶辫触:", e);
- }
- return returnStr;
- }
-
- /**
- * 鍏抽棴Socket杩炴帴鍜岃緭鍏ヨ緭鍑烘祦
- */
- public void close() {
- try {
- if (dataInputStream != null) {
- dataInputStream.close();
- }
- } catch (IOException e) {
- log.error("鍏抽棴杈撳叆娴佸け璐�:", e);
- }
- try {
- if (dataOutputStream != null) {
- dataOutputStream.close();
- }
- } catch (IOException e) {
- log.error("鍏抽棴杈撳嚭娴佸け璐�:", e);
- }
- try {
- if (socket != null) {
- socket.close();
- }
- } catch (IOException e) {
- log.error("鍏抽棴Socket澶辫触:", e);
- }
- }
-
- /**
- * Socket鐭繛鎺ュ彂閫佽姹傛暟鎹�
- *
- * @param host host
- * @param port 绔彛
- * @param requestData 璇锋眰鏁版嵁
- * @return 鍝嶅簲鏁版嵁
- */
- public static String send(String host, int port, String requestData) {
- SocketUtil socketUtil = new SocketUtil(host, port);
- String resp = null;
- try {
- if (socketUtil.openSocket()) {
- if (socketUtil.sendData(requestData)) {
- resp = socketUtil.receiveData();
- } else {
- log.error("SocketUtil.send鍙戦�佹暟鎹け璐�");
- }
- } else {
- log.error("SocketUtil.openSocket鎵撳紑Socket澶辫触");
- }
- } catch (Exception e) {
- log.error("SocketUtil.send鍙戦�佽姹傚け璐�:", e);
- } finally {
- socketUtil.close();
- }
- return resp;
- }
-}
--
Gitblit v1.8.0