From a4080268cca54be0629269b71c4ebf411c913dec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 16:55:21 +0800
Subject: [PATCH] 修改bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java | 4 +++-
guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/enums/ImageModelEnum.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/enums/ImageModelEnum.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/enums/ImageModelEnum.java
index 9c92bd2..ba47965 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/enums/ImageModelEnum.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/enums/ImageModelEnum.java
@@ -7,7 +7,7 @@
*/
public enum ImageModelEnum {
TOP_SEAL("顶盖密闭巡查", "TOP_SEAL"),
- CAMERA_FAULT("摄像头图章巡查", "CAMERA_FAULT"),
+ CAMERA_FAULT("摄像头故障巡查", "CAMERA_FAULT"),
CONSTRUCTION_WASTE_LOAD("建筑垃圾装载巡查", "CONSTRUCTION_WASTE_LOAD")
;
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
index 6316a59..2dc721d 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
@@ -223,7 +223,9 @@
}
List<TaskDetailVehicles> taskDetailVehiclesList = taskDetailVehiclesService.selectList(wrapper);
List<Integer> collect = taskDetailVehiclesList.stream().map(TaskDetailVehicles::getId).collect(Collectors.toList());
-
+ if(collect.size() > 0){
+ collect.add(-1);
+ }
List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus());
for (PictureDetails pictureDetail : pictureDetails) {
String videoChannel = pictureDetail.getVideoChannel();
--
Gitblit v1.7.1