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 |   72 ++++++++++++++++++++++++++---------
 1 files changed, 53 insertions(+), 19 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 de467ff..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
@@ -27,6 +27,7 @@
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
@@ -172,6 +173,7 @@
         );
         jsonObject4.append("takeGlass", takeGlass);
 
+
         ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
         if (sendwServer4 != null) {
             for (WebSocketServer webserver : sendwServer4) {
@@ -204,29 +206,61 @@
 
     @Scheduled(fixedDelay = Long.MAX_VALUE)
     public void scanCodeTask() {
-        JSONObject jsonObject = new JSONObject();
+        log.info("鎵弿浠诲姟宸插惎鍔�");
         while (true) {
-            try (Socket socket = new Socket(scanIp, scanPort);
-                 BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
-                // 鎺ユ敹鏈嶅姟鍣ㄥ搷搴�
-                socket.setSoTimeout(1000);
-                String response;
-                while ((response = in.readLine()) != null) {
-                    List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
-                    if (CollectionUtils.isNotEmpty(sendwServer)) {
-                        //鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
-                        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
-                                .eq(GlassInfo::getGlassId, response));
-                        if (null == glassInfo) {
-                            log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", response);
-                        } else {
-                            jsonObject.append("scanGlass",glassInfo);
-                            sendwServer.get(0).sendMessage(jsonObject.toString());
+            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());
                 }
-            } 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