Browse Source

临时代码,武汉现场无人机同步点位

master
WangGuangYuan 9 months ago
parent
commit
4d3f65bc60
3 changed files with 45 additions and 0 deletions
  1. +14
    -0
      inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java
  2. +18
    -0
      inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java
  3. +13
    -0
      inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/task/FeignTaskClient.java

+ 14
- 0
inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java View File

@ -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("机器人巡视系统唯一标识未查询到");


+ 18
- 0
inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java View File

@ -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<BasedataEqpBook> list = this.basedataEqpBookService.selectBasedataEqpBookList(basedataEqpbook);
return this.getDataTable(list);


+ 13
- 0
inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/task/FeignTaskClient.java View File

@ -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);
}

Loading…
Cancel
Save