/*

*
为接入省测大模型，将任务数据同步上传到升级系统所作的修改，代码标准化处理。
*/

inspect-job/src/main/java/com/inspect/job/task/UpTask.java

@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.inspect.base.core.exception.ServiceException;
-import com.inspect.base.core.service.SendService;
+import com.inspect.base.core.service.SyncDataToUpstreamService;
 import com.inspect.base.core.utils.StringUtils;
 import com.inspect.base.core.web.domain.AjaxResult;
 import com.inspect.base.redis.service.RedisService;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 @Component("upTask")
 public class UpTask {
     @Resource
-    SendService sendService;
+    SyncDataToUpstreamService syncDataToUpstreamService;
     public String timeIntervalKey = "time_interval_up_system_setting";
     Logger logger = LoggerFactory.getLogger(UpTask.class);
     public String lastTaskTimeKey = "last_up_data_task_time";
@@ -225,7 +225,7 @@ public class UpTask {
     public AjaxResult sendMsg(String msg) {
         try {
             JSONObject.parseObject(msg);
-            return this.sendService.sendMsg(msg);
+            return this.syncDataToUpstreamService.postMessage(msg);
         } catch (Exception var3) {
             this.logger.info("定时上报数据到上级系统的请求捕获异常", var3);
             throw new ServiceException("上报数据失败，msg格式不正确");

inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java

@@ -8,7 +8,7 @@ import com.inspect.client.domain.ResDomain;
 import com.inspect.client.mapper.ClientStatisticsMapper;
 import com.inspect.client.util.CallDeviceApi;
 import com.inspect.base.core.exception.ServiceException;
-import com.inspect.base.core.service.SendService;
+import com.inspect.base.core.service.SyncDataToUpstreamService;
 import com.inspect.base.core.web.domain.AjaxResult;
 import com.inspect.maintain.controller.MaintainRegionController;
 import com.inspect.partrolresult.controller.PatrolResultController;
@@ -16,10 +16,8 @@ import com.inspect.system.base.openDomain.BasedataEqpBookMoMain;
 import com.inspect.task.controller.PatrolTaskController;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import javax.annotation.Resource;
 
 import com.inspect.task.domain.PatrolTask;
@@ -46,7 +44,7 @@ public class ClientService {
     @Value("${tcp.client.lowMsg}")
     public String lowMsgUrl;
     @Resource
-    SendService sendService;
+    SyncDataToUpstreamService syncDataToUpstreamService;
     public static HashMap<String, String> modelMap = new HashMap<>();
 
     public static void initModelMap() {

inspect-main/inspect-main-task/src/main/java/com/inspect/maintain/controller/MaintainRegionController.java

@@ -3,7 +3,7 @@ package com.inspect.maintain.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.inspect.analysis.service.IResultAnalysisService;
 import com.inspect.base.core.domain.DataMsg;
-import com.inspect.base.core.service.SendService;
+import com.inspect.base.core.service.SyncDataToUpstreamService;
 import com.inspect.base.core.utils.SFTPUtil;
 import com.inspect.base.core.utils.StringUtils;
 import com.inspect.base.core.utils.bean.BeanUtils;
@@ -62,7 +62,7 @@ public class MaintainRegionController extends BaseController {
     @Resource
     private IPatrolTaskFtpService patrolTaskFtpService;
     @Resource
-    private SendService sendService;
+    private SyncDataToUpstreamService syncDataToUpstreamService;
 
     @GetMapping({"/list"})
     public TableDataInfo list(MaintainRegion maintainRegion) {
@@ -642,6 +642,6 @@ public class MaintainRegionController extends BaseController {
         sendTask.setItems(taskLis);
         String jsonString = JSONObject.toJSONString(sendTask);
         logger.info("[MAINTAIN] SYNC maintain region to upper system jsonString: {}", jsonString);
-        sendService.sendMsg(jsonString);
+        syncDataToUpstreamService.postMessage(jsonString);
     }
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -13,7 +13,7 @@ import com.inspect.base.core.domain.DataMsg;
 import com.inspect.base.core.enums.StaEnum;
 import com.inspect.base.core.enums.TaskStatus;
 import com.inspect.base.core.exception.ServiceException;
-import com.inspect.base.core.service.SendService;
+import com.inspect.base.core.service.SyncDataToUpstreamService;
 import com.inspect.base.core.sftp.SftpClient;
 import com.inspect.base.core.sftp.SftpUploadEntity;
 import com.inspect.base.core.utils.DateUtils;
@@ -135,7 +135,7 @@ public class PatrolResultController extends BaseController {
     private IResultAnalysisService resultAnalysisService;
 
     @Resource
-    SendService sendService;
+    SyncDataToUpstreamService syncDataToUpstreamService;
     @Resource
     IUploadServer iUploadServer;
     @Resource

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -10,7 +10,7 @@ import com.inspect.base.core.constant.Color;
 import com.inspect.base.core.constant.RedisConst;
 import com.inspect.base.core.domain.DataMsg;
 import com.inspect.base.core.enums.TaskStatus;
-import com.inspect.base.core.service.SendService;
+import com.inspect.base.core.service.SyncDataToUpstreamService;
 import com.inspect.base.core.sftp.SftpClient;
 import com.inspect.base.core.utils.DateUtils;
 import com.inspect.base.core.utils.HttpClientUtils;
@@ -67,9 +67,6 @@ import org.apache.poi.hssf.usermodel.HSSFPatriarch;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -90,7 +87,7 @@ public class PatrolTaskController extends BaseController {
     private final FeignBasedataAreaService FeignBasedataAreaService;
     public final RedisService redisService;
     private final IPatrolTaskFtpService patrolTaskFtpService;
-    private final SendService sendService;
+    private final SyncDataToUpstreamService syncDataToUpstreamService;
     @Resource
     private SftpClient sftpClient;
 
@@ -107,7 +104,7 @@ public class PatrolTaskController extends BaseController {
             FeignBasedataAreaService FeignBasedataAreaService,
             RedisService redisService,
             IPatrolTaskFtpService patrolTaskFtpService,
-            SendService sendService) {
+            SyncDataToUpstreamService syncDataToUpstreamService) {
         this.patrolTaskService = patrolTaskService;
         this.patrolTaskStatusService = patrolTaskStatusService;
         this.patrolTaskInfoService = patrolTaskInfoService;
@@ -117,7 +114,7 @@ public class PatrolTaskController extends BaseController {
         this.FeignBasedataAreaService = FeignBasedataAreaService;
         this.redisService = redisService;
         this.patrolTaskFtpService = patrolTaskFtpService;
-        this.sendService = sendService;
+        this.syncDataToUpstreamService = syncDataToUpstreamService;
     }
 
     @GetMapping("/list")
@@ -2328,7 +2325,7 @@ public class PatrolTaskController extends BaseController {
         sendTask.setItems(taskLis);
         String str = JSONObject.toJSONString(sendTask);
         System.out.println(str);
-        sendService.sendMsg(str);
+        syncDataToUpstreamService.postMessage(str);
     }
 
     @GetMapping({"/taskRationalList"})

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java

@@ -27,7 +27,7 @@ import com.inspect.metadata.prodevmnt.mapper.BasedataDeviceTypeMapper;
 import com.inspect.metadata.station.domain.BasedataStation;
 import com.inspect.metadata.station.mapper.BasedataStationMapper;
 import com.inspect.base.core.domain.DataMsg;
-import com.inspect.base.core.service.SendService;
+import com.inspect.base.core.service.SyncDataToUpstreamService;
 import com.inspect.base.core.utils.DateUtils;
 import com.inspect.base.core.utils.SFTPUtil;
 import com.inspect.base.core.utils.xml.GenXmlByBean;
@@ -65,7 +65,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
     @Resource
     BaseDataAreaMapper baseDataAreaMapper;
     @Resource
-    SendService sendService;
+    SyncDataToUpstreamService syncDataToUpstreamService;
     @Resource
     private BasedataAlgSubtypeMapper basedataAlgSubtypeMapper;
 
@@ -176,7 +176,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
             jsonArray.add(jsonItem);
             jsonObject.put("Items", jsonArray);
             String jsonString = jsonObject.toJSONString();
-            this.sendService.sendMsg(jsonString);
+            this.syncDataToUpstreamService.postMessage(jsonString);
             System.out.println("jsonString:" + jsonString);
         }