From 4d3f65bc60bd2317582ea3b8710732bfeac51ad5 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Tue, 18 Mar 2025 13:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=AD=A6=E6=B1=89=E7=8E=B0=E5=9C=BA=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=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 | 14 ++++++++++++++ .../controller/BasedataEqpBookController.java | 18 ++++++++++++++++++ .../metadata/eqpbook/task/FeignTaskClient.java | 13 +++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/task/FeignTaskClient.java 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 2b3c15c..2b75abd 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 @@ -214,6 +214,20 @@ public class ClientService { throw new ServiceException("巡视主机唯一标识未查询到"); } jsonObject.put("SendCode", iipCode); + + // 临时处理同步无人机点位数据 + try { + 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())); + logger.info("--------------[CLIENT] 无人机点位同步jsonObject: {}", 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("机器人巡视系统唯一标识未查询到"); 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 b5f4a60..0038643 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 @@ -2,6 +2,7 @@ package com.inspect.metadata.eqpbook.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.inspect.base.core.utils.ServletUtils; import com.inspect.metadata.alg.domain.BasedataAlgSubtype; import com.inspect.metadata.alg.service.IBasedataAlgSubtypeService; import com.inspect.metadata.area.domain.BaseDataArea; @@ -18,6 +19,7 @@ import com.inspect.metadata.eqpbook.domain.vo.resultList; import com.inspect.metadata.eqpbook.domain.vo.results; import com.inspect.metadata.eqpbook.service.IBasedataEqpBookChannelService; import com.inspect.metadata.eqpbook.service.IBasedataEqpBookService; +import com.inspect.metadata.eqpbook.task.FeignTaskClient; import com.inspect.metadata.montdata.domain.BasedataMontPatDevStaData; import com.inspect.metadata.mqutil.FeignMsgClient; import com.inspect.metadata.patrolpointmnt.domain.BasedataPatrolPoint; @@ -89,9 +91,25 @@ public class BasedataEqpBookController extends BaseController { private IBasedataPatrolPointService basedataPatrolPointService; @Autowired private IBasedataThresholdModificationService basedataThresholdModificationService; + @Autowired + private FeignTaskClient feignTaskClient; @GetMapping({"/list"}) public TableDataInfo list(BasedataEqpBook basedataEqpbook) { + String patroldeviceCode = ServletUtils.getParameter("patroldeviceCode"); + if (StringUtils.isNotEmpty(patroldeviceCode)) { + basedataEqpbook.setPatrolDeviceCode(patroldeviceCode); + } + logger.info("---------------list-----------basedataEqpbook:{}", basedataEqpbook); + if (basedataEqpbook != null && "sync:Client05".equals(basedataEqpbook.getPatrolDeviceCode())) { + // 和无人机同步点位 + String patrolDeviceCode = basedataEqpbook.getPatrolDeviceCode(); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("Type", "61"); + jsonObject.put("ReceiveCode", StringUtils.split(patrolDeviceCode, ":")[1]); + String msg = jsonObject.toJSONString(); + feignTaskClient.sendCommand(msg); + } this.startPage(); List list = this.basedataEqpBookService.selectBasedataEqpBookList(basedataEqpbook); return this.getDataTable(list); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/task/FeignTaskClient.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/task/FeignTaskClient.java new file mode 100644 index 0000000..27c0f8e --- /dev/null +++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/task/FeignTaskClient.java @@ -0,0 +1,13 @@ +package com.inspect.metadata.eqpbook.task; + +import com.inspect.base.core.web.domain.AjaxResult; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient("inspect-main") +public interface FeignTaskClient { + + @PostMapping({"/client/sendCommand"}) + AjaxResult sendCommand(@RequestBody String msg); +}