调整

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpCabinetServiceImpl.java

@@ -287,6 +287,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
                 // 结束录像获取地址
                 R r1 = remoteCameraService.stopRecord(result.getIpAddress());
                 if(r1 != null && HttpStatus.SUCCESS == r1.getCode()){
+                    logger.info("柜锁关闭获取录像地址：" + r1.getData());
                     closeLockVideo = r1.getData() + "";
                     success = true;
                 }else {
@@ -311,6 +312,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
                 // 关锁之后要存储录像
 //                HxpCabinetlockLog hxpCabinetlockLog = cabinetlockLogMapper.selectByLockId(aioCabinetLockVo.getSubId(), Integer.parseInt(result.getLockId()));
                 HxpCabinetlockLog hxpCabinetlockLog = cabinetlockLogMapper.selectHxpCabinetlockLogById(aioCabinetLockVo.getLockLogId());
+                result.setLockLogId(aioCabinetLockVo.getLockLogId());
                 if(hxpCabinetlockLog != null){
                     hxpCabinetlockLog.setCloseLockTime(DateUtils.getNowDate());
                     hxpCabinetlockLog.setCloseLockVideo(closeLockVideo);

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

@@ -81,11 +81,11 @@ public class DeviceRemoteController {
         try {
             ops.write(ReUtil.hexStringToByteArray(instruct));
 
-            Thread.sleep(300);
+            Thread.sleep(100);
 
             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 == 0){
                 return R.ok();