fix: 评分上报

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

@@ -40,7 +40,7 @@ public class CollectController {
     public ResultData sendPolicy(@RequestBody @Validated DtoPolicy policy) {
         log.info("controller，数据采集配置下发，请求参数：{}", JSONUtil.toJsonStr(policy));
         ResultData checkResult = taskService.checkTaskStatus(policy);
-        if (!checkResult.codeSucceed()) {
+        if (checkResult.isFail()) {
             return checkResult;
         }
         // 上报结果

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

@@ -50,7 +50,7 @@ public class DemoController {
     }
 
     /** 模拟评分上报 */
-    @PostMapping("/config/api/v1/evaluateData")
+    @PostMapping("/data/api/v1/evaluateData")
     public ResultData evaluateData(@RequestBody @Validated EvaluateDto dto) {
         log.info("模拟上报接口，上报接口成功，评分数据：{}", JSONUtil.toJsonStr(dto));
         return ResultData.success();

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

@@ -62,7 +62,7 @@ public class TaskController {
     public ResultData dipatchmission(@RequestBody @Validated DtoDipatchmission dto) {
         log.info("controller，控制命令下发，请求参数：{}", JSONUtil.toJsonStr(dto));
         ResultData checkResult = taskService.checkTaskStatus(dto);
-        if (!checkResult.codeSucceed()) {
+        if (checkResult.isFail()) {
             return checkResult;
         }
         boolean result = taskService.saveTaskToRedis(dto.getRedisMapping());
@@ -79,7 +79,7 @@ public class TaskController {
     public ResultData saveDipatchmission(@RequestBody @Validated DtoDipatchconfigsparam dto) {
         log.info("controller，配置参数下发，请求参数：{}", JSONUtil.toJsonStr(dto));
         ResultData checkResult = taskService.checkTaskStatus(dto);
-        if (!checkResult.codeSucceed()) {
+        if (checkResult.isFail()) {
             return checkResult;
         }
         boolean result = taskService.saveTaskToRedis(dto.getRedisMapping());

src/main/java/com/cec/plugins/domain/ResultData.java

@@ -31,8 +31,8 @@ public class ResultData {
         this.timeStamp = timeStamp;
     }
 
-    public boolean codeSucceed() {
-        return this.respCode == CODE_SUCCESS;
+    public boolean isFail() {
+        return this.respCode == CODE_FAIL;
     }
 
     public static <T> ResultData success() {

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

@@ -1,6 +1,5 @@
 package com.cec.plugins.service;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.cec.plugins.config.properties.ProjectProperties;
@@ -164,6 +163,6 @@ public class TaskService {
         for (EstimateEnum item : EstimateEnum.values()) {
             data.addDataItem(item.getKey(), item.getDescribe(), StrUtil.firstNonEmpty(redisClientEvaluate.getCacheStr(item.getKey()), "0"));
         }
-        reportService.reportPlatform("/config/api/v1/evaluateData", data);
+        reportService.reportPlatform("/data/api/v1/evaluateData", data);
     }
 }

src/main/java/com/cec/plugins/service/task/DeviceScheduleService.java

@@ -1,13 +1,10 @@
 package com.cec.plugins.service.task;
 
-import com.cec.plugins.config.properties.ProjectProperties;
 import com.cec.plugins.domain.reported.DeviceDto;
 import com.cec.plugins.enumerate.DeviceEnum;
 import com.cec.plugins.service.RedisClientSource;
-import lombok.*;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
@@ -23,8 +20,6 @@ public class DeviceScheduleService {
     private final RedisClientSource redisClientSource;
     private final ReportService reportService;
 
-    @Async
-    @Scheduled(fixedDelayString = "${project.platform.fixed-delay}")
     public void heartbeat() {
         DeviceDto dto = new DeviceDto();
         for (DeviceEnum deviceEnum : DeviceEnum.values()) {

src/main/java/com/cec/plugins/service/task/ReportService.java

@@ -30,10 +30,10 @@ public class ReportService {
                 @Override
                 protected Object handle() {
                     ResultData result = HttpUtils.post(url, body);
-                    if (result.codeSucceed()) {
-                        return result;
+                    if (result.isFail()) {
+                        throw new RetryException(result.getRespMsg());
                     }
-                    throw new RetryException(result.getRespMsg());
+                    return result;
                 }
             }).execute();
             log.info("连接平台成功，请求url：{}，返回结果：{}", url, Convert.toStr(execute));