Merge remote-tracking branch 'origin/master'

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

@@ -51,11 +51,11 @@ public class DeviceRemoteController {
         try {
             ops.write(ReUtil.hexStringToByteArray(instruct));
 
-            Thread.sleep(300);
+            Thread.sleep(1800);
 
             ops.write(ReUtil.hexStringToByteArray(CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()))));
 
-            Thread.sleep(100);
+            Thread.sleep(300);
             Integer status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
             if(status != null && status == 1){
                 return R.ok("开锁成功");
@@ -81,7 +81,7 @@ public class DeviceRemoteController {
         try {
             ops.write(ReUtil.hexStringToByteArray(instruct));
 
-            Thread.sleep(100);
+            Thread.sleep(1800);
 
             ops.write(ReUtil.hexStringToByteArray(CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()))));
 

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

@@ -466,7 +466,7 @@ public class SocketService {
         // 1开锁状态 0关锁状态
         int status = CRCCHECK.getLockStatus(data);
 
-        log.info("柜锁回调：" + relayCode.get() + ":" + bit + "，回调结果" + (status == 1 ? "开启": "关闭"));
+        log.info("柜锁回调：" + relayCode.get() + ":" + bit + "，回调结果" + (status == 1 ? "开启": "关闭") + "，指令：" + data);
         redisService.setCacheObject(relayCode.get() + ":" + bit, status, 60L, TimeUnit.SECONDS);
     }
 }