fix: 20230905优化

1、请求数据入口添加参数日志打印
2、上报数据serviceName可配置参数
3、默认的上报轮询间隙配置调整为8s

src/main/java/com/cec/plugins/config/properties/ProjectProperties.java

@@ -41,8 +41,9 @@ public class ProjectProperties {
     @Data
     public static class PluginModel {
         /** 最大重试此处 */
-        private String ipAddress;
+        private String ipAddress = "127.0.0.1";
         /** 间隔时间（毫秒） */
         private Integer port;
+        private String serviceName = "guidaojiaotong_collection";
     }
 }

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

@@ -1,17 +1,13 @@
 package com.cec.plugins.controller;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.cec.plugins.domain.DtoPolicy;
 import com.cec.plugins.domain.ResultData;
 import com.cec.plugins.domain.reported.ReportedData;
-import com.cec.plugins.enumerate.EstimateEnum;
-import com.cec.plugins.service.RedisClientEvaluate;
-import com.cec.plugins.service.RedisClientSource;
 import com.cec.plugins.service.TaskService;
 import com.cec.plugins.service.task.TaskCollectService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,11 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 /**
  * @author zhanghaijun
  * @date 2023/8/13 00:27
@@ -33,6 +24,7 @@ import java.util.stream.Collectors;
  * （3）将数据打包反馈给综管服务器；
  * （4）支持断点续传功能，自动/人工上传功能。
  */
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/config/api/v1")
@@ -44,6 +36,7 @@ public class CollectController {
     /** 数据采集配置下发接口 */
     @PostMapping("/sendPolicy")
     public ResultData sendPolicy(@RequestBody @Validated DtoPolicy policy) {
+        log.info("接受请求，数据采集配置下发，请求参数：{}", JSONUtil.toJsonStr(policy));
         ResultData checkResult = taskService.checkTaskStatus(policy);
         if (!checkResult.codeSucceed()) {
             return checkResult;

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

@@ -1,5 +1,6 @@
 package com.cec.plugins.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.cec.plugins.domain.DtoDipatchconfigsparam;
 import com.cec.plugins.domain.DtoDipatchmission;
 import com.cec.plugins.domain.DtoTaskStatus;
@@ -9,6 +10,7 @@ import com.cec.plugins.enumerate.TaskEnum;
 import com.cec.plugins.service.TaskService;
 import com.cec.plugins.service.task.TaskCollectService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * （3）读取Redis数据库中仿真系统任务/配置执行结果；
  * （4）将任务/配置执行结果反馈给综管服务器。
  */
+@Slf4j
 @RestController
 @RequestMapping("/config/api/v1")
 @RequiredArgsConstructor
@@ -33,6 +36,7 @@ public class TaskController {
     /** 任务状态下发接口 */
     @PostMapping("/taskStatus")
     public ResultData taskStatus(@RequestBody @Validated DtoTaskStatus dto) {
+        log.info("接受请求，任务状态下发，请求参数：{}", JSONUtil.toJsonStr(dto));
         boolean result = taskService.saveTaskToRedis(dto.getRedisMapping());
         if (!result) {
             return ResultData.fail("任务状态保存失败");
@@ -48,6 +52,7 @@ public class TaskController {
     /** 控制命令下发 */
     @PostMapping("/dipatchmission")
     public ResultData dipatchmission(@RequestBody @Validated DtoDipatchmission dto) {
+        log.info("接受请求，控制命令下发，请求参数：{}", JSONUtil.toJsonStr(dto));
         ResultData checkResult = taskService.checkTaskStatus(dto);
         if (!checkResult.codeSucceed()) {
             return checkResult;
@@ -64,6 +69,7 @@ public class TaskController {
     /** 配置参数下发接口 */
     @PostMapping("/dipatchconfigsparam")
     public ResultData saveDipatchmission(@RequestBody @Validated DtoDipatchconfigsparam dto) {
+        log.info("接受请求，配置参数下发，请求参数：{}", JSONUtil.toJsonStr(dto));
         ResultData checkResult = taskService.checkTaskStatus(dto);
         if (!checkResult.codeSucceed()) {
             return checkResult;

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

@@ -63,6 +63,7 @@ public class TaskService {
     public void register() {
         RegistrationDto body = new RegistrationDto();
         body.setIpAddress(properties.getPlugin().getIpAddress());
+        body.setServiceName(properties.getPlugin().getServiceName());
         body.setPort(properties.getPlugin().getPort());
         try {
             reportPlatform("/api/v1/serviceRegistration", body);

src/main/resources/application-prod.yml

@@ -32,10 +32,11 @@ project:
   platform:
     url: http://192.168.30.252:8080
     retries: 3
-    delay-millis: 1000
+    delay-millis: 8000
   plugin:
     ip-address: 172.16.20.1
     port: ${server.port}
+    service-name: guidaojiaotong_collection
   simulation:
     retries: 30
     delay-millis: 500

src/main/resources/application.yml

@@ -32,10 +32,11 @@ project:
   platform:
     url: ${PLATFORM_URL:http://127.0.0.1:${server.port}}
     retries: ${PLATFORM_RETRIES:3}
-    delay-millis: ${PLATFORM_DELAY-MILLIS:1000}
+    delay-millis: ${PLATFORM_DELAY-MILLIS:8000}
   plugin:
     ip-address: ${PLUGIN_HOST:127.0.0.1}
     port: ${PLUGIN_PORT:${server.port}}
+    service-name: guidaojiaotong_collection
   simulation:
     retries: ${SIMULATION_RETRIES:20}
     delay-millis: ${SIMULATION_DELAY-MILLIS:500}