Explorar o código

关锁功能状态查询

liubo %!s(int64=3) %!d(string=hai) anos
pai
achega
033374d87d

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

@@ -123,15 +123,15 @@ public class DeviceRemoteController {
             Thread.sleep(900);
             Integer status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
             logger.info("柜锁关锁状态查询:" + instruct + ",关锁结果" + status);
-            /*if(status != null && status == 0){
+            if(status != null && status == 0){
                 return R.ok("关锁成功");
-            }*/
-            return R.ok("关锁成功");
+            }
+//            return R.ok("关锁成功");
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("柜锁连接失败:" + e.getMessage());
             return R.fail("柜锁连接失败!");
         }
-        //return R.fail("关锁失败");
+        return R.fail("关锁失败:请手动按压柜锁,确认已关闭!");
     }
 }