diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
index 671d0af..37b7ddd 100644
--- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
+++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
@@ -419,7 +419,8 @@ public class JobMainTask {
try {
log.info(Color.CYAN + "[JOB] *********************chanType: {}, patrolPointId: {}" + Color.END, chanType, presetPos.getPatrolPointId());
if ("vl".equals(chanType)) {
- String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true&code=" + presetPos.getChannelCode();
+ //String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true&code=" + presetPos.getChannelCode();
+ String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true";
String paramFileName = taskPatrolId.split(StringUtils.UNDERLINE)[1] + StringUtils.UNDERLINE
+ taskPatrolId.split(StringUtils.UNDERLINE)[2] + StringUtils.UNDERLINE
+ presetPos.getPatrolPointId() + StringUtils.UNDERLINE
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java
index 5249e03..e014a63 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java
@@ -36,4 +36,5 @@ public class InspectionPointResultVo {
String alarmType;
String content;
String resultType;
+ String valid;
}
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
index 7c1108b..8547216 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
@@ -983,6 +983,7 @@
+
@@ -1004,7 +1005,8 @@
pr.file_path base_file_path,
pr.rectangle,
ra.result_type,
- ra.description content
+ ra.description content,
+ pr.valid valid
FROM patrol_result pr
LEFT JOIN result_analysis ra on pr.line_id = ra.business_id
LEFT JOIN basedata_patrolpoint bp ON pr.device_id = bp.patrol_point_id
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 e574f66..b2d1dfa 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
@@ -156,13 +156,12 @@ public class PatrolPresetPosController extends BaseController {
@GetMapping({"/camera/{channelType}"})
public AjaxResult findCameraByChannelType(@PathVariable("channelType") String channelType) {
List list = patrolPresetPosService.selectCameraByChannelType(channelType);
- JSONArray jsonArray = JSONObject.parseObject(JSONObject.toJSONString(basedataAreaService.list(new JSONObject()))).getJSONArray("data");
-
+ JSONArray jsonArray =
+ JSONObject.parseObject(JSONObject.toJSONString(basedataAreaService.list(new JSONObject()))).getJSONArray("data");
for (int i = 0; i < jsonArray.size(); ++i) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
jsonObject.put("id", jsonObject.getString("areaId"));
jsonObject.put("name", jsonObject.getString("areaName"));
-
for (int j = 0; j < list.size(); ++j) {
CameraVo cameraVo = list.get(j);
if (jsonObject.getString("areaId").equals(cameraVo.getAreaId())) {
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java
index 9fd6075..78bd578 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java
@@ -47,6 +47,9 @@ public class BasedataPatrolPointPresetController extends BaseController {
try {
this.startPage();
List list = this.basedataPatrolPointPresetService.selectBasedataPatrolPointPresetList(basedataPatrolPointPreset);
+ if(list == null) {
+ return this.getDataTable(new ArrayList<>());
+ }
List basedataEqpBooks = this.basedataEqpBookService.selectBasedataEqpBookList(new BasedataEqpBook());
Map eqpbookMap = new HashMap<>();
basedataEqpBooks.forEach((item) -> {