From 3912aa35dd4c27bf7a7aa72b4d61b7259cc3c07b Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 31 Jul 2025 17:54:07 +0800 Subject: [PATCH] =?UTF-8?q?/*=20*=20=E4=B8=BA=E6=8E=A5=E5=85=A5=E7=9C=81?= =?UTF-8?q?=E6=B5=8B=E5=A4=A7=E6=A8=A1=E5=9E=8B=EF=BC=8C=E5=B0=86=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=88=B0=E5=8D=87=E7=BA=A7=E7=B3=BB=E7=BB=9F=E6=89=80=E4=BD=9C?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A3=E7=A0=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=E5=A4=84=E7=90=86=E3=80=82=20*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ce.java => SyncDataToUpstreamService.java} | 17 +++---- .../java/com/inspect/job/task/UpTask.java | 6 +-- ...troller.java => MainClientController.java} | 50 +++++++++---------- .../inspect/client/service/ClientService.java | 6 +-- .../controller/MaintainRegionController.java | 6 +-- .../controller/PatrolResultController.java | 4 +- .../task/controller/PatrolTaskController.java | 13 ++--- .../impl/BasedataPatrolPointServiceImpl.java | 6 +-- 8 files changed, 50 insertions(+), 58 deletions(-) rename inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/{SendService.java => SyncDataToUpstreamService.java} (65%) rename inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/{ClientController.java => MainClientController.java} (75%) diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SendService.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java similarity index 65% rename from inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SendService.java rename to inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java index 5b8df2e..9692cc2 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SendService.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/service/SyncDataToUpstreamService.java @@ -3,35 +3,34 @@ package com.inspect.base.core.service; import com.alibaba.fastjson.JSONObject; import com.inspect.base.core.utils.HttpClientUtils; import com.inspect.base.core.web.domain.AjaxResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Service; +@Slf4j @Service @RefreshScope @ConditionalOnProperty( name = {"tcp.client.enable"}, havingValue = "true" ) -public class SendService { - private Logger logger = LoggerFactory.getLogger(SendService.class); +public class SyncDataToUpstreamService { @Value("${tcp.client.send}") String sendUrl; - public AjaxResult sendMsg(String msg) { - return this.sendMsg(null, msg); + public AjaxResult postMessage(String msg) { + return this.postMessage(null, msg); } - public AjaxResult sendMsg(String type, String msg) { + public AjaxResult postMessage(String type, String msg) { try { - String resultJson = HttpClientUtils.postJson(this.sendUrl, msg, null); + String resultJson = HttpClientUtils.postJson(sendUrl, msg, null); AjaxResult ajaxResult = JSONObject.parseObject(resultJson, AjaxResult.class); return ajaxResult; } catch (Exception e) { - this.logger.error("上报消息到上级系统捕获异常", e); + log.error("上报消息到上级系统捕获异常", e); return AjaxResult.fail(500, "上报消息失败"); } } diff --git a/inspect-job/src/main/java/com/inspect/job/task/UpTask.java b/inspect-job/src/main/java/com/inspect/job/task/UpTask.java index bfd1dc0..93cf95e 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/UpTask.java +++ b/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格式不正确"); diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/ClientController.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/MainClientController.java similarity index 75% rename from inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/ClientController.java rename to inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/MainClientController.java index 1690ccf..17119d3 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/ClientController.java +++ b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/MainClientController.java @@ -3,7 +3,7 @@ package com.inspect.client.controller; import com.alibaba.fastjson.JSONObject; import com.inspect.client.service.ClientService; 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.SystemInfo; import com.inspect.base.core.web.domain.AjaxResult; import com.inspect.task.controller.PatrolTaskController; @@ -12,35 +12,33 @@ import java.util.Date; import javax.annotation.Resource; import com.inspect.taskstatus.client.FeignTaskClient; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController @RequestMapping({"/client"}) -public class ClientController { - private Logger logger = LoggerFactory.getLogger(ClientController.class); +public class MainClientController { @Resource - SendService sendService; + private SyncDataToUpstreamService syncDataToUpstreamService; @Resource - ClientService clientService; + private ClientService clientService; @Resource - PatrolTaskController patrolTaskController; + private PatrolTaskController patrolTaskController; - @Autowired + @Resource private FeignTaskClient feignTaskClient; @PostMapping({"/upData"}) public AjaxResult upData(String type, String msg) { try { JSONObject.parseObject(msg); - return sendService.sendMsg(type, msg); + return syncDataToUpstreamService.postMessage(type, msg); } catch (Exception e) { final String errorMsg = "REPORT DATA FAIL, DATA FORMAT EXCEPTION:" + e.getMessage(); throw new ServiceException(errorMsg); @@ -54,10 +52,10 @@ public class ClientController { AjaxResult ajaxResult = clientService.handleLowMsg(jsonObject); return ajaxResult; } catch (ServiceException var4) { - this.logger.error("下发上级系统传递的消息捕获异常", var4); + this.log.error("下发上级系统传递的消息捕获异常", var4); throw new ServiceException(var4.getMessage()); } catch (Exception var5) { - this.logger.error("下发上级系统传递的消息捕获异常", var5); + this.log.error("下发上级系统传递的消息捕获异常", var5); throw new ServiceException("下发数据失败，msg格式不正确"); } } @@ -69,7 +67,7 @@ public class ClientController { return clientService.handleLowMsg(jsonObject); } catch (Exception e) { final String errorMsg = "SEND IMPORTANT MSG EXCEPTION:" + e.getMessage(); - logger.error(errorMsg); + log.error(errorMsg); throw new ServiceException(errorMsg); } } @@ -79,15 +77,15 @@ public class ClientController { try { JSONObject.parseObject(msg); JSONObject jsonObject = clientService.callDeviceCommand(msg); - logger.info("[CLIENT] TO TCPSERVER REQUEST: {}, RESPONSE: {}", msg, jsonObject); + log.info("[CLIENT] TO TCPSERVER REQUEST: {}, RESPONSE: {}", msg, jsonObject); return StringUtils.equals(jsonObject.getString("code"), "500")?AjaxResult.fail(500, jsonObject.getString("msg")):AjaxResult.success(); } catch (ServiceException e) { final String errorMsg = "[CLIENT] TO TCPSERVER SERVICE EXCEPTION:" + e.getMessage(); - logger.error(errorMsg); + log.error(errorMsg); throw new ServiceException(errorMsg); } catch (Exception e) { final String errorMsg = "[CLIENT] TO TCPSERVER OTHER EXCEPTION:" + e.getMessage(); - logger.error(errorMsg); + log.error(errorMsg); throw new ServiceException(errorMsg); } } @@ -105,7 +103,7 @@ public class ClientController { return AjaxResult.success(systemInfo); } catch (Exception e) { final String errorMsg = "[CLIENT] SYSTEM INFO EXCEPTION:" + e.getMessage(); - logger.error(errorMsg); + log.error(errorMsg); throw new ServiceException("SYSTEM BUSY, TRY LATER!"); } } @@ -115,9 +113,9 @@ public class ClientController { try { // 和许继，无人机同步点位 JSONObject jsonObjectParm = JSONObject.parseObject(msg); - logger.info("========syncModel param: {}", jsonObjectParm); + log.info("========syncModel param: {}", jsonObjectParm); if (StringUtils.isEmpty(jsonObjectParm.getString("deviceCode"))) { - logger.info("[=>TCPSERVER] 巡视主机下发同步模型命令: 设备编码为空"); + log.info("[=>TCPSERVER] 巡视主机下发同步模型命令: 设备编码为空"); return AjaxResult.fail(500, "设备编码为空"); } JSONObject jsonObject = new JSONObject(); @@ -125,13 +123,13 @@ public class ClientController { jsonObject.put("ReceiveCode", jsonObjectParm.getString("deviceCode")); String msgs = jsonObject.toJSONString(); AjaxResult ajaxResult = feignTaskClient.sendCommand(msgs); - logger.info("[=>TCPSERVER] 巡视主机下发同步模型命令: {}, 结果: {}", msgs, jsonObject); + log.info("[=>TCPSERVER] 巡视主机下发同步模型命令: {}, 结果: {}", msgs, jsonObject); return ajaxResult; } catch (ServiceException e) { - logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令服务异常: {}", e.getMessage()); + log.error("[=>TCPSERVER] 巡视主机下发同步模型命令服务异常: {}", e.getMessage()); throw new ServiceException(e.getMessage()); } catch (Exception e) { - logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令: {}", e.getMessage()); + log.error("[=>TCPSERVER] 巡视主机下发同步模型命令: {}", e.getMessage()); throw new ServiceException("下发数据失败，msg格式不正确"); } } @@ -140,13 +138,13 @@ public class ClientController { try { JSONObject.parseObject(msg); JSONObject jsonObject = clientService.callDeviceCommand(msg); - logger.info("[=>TCPSERVER] 巡视主机下发同步模型命令: {}, 结果: {}", msg, jsonObject); + log.info("[=>TCPSERVER] 巡视主机下发同步模型命令: {}, 结果: {}", msg, jsonObject); return StringUtils.equals(jsonObject.getString("code"), "500")?AjaxResult.fail(500, jsonObject.getString("msg")):AjaxResult.success(); } catch (ServiceException e) { - logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令服务异常: {}", e.getMessage()); + log.error("[=>TCPSERVER] 巡视主机下发同步模型命令服务异常: {}", e.getMessage()); throw new ServiceException(e.getMessage()); } catch (Exception e) { - logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令: {}", e.getMessage()); + log.error("[=>TCPSERVER] 巡视主机下发同步模型命令: {}", e.getMessage()); throw new ServiceException("下发数据失败，msg格式不正确"); } } diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java index 9c23531..271378c 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java +++ b/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 modelMap = new HashMap<>(); public static void initModelMap() { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/maintain/controller/MaintainRegionController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/maintain/controller/MaintainRegionController.java index 2b8dc15..aa13cdf 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/maintain/controller/MaintainRegionController.java +++ b/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); } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 5326032..f2e0480 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/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 diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 9c73418..78ce4ef 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/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"}) diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java index 52f3a58..ef65f2f 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java +++ b/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); }