From e8d41d34f2f453fde69cb09604f741122c565bb2 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Thu, 20 Mar 2025 10:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=90=8C=E6=AD=A5=E7=82=B9=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/client/service/ClientService.java | 59 ++++++++++--------- .../controller/BasedataEqpBookController.java | 4 +- 2 files changed, 34 insertions(+), 29 deletions(-) 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 2b75abd..ad7bced 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 @@ -204,9 +204,6 @@ public class ClientService { if (StringUtils.isNotBlank(stationNo)) { jsonObject.put("Code", stationNo); jsonObject.put("Command", 1); - if(stationNo.equals("2")) {//武汉站固定编码为2,和许继边缘节点通信,模型同步Command为4 - jsonObject.put("Command", 4); - } } String iipCode = statisticsMapper.queryIICSystemCode(); @@ -215,40 +212,48 @@ public class ClientService { } jsonObject.put("SendCode", iipCode); - // 临时处理同步无人机点位数据 + // 武汉电站同步点位数据 try { - if (StringUtils.isNotEmpty(jsonObject.getString("ReceiveCode")) && jsonObject.getString("ReceiveCode").equals("Client05")) { + if (StringUtils.isNotEmpty(jsonObject.getString("ReceiveCode")) && jsonObject.getString("ReceiveCode").equals("areaPatrolServer")) { + logger.info("[CLIENT] 许继ReceiveCode: {}, lowMsgUrl: {}", jsonObject.getString("ReceiveCode"), lowMsgUrl); + jsonObject.computeIfAbsent("Time", k -> DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date())); + jsonObject.put("Command", "4"); + jsonObject.put("ReceiveCode", "areaPatrolServer"); + logger.info("--------------[CLIENT] 许继点位同步jsonObject: {}", jsonObject.toJSONString()); + } else if (StringUtils.isNotEmpty(jsonObject.getString("ReceiveCode")) && jsonObject.getString("ReceiveCode").equals("Client05")) { logger.info("[CLIENT] 无人机ReceiveCode: {}, lowMsgUrl: {}", jsonObject.getString("ReceiveCode"), lowMsgUrl); jsonObject.computeIfAbsent("Time", k -> DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date())); + jsonObject.put("Command", "1"); + jsonObject.put("ReceiveCode", "Client05"); logger.info("--------------[CLIENT] 无人机点位同步jsonObject: {}", jsonObject.toJSONString()); - return CallDeviceApi.callDevice(lowMsgUrl, jsonObject.toJSONString()); } + return CallDeviceApi.callDevice(lowMsgUrl, jsonObject.toJSONString()); } catch (Exception e) { throw new ServiceException("Call " + lowMsgUrl + " Exception!"); } - String robotSystemCode = statisticsMapper.queryRobotSystemCode(); - if (StringUtils.isBlank(robotSystemCode)) { - logger.error("机器人巡视系统唯一标识未查询到"); - robotSystemCode = ""; - } - - jsonObject.put("ReceiveCode", robotSystemCode); - String nestSystemCode = statisticsMapper.queryNestSystemCode(); - if (StringUtils.isBlank(nestSystemCode)) { - throw new ServiceException("机器人巡视系统唯一标识未查询到"); - } else { - try { - logger.info("[CLIENT] nestSystemCode: {}, lowMsgUrl: {}", nestSystemCode, lowMsgUrl); - jsonObject.put("ReceiveCode", nestSystemCode); - jsonObject.computeIfAbsent("Time", k -> DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date())); - - return CallDeviceApi.callDevice(lowMsgUrl, jsonObject.toJSONString()); - } catch (Exception e) { - throw new ServiceException("Call " + lowMsgUrl + " Exception!"); - } - } +// String robotSystemCode = statisticsMapper.queryRobotSystemCode(); +// if (StringUtils.isBlank(robotSystemCode)) { +// logger.error("机器人巡视系统唯一标识未查询到"); +// robotSystemCode = ""; +// } +// +// jsonObject.put("ReceiveCode", robotSystemCode); +// String nestSystemCode = statisticsMapper.queryNestSystemCode(); +// if (StringUtils.isBlank(nestSystemCode)) { +// throw new ServiceException("机器人巡视系统唯一标识未查询到"); +// } else { +// try { +// logger.info("[CLIENT] nestSystemCode: {}, lowMsgUrl: {}", nestSystemCode, lowMsgUrl); +// jsonObject.put("ReceiveCode", nestSystemCode); +// jsonObject.computeIfAbsent("Time", k -> DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date())); +// +// return CallDeviceApi.callDevice(lowMsgUrl, jsonObject.toJSONString()); +// } catch (Exception e) { +// throw new ServiceException("Call " + lowMsgUrl + " Exception!"); +// } +// } } else { try { return CallDeviceApi.callDevice(lowMsgUrl, msg); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java index 0038643..72c8696 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java @@ -101,8 +101,8 @@ public class BasedataEqpBookController extends BaseController { basedataEqpbook.setPatrolDeviceCode(patroldeviceCode); } logger.info("---------------list-----------basedataEqpbook:{}", basedataEqpbook); - if (basedataEqpbook != null && "sync:Client05".equals(basedataEqpbook.getPatrolDeviceCode())) { - // 和无人机同步点位 + if (basedataEqpbook != null && ("sync:areaPatrolServer".equals(basedataEqpbook.getPatrolDeviceCode()) || "sync:Client05".equals(basedataEqpbook.getPatrolDeviceCode()))) { + // 和许继，无人机同步点位 String patrolDeviceCode = basedataEqpbook.getPatrolDeviceCode(); JSONObject jsonObject = new JSONObject(); jsonObject.put("Type", "61");