diff --git a/inspect-admin/src/main/resources/logback.xml b/inspect-admin/src/main/resources/logback.xml
index 7debc06..57a4ea3 100644
--- a/inspect-admin/src/main/resources/logback.xml
+++ b/inspect-admin/src/main/resources/logback.xml
@@ -62,7 +62,7 @@
-
+
diff --git a/inspect-gateway/src/main/resources/logback.xml b/inspect-gateway/src/main/resources/logback.xml
index 396a266..98412ce 100644
--- a/inspect-gateway/src/main/resources/logback.xml
+++ b/inspect-gateway/src/main/resources/logback.xml
@@ -62,7 +62,7 @@
-
+
diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java
index 0a837f3..5bf4882 100644
--- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java
+++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java
@@ -2,6 +2,7 @@ package com.inspect.ivs.service;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
import com.inspect.base.core.exception.ServiceException;
import com.inspect.base.redis.service.RedisService;
import com.inspect.ivs.base.feign.domain.IvsResult;
@@ -53,7 +54,7 @@ public class IvsCommonService {
}
public RequestBodySpec http(HttpMethod httpMethod, String uri) {
- log.info("-------------------------ivs address: " + getAddress().concat(uri));
+ log.info(Color.MAGENTA + "[IVS] ivs address: {} " + Color.END, getAddress().concat(uri));
return webClient.method(httpMethod).uri(getAddress().concat(uri));
}
diff --git a/inspect-ivs/src/main/resources/logback.xml b/inspect-ivs/src/main/resources/logback.xml
index 3252ed5..d149ead 100644
--- a/inspect-ivs/src/main/resources/logback.xml
+++ b/inspect-ivs/src/main/resources/logback.xml
@@ -62,7 +62,7 @@
-
+
diff --git a/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java b/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java
index cf51d70..98b9b82 100644
--- a/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java
+++ b/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.inspect.access.base.feign.AccessFeign;
import com.inspect.access.base.model.LoginModel;
import com.inspect.access.base.vo.OnlineStatsVo;
+import com.inspect.base.core.constant.Color;
import com.inspect.base.websocket.configure.WsPool;
import com.inspect.base.core.domain.Response;
import com.inspect.base.core.utils.DateUtils;
@@ -113,7 +114,7 @@ public class PatrolDeviceStatusSynTask {
try {
JSONObject jsonObject = this.ivsFeign.channelListJson(new JSONObject());
String resultCode = jsonObject.getString("resultCode");
- logger.info("synPatrolEqpOnlineStatusFromGwbMedia2 resultCode: {}", resultCode);
+ logger.info(Color.MAGENTA + "synPatrolEqpOnlineStatusFromGwbMedia2 resultCode: {}, result: {}" + Color.END, resultCode, jsonObject.toJSONString());
if (null != resultCode && resultCode.equals("0")) {
JSONObject cameraBriefInfosV2 = jsonObject.getJSONObject("cameraBriefInfosV2");
if (null != cameraBriefInfosV2) {
diff --git a/inspect-job/src/main/resources/logback.xml b/inspect-job/src/main/resources/logback.xml
index 1ec1319..306fd8a 100644
--- a/inspect-job/src/main/resources/logback.xml
+++ b/inspect-job/src/main/resources/logback.xml
@@ -31,7 +31,7 @@
- DEBUG
+ INFO
ACCEPT
@@ -62,7 +62,7 @@
-
+
diff --git a/inspect-main/inspect-main-start/src/main/resources/logback.xml b/inspect-main/inspect-main-start/src/main/resources/logback.xml
index 6c73192..e34f389 100644
--- a/inspect-main/inspect-main-start/src/main/resources/logback.xml
+++ b/inspect-main/inspect-main-start/src/main/resources/logback.xml
@@ -62,7 +62,7 @@
-
+
diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java
index b9ed9da..d9d9b2e 100644
--- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java
+++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java
@@ -57,12 +57,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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;
+import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@ApiIgnore
@@ -321,10 +316,53 @@ public class PatrolPresetPosController extends BaseController {
return this.getDataTable(list);
}
+// @GetMapping({"/listByEqIdAndChannelId"})
+// public AjaxResult queryListByEqIdAndChannelId(PtzModel ptzModel) throws Exception {
+// String patroldeviceCode = ptzModel.getPatrolDeviceCode();
+// String channelCode = ptzModel.getChannelCode();
+// List presetPoints = new ArrayList<>();
+// String params = "code=" + channelCode;
+// String result = HttpClientUtils.get(this.deviceUrl + AccessApiConstant.PTZ_LIST, params);
+// JSONObject ivsPresetInfo = JSONObject.parseObject(result);
+// String resultCode = ivsPresetInfo.getString("resultCode");
+// if (null != resultCode && resultCode.equals("0")) {
+// JSONObject ptzPresetInfoListJson = ivsPresetInfo.getJSONObject("ptzPresetInfoList");
+// JSONArray ptzPresetInfoArray = ptzPresetInfoListJson.getJSONArray("ptzPresetInfo");
+// if (!ptzPresetInfoArray.isEmpty()) {
+// for (Object ivspresetObject : ptzPresetInfoArray) {
+// JSONObject ivsPresetJson = (JSONObject) JSONObject.toJSON(ivspresetObject);
+// String presetIndex = ivsPresetJson.getString("presetIndex");
+// String presetName = ivsPresetJson.getString("presetName");
+// SysDictData sysDictData = SysDictData.builder().build();
+// sysDictData.setDictValue(presetIndex);
+// sysDictData.setDictLabel(presetName);
+// presetPoints.add(sysDictData);
+// }
+// }
+//
+// PatrolPresetRecord patrolPresetRecord = new PatrolPresetRecord();
+// patrolPresetRecord.setPatrolDeviceCode(patroldeviceCode);
+// patrolPresetRecord.setChannelCode(channelCode);
+// List patrolPresetRecords = this.patrolPresetRecordService.selectPatrolPresetRecordList(patrolPresetRecord);
+// presetPoints.forEach((item) -> {
+// patrolPresetRecords.forEach((presetPos) -> {
+// if (item.getDictValue().equals(presetPos.getPresetPosCode())) {
+// item.setCssClass(SELECT_PRESET_CODE_CLASS_BIND);
+// }
+//
+// });
+// });
+// return AjaxResult.success(presetPoints);
+// } else {
+// return AjaxResult.success(presetPoints);
+// }
+// }
+
@GetMapping({"/listByEqIdAndChannelId"})
- public AjaxResult queryListByEqIdAndChannelId(PtzModel ptzModel) throws Exception {
- String patroldeviceCode = ptzModel.getPatrolDeviceCode();
- String channelCode = ptzModel.getChannelCode();
+ public AjaxResult queryListByEqIdAndChannelId(
+ @RequestParam("patroldeviceCode") String patrolDeviceCode,
+ @RequestParam("channelCode") String channelCode
+ ) throws Exception {
List presetPoints = new ArrayList<>();
String params = "code=" + channelCode;
String result = HttpClientUtils.get(this.deviceUrl + AccessApiConstant.PTZ_LIST, params);
@@ -346,7 +384,7 @@ public class PatrolPresetPosController extends BaseController {
}
PatrolPresetRecord patrolPresetRecord = new PatrolPresetRecord();
- patrolPresetRecord.setPatrolDeviceCode(patroldeviceCode);
+ patrolPresetRecord.setPatrolDeviceCode(patrolDeviceCode);
patrolPresetRecord.setChannelCode(channelCode);
List patrolPresetRecords = this.patrolPresetRecordService.selectPatrolPresetRecordList(patrolPresetRecord);
presetPoints.forEach((item) -> {
diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/VideoController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/VideoController.java
index 647651a..efd623a 100644
--- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/VideoController.java
+++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/VideoController.java
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -32,14 +33,33 @@ public class VideoController extends BaseController {
this.video2NvrComponent = video2NvrComponent;
}
+// @Log(
+// title = "开启视频监控",
+// businessType = BizType.OTHER
+// )
+// @GetMapping({"/realtime"})
+// public AjaxResult realtime(RealTimeModel realTimeModel) throws Exception {
+// log.info("[VIDEO] realtime:{}", JSONObject.toJSONString(realTimeModel));
+// realTimeModel.setSerial(this.video2NvrComponent.toNvrCode(realTimeModel.getPatrolDeviceCode()));
+// String params = JsonUtil.json2Str(JSONObject.parseObject(JSONObject.toJSONString(realTimeModel)));
+// log.info("[VIDEO] realtime params:{}", params);
+// String result = HttpClientUtils.get(this.deviceUrl + AccessApiConstant.REALTIME, params);
+// return AjaxResult.success(JSONObject.parseObject(result));
+// }
+
@Log(
title = "开启视频监控",
businessType = BizType.OTHER
)
@GetMapping({"/realtime"})
- public AjaxResult realtime(RealTimeModel realTimeModel) throws Exception {
+ public AjaxResult realtime(
+ @RequestParam("patroldeviceCode") String patrolDeviceCode,
+ @RequestParam("channelCode") String channelCode) throws Exception {
+ RealTimeModel realTimeModel = new RealTimeModel();
+ realTimeModel.setPatrolDeviceCode(patrolDeviceCode);
+ realTimeModel.setChannelCode(channelCode);
log.info("[VIDEO] realtime:{}", JSONObject.toJSONString(realTimeModel));
- realTimeModel.setSerial(this.video2NvrComponent.toNvrCode(realTimeModel.getPatrolDeviceCode()));
+ realTimeModel.setSerial(video2NvrComponent.toNvrCode(realTimeModel.getPatrolDeviceCode()));
String params = JsonUtil.json2Str(JSONObject.parseObject(JSONObject.toJSONString(realTimeModel)));
log.info("[VIDEO] realtime params:{}", params);
String result = HttpClientUtils.get(this.deviceUrl + AccessApiConstant.REALTIME, params);
diff --git a/inspect-management/src/main/resources/logback.xml b/inspect-management/src/main/resources/logback.xml
index 42ff2f6..5aed3c9 100644
--- a/inspect-management/src/main/resources/logback.xml
+++ b/inspect-management/src/main/resources/logback.xml
@@ -62,7 +62,7 @@
-
+
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 e3eff14..b5f4a60 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
@@ -61,13 +61,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@RestController
@@ -333,12 +327,26 @@ public class BasedataEqpBookController extends BaseController {
}
@GetMapping({"/getAreaEqubookTreeSelectForFilter"})
- public AjaxResult getAreaEquBookTreeSelectForFilter(BasedataEqpBookTreeQueryFilterVo queryFilterVo) {
- logger.info("[QINYL] queryFilterVo: {}", queryFilterVo.toString());
+ public AjaxResult getAreaEquBookTreeSelectForFilter(
+ @RequestParam("patroldeviceName") String patrolDeviceName,
+ @RequestParam("onlineStatus") String onlineStatus,
+ @RequestParam("patroldeviceTypeFlag") String patrolDeviceTypeFlag) {
+ BasedataEqpBookTreeQueryFilterVo queryFilterVo = new BasedataEqpBookTreeQueryFilterVo();
+ queryFilterVo.setPatrolDeviceCode(patrolDeviceName);
+ queryFilterVo.setOnlineStatus(onlineStatus);
+ queryFilterVo.setPatrolDeviceTypeFlag(patrolDeviceTypeFlag);
+ logger.info("[METADATA] filterVo: {}", queryFilterVo);
List treeVoList = this.basedataEqpBookService.selectBasedataEqpbookOnlineList(queryFilterVo);
return AjaxResult.success(treeVoList);
}
+// @GetMapping({"/getAreaEqubookTreeSelectForFilter"})
+// public AjaxResult getAreaEquBookTreeSelectForFilter(BasedataEqpBookTreeQueryFilterVo queryFilterVo) {
+// logger.info("[METADATA] queryFilterVo: {}", queryFilterVo.toString());
+// List treeVoList = this.basedataEqpBookService.selectBasedataEqpbookOnlineList(queryFilterVo);
+// return AjaxResult.success(treeVoList);
+// }
+
@GetMapping({"/checkPatrolDeviceIsExist/{patrolDeviceCode}"})
public AjaxResult checkPatrolDeviceIsExist(@PathVariable("patrolDeviceCode") String patrolDeviceCode) {
BasedataEqpBook basedataEqpbook = new BasedataEqpBook();
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/vo/BasedataAreaEquTreeVo.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/vo/BasedataAreaEquTreeVo.java
index 6f70e0d..9e4a7f0 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/vo/BasedataAreaEquTreeVo.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/vo/BasedataAreaEquTreeVo.java
@@ -2,6 +2,7 @@ package com.inspect.metadata.eqpbook.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
@@ -19,11 +20,17 @@ public class BasedataAreaEquTreeVo implements Serializable {
private String areaName;
private String areaFlag;
private String areaType;
+ @JsonProperty("eqpbookId")
private Long eqpBookId;
+ @JsonProperty("patroldeviceFlag")
private String patrolDeviceFlag;
+ @JsonProperty("patroldeviceCode")
private String patrolDeviceCode;
+ @JsonProperty("patroldeviceName")
private String patrolDeviceName;
+ @JsonProperty("patroldeviceType")
private String patrolDeviceType;
+ @JsonProperty("patroldeviceOnlineStatus")
private String patrolDeviceOnlineStatus;
private Long channelId;
private String channelCode;
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/service/impl/BasedataEqpBookServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/service/impl/BasedataEqpBookServiceImpl.java
index d9df4ae..a5fefee 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/service/impl/BasedataEqpBookServiceImpl.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/service/impl/BasedataEqpBookServiceImpl.java
@@ -196,15 +196,15 @@ public class BasedataEqpBookServiceImpl implements IBasedataEqpBookService {
BasedataEqpBook basedataEqpBookQuery = new BasedataEqpBook();
Map params = new HashMap<>();
if (null != patroldeviceTyepFlag && patroldeviceTyepFlag.equals("nvr")) {
- params.put("patroldeviceTypeFlag", "nvr");
+ params.put("patrolDeviceTypeFlag", "nvr");
}
if (null != patroldeviceTyepFlag && patroldeviceTyepFlag.equals("ipc")) {
- params.put("patroldeviceTypeFlag", "ipc");
+ params.put("patrolDeviceTypeFlag", "ipc");
}
if (null != patroldeviceTyepFlag && patroldeviceTyepFlag.equals("robotAndUav")) {
- params.put("patroldeviceTypeFlag", "robotAndUav");
+ params.put("patrolDeviceTypeFlag", "robotAndUav");
}
basedataEqpBookQuery.setParams(params);
diff --git a/inspect-metadata/src/main/resources/logback.xml b/inspect-metadata/src/main/resources/logback.xml
index beae091..b676773 100644
--- a/inspect-metadata/src/main/resources/logback.xml
+++ b/inspect-metadata/src/main/resources/logback.xml
@@ -62,7 +62,7 @@
-
+
diff --git a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml
index ab52807..9ea7c91 100644
--- a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml
@@ -137,17 +137,17 @@
and map_file_path = #{mapFilePath}
and video_nvr_code = #{videoNvrCode}
-
+
and type = '11'
-
+
and type != '11' and type != '20' or type is null
-
+
and type in ('1','2','3','13')