柜锁开关流程优化

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/CabinetV2Lock.java

@@ -39,6 +39,8 @@ public class CabinetV2Lock {
 
     private boolean success = false;
 
+    private String msg;
+
     public String getIpAddress() {
         return ipAddress;
     }
@@ -102,4 +104,12 @@ public class CabinetV2Lock {
     public void setLockLogId(Long lockLogId) {
         this.lockLogId = lockLogId;
     }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpAIOController.java

@@ -510,7 +510,11 @@ public class HxpAIOController extends BaseController {
         }
         aioCabinetLockVo.setSubId(getSubIdByTerminalNum());
         CabinetV2Lock cabinetV2Lock = hxpCabinetService.openLock(aioCabinetLockVo);
-        return R.ok(cabinetV2Lock);
+        if(cabinetV2Lock.isSuccess()){
+            return R.ok(cabinetV2Lock);
+        }else {
+            return R.fail(cabinetV2Lock, cabinetV2Lock.getMsg());
+        }
     }
 
     /**
@@ -534,7 +538,11 @@ public class HxpAIOController extends BaseController {
 
         aioCabinetLockVo.setSubId(getSubIdByTerminalNum());
         CabinetV2Lock cabinetV2Lock = hxpCabinetService.closeLock(aioCabinetLockVo);
-        return R.ok(cabinetV2Lock);
+        if(cabinetV2Lock.isSuccess()){
+            return R.ok(cabinetV2Lock);
+        }else {
+            return R.fail(cabinetV2Lock, cabinetV2Lock.getMsg());
+        }
     }
 
     /**--------------------------------------人脸验证----------------------------------------*/

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

@@ -272,11 +272,13 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
 
         boolean success = false;
         String closeLockVideo = null;
+        String msg = "";
         if (type == 1) {
             // 开锁
             // 1. 执行开锁命令
             R r = remoteSubQueryService.cabinetV2OpenLock(result);
             logger.info("柜锁开锁返回数值：" + r.getCode() + ";;;;" + r.getMsg());
+            msg = r.getMsg();
             // 2. 判断执行状态
             if(r.getCode() == HttpStatus.SUCCESS){
                 success = true;
@@ -287,6 +289,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
             // 关锁
             R r = remoteSubQueryService.cabinetV2CloseLock(result);
             logger.info("柜锁关锁返回数值：" + r.getCode() + ";;;;" + r.getMsg());
+            msg = r.getMsg();
             // 判断执行状态
             if(r.getCode() == HttpStatus.SUCCESS){
                 success = true;
@@ -339,6 +342,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
 
 
         result.setSuccess(success);
+        result.setMsg(msg);
 
         return result;