24282 2 سال پیش
والد
کامیت
8f84b946ee

+ 1 - 1
src/main/java/com/fjhx/MyMain.java

@@ -24,7 +24,7 @@ public class MyMain {
 
     public static void main(String[] args) throws IOException {
 
-        System.out.println("Version: 2023-01-28 10:37");
+        System.out.println("Version: 2023-01-29 10:46");
 
         MyUtil.infoLog("程序启动中...");
 

+ 3 - 1
src/main/java/com/fjhx/service/impl/ServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.MyMain;
 import com.fjhx.constant.WebSocketConstant;
@@ -26,12 +27,13 @@ public class ServiceImpl implements Service {
     public void handleMessage(MessageEntity messageEntity) {
 
         if (WebSocketConstant.OPERATING_UPPER_COMPUTER != messageEntity.getType()) {
+            MyUtil.errorLog("跳过指令:" + JSON.toJSONString(messageEntity));
             return;
         }
 
         // 数据
         JSONObject data = messageEntity.getData();
-        MyUtil.infoLog("指令数据:" + data.toJSONString());
+        MyUtil.infoLog("执行指令:" + data.toJSONString());
 
         String forwardUserId = data.getString(WebSocketConstant.FORWARD_USER_ID);
         String forwardSessionId = data.getString(WebSocketConstant.FORWARD_SESSION_ID);

+ 2 - 1
src/main/java/com/fjhx/service/impl/TcpOperation.java

@@ -1,6 +1,7 @@
 package com.fjhx.service.impl;
 
 import cn.hutool.core.collection.ConcurrentHashSet;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.entity.ConnectConfig;
 import com.fjhx.service.Operation;
@@ -56,7 +57,7 @@ public class TcpOperation implements Operation {
 
             @Override
             public void readData(String rfid, String rssi, String antennaNo, String deviceNo, String direction, String communicationMode) {
-                if (rfidSet.contains(rfid)) {
+                if (ObjectUtil.isEmpty(rfid) || rfidSet.contains(rfid)) {
                     return;
                 }
                 rfidSet.add(rfid);