Merge remote-tracking branch 'origin/master'

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

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

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -983,6 +983,7 @@
         <result property="alarmLevel" column="alarm_level"/>
         <result property="alarmType" column="alarm_type"/>
         <result property="content" column="content"/>
+        <result property="vaild" column="vaild"/>
         <result property="resultType" column="result_type"/>
 
     </resultMap>
@@ -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

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<CameraVo> 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())) {

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<BasedataPatrolPointPreset> list = this.basedataPatrolPointPresetService.selectBasedataPatrolPointPresetList(basedataPatrolPointPreset);
+            if(list == null) {
+                return this.getDataTable(new ArrayList<>());
+            }
             List<BasedataEqpBook> basedataEqpBooks = this.basedataEqpBookService.selectBasedataEqpBookList(new BasedataEqpBook());
             Map<Long, BasedataEqpBook> eqpbookMap = new HashMap<>();
             basedataEqpBooks.forEach((item) -> {