Merge remote-tracking branch 'origin/master'

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 -> {

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", produces = "application/json; charset=utf-8")
-    ReturnResult queryDeviceBattery(@RequestParam("lockId") String lockId) {
-        Boolean result = lockBusiness.syncLockPower(115L);
+    @GetMapping(value = "/device/battery")
+    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);
         }
     }
-
     /**
      * 请求发卡数据
      *

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/task/AsyncTaskService.java

@@ -3,10 +3,13 @@ package org.dromara.backstage.task;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.backstage.business.lock.LockBusiness;
 import org.dromara.common.core.api.ReturnResult;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -22,10 +25,12 @@ import java.util.Map;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class AsyncTaskService {
     @Value("${third-api.sms-api}")
     String smsApi;
 
+
     public void asyncSendSms(String mobile, String message) {
         String keyToken = "yktSmsToken";
         String sendUrl = smsApi + "sms/api/v1/send";
@@ -46,4 +51,5 @@ public class AsyncTaskService {
             log.info("[短信发送]-{\"内容\":\"{}\",\"发送异常\":\"{}\"", message, ex.getMessage());
         }
     }
+
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/task/ScheduledTasks.java

@@ -0,0 +1,29 @@
+package org.dromara.backstage.task;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.backstage.business.lock.LockBusiness;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * name: ScheduledTasks
+ * package: org.dromara.backstage.task
+ * description: 定时任务
+ * date: 2024-12-11 13:32:36 13:32
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@Component
+@RequiredArgsConstructor
+public class ScheduledTasks {
+    private final LockBusiness lockBusiness;
+    /**
+     * 定时同步门锁电量
+     */
+    @Scheduled(fixedDelay = 10 * 60 * 1000)
+    public void syncLockBattery(){
+        lockBusiness.syncLockPower();
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/task/SubsidyScheduled.java

@@ -3,7 +3,10 @@ package org.dromara.backstage.task;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.backstage.business.payments.PayOrderBusiness;
+import org.dromara.common.core.domain.R;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 
 /**
  * name: SubsidyScheduled
@@ -16,16 +19,16 @@ import org.springframework.boot.CommandLineRunner;
  * @since JDK 1.8
  */
 @Slf4j
-// @Component
+@Component
 @RequiredArgsConstructor
 public class SubsidyScheduled implements CommandLineRunner {
     private final PayOrderBusiness subsidyOrderBusiness;
 
-    // @Scheduled(fixedDelay = 10 * 60 * 1000)
-    // public void rechargeSubsidy(){
-    //     R<Object> result = subsidyOrderBusiness.createSubsidyOrder();
-    //     log.info(result.getMsg());
-    // }
+    @Scheduled(fixedDelay = 10 * 60 * 1000)
+    public void rechargeSubsidy() {
+        R<Object> result = subsidyOrderBusiness.createSubsidyOrder();
+        log.info(result.getMsg());
+    }
 
     @Override
     public void run(String... args) throws Exception {

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/consumer/KafkaConsumer.java

@@ -31,7 +31,6 @@ import static org.dromara.common.message.kafka.constant.KafkaTopicConstants.SYNC
 @Slf4j
 @Component
 public class KafkaConsumer {
-
     private final EventStrategyContext eventStrategyContext;
 
     @KafkaListener(topics = "eventBus", groupId = "test-group-id")