From c73dd6a583437ce2db1c033cbf604753454e3a3e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 14 Apr 2025 19:32:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=A3=80=E4=BF=AE=E5=85=B3=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HardDoorFlowController.java    | 11 ++++++++++
 .../hard/service/HardDoorFlowService.java     |  8 +++----
 .../service/impl/HardDoorFlowServiceImpl.java | 22 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardDoorFlowController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardDoorFlowController.java
index d80b2ea66..a69810649 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardDoorFlowController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardDoorFlowController.java
@@ -56,6 +56,17 @@ public class HardDoorFlowController {
         return R.ok();
     }
 
+    @Operation(summary = "检修关门", description = "检修关门")
+    @PostMapping("/close-access")
+    public R closeAccess(@Validated @RequestBody HardDoorFlowOpenDto dto) {
+        PjcloudUser user = SecurityUtils.getUser();
+        dto.setFlowType(HardDoorFlowEnum.ACCESS_OPEN);
+        dto.setOpenType(HardDoorOpenTypeEnum.MAINTENANCE_LOCK);
+        dto.setUserId(user.getId());
+        hardDoorFlowService.closeAccess(dto);
+        return R.ok();
+    }
+
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
     @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_view')")
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java
index e194fdc7e..53b6b78dd 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java
@@ -7,16 +7,16 @@ import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo;
 
 public interface HardDoorFlowService extends IService<HardDoorFlowEntity> {
 
-    /**
-     * 开门
-     */
-    void openDoor(HardDoorFlowOpenDto dto, HardDoorManagerVo hardDoorVo);
 
     /**
      * 检修开门
      */
     void openDoorAccess(HardDoorFlowOpenDto dto);
 
+    /**
+     * 检修关门
+     */
+    void closeAccess(HardDoorFlowOpenDto dto);
 
     /**
      * 购买开门
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java
index 04e0b63e4..3380aeb92 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,7 +42,6 @@ public class HardDoorFlowServiceImpl extends ServiceImpl<HardDoorFlowMapper, Har
     /**
      * 开门
      */
-    @Override
     @Transactional(rollbackFor = Exception.class)
     public void openDoor(HardDoorFlowOpenDto dto, HardDoorManagerVo hardDoorVo) {
         HardDoorFlowEntity saveObj = HardDoorFlowEntity.builder().userId(dto.getUserId()).bizType(dto.getFlowType().getType()).isOpen(YesNoEnum.NO.getCode()).build();
@@ -60,6 +60,7 @@ public class HardDoorFlowServiceImpl extends ServiceImpl<HardDoorFlowMapper, Har
         baseMapper.updateById(updateObj);
     }
 
+
     /**
      * 检修开门
      */
@@ -71,6 +72,25 @@ public class HardDoorFlowServiceImpl extends ServiceImpl<HardDoorFlowMapper, Har
         getSelf().openDoor(dto, doorDetail);
     }
 
+    /**
+     * 检修关门
+     */
+    @Override
+    public void closeAccess(HardDoorFlowOpenDto dto) {
+        // 查询智能柜
+        HardDoorManagerVo doorDetail = checkDeviceAndCabinet(dto.getHardDoorId(), dto.getCabinetNo());
+        // 请求关门
+        DoorOpenDto openDto = BeanUtil.toBean(dto, DoorOpenDto.class);
+        openDto.setOutOpenNo(doorDetail.getDeviceCode());
+        openDto.setOutOpenNo(dto.getCabinetNo());
+        openDto.setDeviceCode(RandomUtil.randomString(32));
+        openDto.setEventType(Integer.valueOf(dto.getOpenType().getType()));
+        DoorOpenVo openVo = thirdDoorApiService.open(openDto).getData();
+        if (ObjectUtil.isEmpty(openVo) || !openVo.isSuccess()) {
+            throw new RuntimeException("关门失败");
+        }
+    }
+
     /**
      * 购买开门
      */