refactor: 代码调整

src/main/java/com/cec/plugins/config/RedissonConfig.java

@@ -31,7 +31,7 @@ public class RedissonConfig {
     /** 资源模型数据库 */
     @Bean
     @Primary
-    @Qualifier("redisResource")
+    @Qualifier("redisClientResource")
     public RedissonClient redissonResourceClient() {
         Config config = new Config();
         config.setTransportMode(TransportMode.NIO);
@@ -50,7 +50,7 @@ public class RedissonConfig {
 
     /** 评估数据库 */
     @Bean
-    @Qualifier("redissonClientEvaluate")
+    @Qualifier("redisClientEvaluate")
     public RedissonClient redissonEvaluateClient() {
         Config config = new Config();
         config.setTransportMode(TransportMode.NIO);

src/main/java/com/cec/plugins/controller/CollectController.java

@@ -6,7 +6,7 @@ import com.cec.plugins.domain.DtoPolicy;
 import com.cec.plugins.domain.ResultData;
 import com.cec.plugins.enumerate.EstimateEnum;
 import com.cec.plugins.service.RedisClientSource;
-import com.cec.plugins.service.RedissonClientEvaluate;
+import com.cec.plugins.service.RedisClientEvaluate;
 import com.cec.plugins.service.TaskService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Async;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 public class CollectController {
 
     private final RedisClientSource redisClientSource;
-    private final RedissonClientEvaluate redissonClientEvaluate;
+    private final RedisClientEvaluate redisClientEvaluate;
     private final TaskService taskService;
 
     /** 任务状态下发接口 */
@@ -57,7 +57,7 @@ public class CollectController {
                 item.setValue(redisClientSource.getCacheStr(item.getKey()));
                 EstimateEnum estimateEnum = EstimateEnum.findEstimateEnum(item.getKey());
                 item.setGroup(Optional.ofNullable(estimateEnum).map(EstimateEnum::getGroup).orElse(""));
-                item.setScore(redissonClientEvaluate.getCacheStr(item.getKey()));
+                item.setScore(redisClientEvaluate.getCacheStr(item.getKey()));
             }
             // 计算平均值
             Double avg = reportItem.getCollect().stream()

src/main/java/com/cec/plugins/controller/DemoController.java

@@ -1,6 +1,7 @@
 package com.cec.plugins.controller;
 
 import cn.hutool.json.JSONUtil;
+import com.cec.plugins.domain.DtoPolicy;
 import com.cec.plugins.domain.ResultData;
 import com.cec.plugins.domain.reported.RegistrationDto;
 import com.cec.plugins.domain.reported.ReportedData;
@@ -42,4 +43,11 @@ public class DemoController {
         log.info("模拟上报接口，上报接口成功，注册参数：{}", JSONUtil.toJsonStr(dto));
         return ResultData.success();
     }
+
+    /** 采集上报 */
+    @PostMapping("/data/api/v1/collectData")
+    public ResultData collectData(@RequestBody @Validated DtoPolicy.ReportPolicy dto) {
+        log.info("模拟采集上报，上报接口成功，注册参数：{}", JSONUtil.toJsonStr(dto));
+        return ResultData.success();
+    }
 }

src/main/java/com/cec/plugins/controller/EstimateController.java

@@ -1,9 +0,0 @@
-package com.cec.plugins.controller;
-
-/**
- * @author zhanghaijun
- * @date 2023/8/15 22:58
- * @description 任务评估插件
- */
-public class EstimateController {
-}

src/main/java/com/cec/plugins/controller/RedisController.java

@@ -1,6 +1,7 @@
 package com.cec.plugins.controller;
 
 import com.cec.plugins.domain.ResultData;
+import com.cec.plugins.service.RedisClientEvaluate;
 import com.cec.plugins.service.RedisClientSource;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,9 +20,15 @@ import org.springframework.web.bind.annotation.RestController;
 public class RedisController {
 
     private final RedisClientSource redisClientSource;
+    private final RedisClientEvaluate redisClientEvaluate;
 
     @GetMapping("/resource/{key}")
     public ResultData resource(@PathVariable String key) {
         return ResultData.success(redisClientSource.getCacheStr(key));
     }
+
+    @GetMapping("/evaluate/{key}")
+    public ResultData evaluate(@PathVariable String key) {
+        return ResultData.success(redisClientEvaluate.getCacheStr(key));
+    }
 }

src/main/java/com/cec/plugins/service/RedissonClientEvaluate.java

@@ -13,11 +13,11 @@ import java.util.Optional;
  * @description 评估数据库连接
  */
 @Service
-public class RedissonClientEvaluate extends RedisManage {
+public class RedisClientEvaluate extends RedisManage {
 
     private final RedissonClient redissonClient;
 
-    public RedissonClientEvaluate(@Qualifier("redissonClientEvaluate") RedissonClient redissonClient) {
+    public RedisClientEvaluate(@Qualifier("redisClientEvaluate") RedissonClient redissonClient) {
         this.redissonClient = redissonClient;
     }
 

src/main/java/com/cec/plugins/service/RedisClientSource.java

@@ -21,7 +21,7 @@ public class RedisClientSource extends RedisManage {
 
     private final RedissonClient redissonClient;
 
-    public RedisClientSource(@Qualifier("redisResource") RedissonClient redissonClient) {
+    public RedisClientSource(@Qualifier("redisClientResource") RedissonClient redissonClient) {
         this.redissonClient = redissonClient;
     }