Merge branch 'dev-lqc' into test

src/main/java/com/mokamrp/privates/task/pangu/SyncFosterwxCash.java

@@ -3,6 +3,7 @@ package com.mokamrp.privates.task.pangu;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
 import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
+import com.mokamrp.privates.utils.pangu.redis.task.TaskRedis;
 import lombok.extern.slf4j.Slf4j;
 import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,9 @@ public class SyncFosterwxCash {
     @Autowired
     private FosterwxCashScheduleTaskListService fosterwxCashScheduleTaskListService;
 
+    @Autowired
+    private TaskRedis taskRedis;
+
     /**
      * 每隔一分钟扫描今天待发送以及已经发送的任务
      */
@@ -44,4 +48,19 @@ public class SyncFosterwxCash {
 
         stringRedisTemplate.opsForHash().put("pan_fosterwx_cash_group_id:", null, null);
     }
+
+    /**
+     * 定时同步typer已经生成的url
+     */
+    @Scheduled(cron = "20 */1 * * * ?")
+    @SchedulerLock(name = "pangu:SyncCreatedUrlInfo", lockAtLeastForString = "PT5S", lockAtMostForString = "PT15M")
+    public void syncCreatedUrlInfo() {
+        String urlInfo = taskRedis.getPanguCashTaskInfo();
+        while (urlInfo != null) {
+            // 根据获取的信息保存到本地数据库
+            // TODO 需要根据typer返回的redis结构具体生成
+
+            urlInfo = taskRedis.getPanguCashTaskInfo();
+        }
+    }
 }

src/main/java/com/mokamrp/privates/utils/pangu/redis/task/TaskRedis.java

@@ -19,8 +19,12 @@ public class TaskRedis {
      * @param json
      */
     public void createUrlByTyper(String json) {
-
         // 把数据存放到redis缓存中
         stringRedisTemplate.opsForList().leftPush(PANGU_CASH_TASK_INFO, json);
     }
+
+    public String getPanguCashTaskInfo() {
+        // 获取生成链接的结果
+        return stringRedisTemplate.opsForList().rightPop(PANGU_CASH_CREATED_URL);
+    }
 }