Selaa lähdekoodia

新增业务逻辑

小车车 4 viikkoa sitten
vanhempi
sitoutus
cbf26e415d

+ 8 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/WorkflowWorkTicketController.java

@@ -107,4 +107,12 @@ public class WorkflowWorkTicketController {
         return success(respVO);
     }
 
+    @PermitAll
+    @GetMapping("/getKeyStates")
+    @Operation(summary = "通过钥匙的mac_address获取钥匙的使用状态")
+    public CommonResult<List<KeyStateVO>> getKeyStates(List<String> macs) {
+        WorkflowWorkNodeRespVO respVO = workflowWorkHandleService.getKeyStates(macs);
+        return success(respVO);
+    }
+
 }

+ 28 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/KeyStateVO.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 钥匙状态")
+@Data
+public class KeyStateVO {
+
+    @Schema(description = "ID")
+    private Long id;
+
+    @Schema(description = "钥匙编码")
+    private String keyCode;
+
+    @Schema(description = "钥匙名称", example = "张三")
+    private String keyName;
+
+    @Schema(description = "钥匙NFC")
+    private String keyNfc;
+
+    @Schema(description = "MAC地址")
+    private String macAddress;
+
+    @Schema(description = "使用状态", example = "0未使用 1使用中")
+    private String usageStatus;
+
+}

+ 1 - 1
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/isolationpoint/IsolationPointDO.java

@@ -87,7 +87,7 @@ public class IsolationPointDO extends BaseDO {
      */
     private Long locksetTypeId;
     /**
-     * 开关状态(0-开 1-关)
+     * 开关状态(0-未锁 1-已锁)
      */
     private Integer switchStatus;
     /**

+ 2 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkHandleService.java

@@ -35,5 +35,7 @@ public interface WorkflowWorkHandleService {
 
     WorkflowWorkNodeRespVO getNodeDetailByNfc(String nfc);
 
+    List<KeyStateVO> getKeyStates(List<String> macs);
+
 
 }

+ 16 - 0
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkHandleServiceImpl.java

@@ -766,5 +766,21 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
         return new WorkflowWorkNodeRespVO();
     }
 
+    @Override
+    public List<KeyStateVO> getKeyStates(List<String> macs) {
+        ArrayList<KeyStateVO> keyStateVOS = new ArrayList<>();
+        if (!macs.isEmpty()) {
+            List<KeyDO> keyDOList = iscsKeyService.list(Wrappers.<KeyDO>lambdaQuery()
+                    .in(KeyDO::getMacAddress, macs));
+            if (!keyDOList.isEmpty()) {
+                
+            }
+
+        }
+
+
+        return List.of();
+    }
+
 
 }