Просмотр исходного кода

feature: 门锁对接
1.门锁电量同步定时任务

luoyb 1 год назад
Родитель
Сommit
ecbd5302c5

+ 13 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/lock/LockBusiness.java

@@ -114,18 +114,31 @@ public class LockBusiness {
         return R.fail("获取门锁电量失败", "获取门锁电量失败");
     }
 
+    /**
+     * 查询门锁电量并保持至数据库
+     * @param areaId 指定区域
+     * @return 查询结果
+     */
     public Boolean syncLockPower(Long areaId) {
         List<PtRoomVo> roomVos = roomService.queryHotelRoomList(areaId);
         insertLockPower(roomVos);
         return true;
     }
 
+    /**
+     * 查询门锁电量并保持至数据库
+     * @return 查询结果
+     */
     public Boolean syncLockPower() {
         List<PtRoomVo> roomVos = roomService.queryHotelRoomList();
         insertLockPower(roomVos);
         return true;
     }
 
+    /**
+     * 门锁电量入库
+     * @param roomVos 门锁列表
+     */
     private void insertLockPower(List<PtRoomVo> roomVos) {
         if (CollectionUtil.isNotEmpty(roomVos)) {
             roomVos.forEach(p -> {

+ 11 - 4
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/controller/lock/LockController.java

@@ -31,19 +31,26 @@ public class LockController {
     /**
      * 查询门锁电量
      *
-     * @param lockId 门锁Id
      * @return 状态
      */
     @GetMapping(value = "/device/battery")
-    ReturnResult queryDeviceBattery(@RequestParam("lockId") String lockId) {
-        Boolean result = lockBusiness.syncLockPower(115L);
+    ReturnResult queryDeviceBattery() {
+        Boolean result = lockBusiness.syncLockPower();
+        if(result) {
+            return ReturnResult.success();
+        } else {
+            return ReturnResult.failure(ResultCodeEnum.INTERFACE_OUTER_INVOKE_ERROR);
+        }
+    }
+    @GetMapping(value = "/device/battery/{areaId}")
+    ReturnResult queryDeviceBattery(@PathVariable Long areaId){
+        Boolean result = lockBusiness.syncLockPower(areaId);
         if(result) {
             return ReturnResult.success();
         } else {
             return ReturnResult.failure(ResultCodeEnum.INTERFACE_OUTER_INVOKE_ERROR);
         }
     }
-
     /**
      * 请求发卡数据
      *