24282 2 years ago
parent
commit
9d51c1c13a

+ 0 - 2
src/main/java/com/fjhx/service/Operation.java

@@ -5,7 +5,6 @@ import com.fjhx.MyMain;
 import com.fjhx.constant.WebSocketConstant;
 import com.fjhx.entity.ConnectConfig;
 import com.fjhx.entity.MessageEntity;
-import com.fjhx.utils.MyUtil;
 
 import java.util.Date;
 import java.util.List;
@@ -45,7 +44,6 @@ public interface Operation {
         String jsonString = JSONObject.toJSONString(messageEntity);
         MyMain.client.send(jsonString);
 
-        MyUtil.infoLog(jsonString);
     }
 
 }

+ 2 - 9
src/main/java/com/fjhx/service/impl/ServiceImpl.java

@@ -31,19 +31,12 @@ public class ServiceImpl implements Service {
 
         // 数据
         JSONObject data = messageEntity.getData();
+        MyUtil.infoLog("指令数据:" + data.toJSONString());
+
         String forwardUserId = data.getString(WebSocketConstant.FORWARD_USER_ID);
         String forwardSessionId = data.getString(WebSocketConstant.FORWARD_SESSION_ID);
-
         // 获取指令
         String instructions = data.getString("instructions");
-
-        if (!ObjectUtil.isAllNotEmpty(forwardUserId, forwardSessionId, instructions)) {
-            MyUtil.errorLog("盘点数据:" + data.toJSONString());
-        }
-
-        forwardUserId = ObjectUtil.defaultIfBlank(forwardUserId, "default");
-        forwardSessionId = ObjectUtil.defaultIfBlank(forwardSessionId, "default");
-
         // 操作上位机类型
         Integer type = data.getInteger("type");
 

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

@@ -61,7 +61,7 @@ public class TcpOperation implements Operation {
                 }
                 rfidSet.add(rfid);
 
-                MyUtil.errorLog("扫描到rfid标签:  userId:" + userId + ", sessionId:" + sessionId + ", instructions:"
+                MyUtil.infoLog("扫描到rfid标签:  userId:" + userId + ", sessionId:" + sessionId + ", instructions:"
                         + data.getString("instructions") + ", rfid:" + rfid);
                 sendRfidDate(userId, sessionId, rfid, data);
             }

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

@@ -86,7 +86,8 @@ public class UdpOperation implements Operation {
                 }
                 rfidSet.add(rfid);
 
-                MyUtil.errorLog("扫描到rfid标签:sessionId" + sessionId + ",rfid:" + rfid);
+                MyUtil.infoLog("扫描到rfid标签:  userId:" + userId + ", sessionId:" + sessionId + ", instructions:"
+                        + data.getString("instructions") + ", rfid:" + rfid);
                 sendRfidDate(userId, sessionId, rfid, data);
             }
 

+ 0 - 1
src/main/java/com/fjhx/utils/BaseWebSocketClient.java

@@ -22,7 +22,6 @@ public class BaseWebSocketClient extends WebSocketClient {
 
     @Override
     public void onMessage(String str) {
-        MyUtil.infoLog(str);
         MessageEntity messageEntity = JSONObject.parseObject(str, MessageEntity.class);
         MyMain.service.handleMessage(messageEntity);
     }