Browse Source

设备管理页相机状态,地图修复

master
WangGuangYuan 4 months ago
parent
commit
09ccb76894
2 changed files with 13 additions and 1 deletions
  1. +12
    -0
      inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java
  2. +1
    -1
      inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java

+ 12
- 0
inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java View File

@ -147,7 +147,13 @@ public class PatrolDeviceStatusSynTask {
for (int i = 0; i < patrolDeviceObjects.size(); ++i) {
JSONObject item = patrolDeviceObjects.getJSONObject(i);
String patrolDeviceCode = item.getString("patrolDeviceCode");
if (StringUtils.isEmpty(patrolDeviceCode)) {
patrolDeviceCode = item.getString("patroldeviceCode");
}
Long eqpBookId = item.getLongValue("eqpBookId");
if (eqpBookId == 0) {
eqpBookId = item.getLongValue("eqpbookId");
}
if (ivsDeviceStatusMap.containsKey(patrolDeviceCode)) {
boolean online = ivsDeviceStatusMap.get(patrolDeviceCode);
if (online) {
@ -172,7 +178,13 @@ public class PatrolDeviceStatusSynTask {
if (webSendFlag == 1) {
JSONObject item = patrolDeviceObjects.getJSONObject(0);
String patrolDeviceCode = item.getString("patrolDeviceCode");
if (StringUtils.isEmpty(patrolDeviceCode)) {
patrolDeviceCode = item.getString("patroldeviceCode");
}
Long eqpBookId = item.getLongValue("eqpBookId");
if (eqpBookId == 0) {
eqpBookId = item.getLongValue("eqpbookId");
}
JSONObject returnJsonObject = patrolDeviceMesHandle(patrolDeviceCode, null, eqpBookId, heart_beat_interval, heartBeatInterval, dateTimeNowFormat);
parseMessage(JSON.toJSONString(returnJsonObject));
}


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

@ -393,7 +393,7 @@ public class BasedataEqpBookController extends BaseController {
}
@GetMapping({"/downloadPicMap"})
public AjaxResult downloadPicMap(String patrolDeviceCode) throws IOException {
public AjaxResult downloadPicMap(@RequestParam("patroldeviceCode") String patrolDeviceCode) throws IOException {
BasedataEqpBook basedataEqpbook = this.basedataEqpBookService.selectBasedataEqpBookByPatrolDeviceCode(patrolDeviceCode);
Map map = new HashMap<>();
map.put("path", basedataEqpbook.getMapFilePath());


Loading…
Cancel
Save