放开柜锁正常校验

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/device/DeviceRemoteController.java

@@ -57,16 +57,16 @@ public class DeviceRemoteController {
 
             Thread.sleep(100);
             Integer status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
-            /*if(status != null && status == 1){
-                return R.ok();
-            }*/
+            if(status != null && status == 1){
+                return R.ok("开锁成功");
+            }
             // TODO 因样件锁 发送开锁指令后锁未主动弹开，先不关注锁的状态
-            return R.ok();
+//            return R.ok();
         } catch (Exception e) {
             e.printStackTrace();
             return R.fail("柜锁连接失败！");
         }
-//        return R.fail();
+        return R.fail("开锁失败");
     }
 
     /**
@@ -88,12 +88,12 @@ public class DeviceRemoteController {
             Thread.sleep(300);
             Integer status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
             if(status != null && status == 0){
-                return R.ok();
+                return R.ok("关锁成功");
             }
         } catch (Exception e) {
             e.printStackTrace();
             return R.fail("柜锁连接失败！");
         }
-        return R.fail();
+        return R.fail("关锁失败");
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/SocketService.java

@@ -446,7 +446,7 @@ public class SocketService {
     public void setCabinetLockData(Socket socket, String data) {
 
         if(data.replace(" ", "").length() != 12){
-            log.info("柜锁回调指令非状态指令！");
+            log.info("柜锁回调指令非状态指令！" + data);
             return;
         }