From 5cdaaf00814c56cb42199b34f1aea3da1a8cd49d Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Tue, 12 May 2026 17:08:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=81=B5=E5=B7=9E=E7=9C=81=E4=BE=A7?=
 =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PatrolResultController.java    |  4 +-
 .../mapper/PatrolResultMapper.java            |  2 +
 .../service/IPatrolResultService.java         |  2 +
 .../service/impl/PatrolResultServiceImpl.java |  5 +++
 .../mapper/task/PatrolResultMapper.xml        | 42 +++++++++++++++++++
 5 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
index 4948e64..61f152e 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
@@ -1842,7 +1842,9 @@ public class PatrolResultController extends BaseController {
             basedataEqpBook.setAlgId(algId);
             new SimpleDateFormat("yyyyMMdd");
             basedataEqpBook.setType(null);
-            List<BasedataEqpBookMoMain> list = patrolResultService.selectBasedataEqpBookList(basedataEqpBook);
+//            List<BasedataEqpBookMoMain> list = patrolResultService.selectBasedataEqpBookList(basedataEqpBook);
+            List<BasedataEqpBookMoMain> list = patrolResultService.selectCamera(basedataEqpBook);
+            logger.info("--------getEqpBookListInfo new list size:{}!!!!!!", list.size());
             ArrayList items;
             if (null != list && !list.isEmpty()) {
                 items = new ArrayList<>();
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java
index 8711fe6..f8ae020 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java
@@ -38,6 +38,8 @@ public interface PatrolResultMapper {
 
     List<BasedataEqpBookMoMain> selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpBookMoMain);
 
+    List<BasedataEqpBookMoMain> selectCamera(BasedataEqpBookMoMain basedataEqpBook);
+
     List<PatrolResult> selectPatroByAllDev(PatrolResult patrolResult);
 
     List<PatrolResult> selectPatroByAllDevByMainIds(PatrolResult patrolResult);
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java
index 4b1e01a..ee14a13 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java
@@ -34,6 +34,8 @@ public interface IPatrolResultService {
 
     List<BasedataEqpBookMoMain> selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpbookMomain);
 
+    List<BasedataEqpBookMoMain> selectCamera(BasedataEqpBookMoMain basedataEqpBook);
+
     List<PatrolResult> selectPatroByAllDev(PatrolResult patrolResult);
 
     List<PatrolResult> selectPatroByAllDevByMainIds(PatrolResult patrolResult);
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
index b86ea2c..967906d 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
@@ -155,6 +155,11 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
         return patrolResultMapper.selectBasedataEqpBookList(patrolResult);
     }
 
+    @Override
+    public List<BasedataEqpBookMoMain> selectCamera(BasedataEqpBookMoMain basedataEqpBook) {
+        return patrolResultMapper.selectCamera(basedataEqpBook);
+    }
+
     public List<PatrolResult> selectPatroByAllDev(PatrolResult patrolResult) {
         return patrolResultMapper.selectPatroByAllDev(patrolResult);
     }
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 0f90ef8..d319d34 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
@@ -430,6 +430,48 @@
             <if test="password != null  and password != ''">and password = #{password}</if>
         </where>
     </select>
+
+    <select id="selectCamera" parameterType="com.inspect.system.base.openDomain.BasedataEqpBookMoMain"
+            resultMap="BasedataEqpBookResult">
+        SELECT
+        a.eqp_book_id,
+        a.station_name,
+        a.station_code,
+        a.area_id,
+        a.area_name,
+        b.channel_name AS patrol_device_name,
+        b.patrol_device_code,
+        b.up_system_device_code,
+        a.device_model,
+        a.manufacturer,
+        a.use_unit,
+        b.device_source,
+        a.production_date,
+        a.production_code,
+        a.is_transport,
+        ifnull(a.use_mode,b.use_mode) as use_mode,
+        ifnull(a.video_mode,b.video_mode) as video_mode,
+        a.place,
+        a.position_x,
+        a.position_y,
+        a.position_z,
+        a.type,
+        a.patrol_device_info,
+        a.robots_code,
+        b.HOST AS ip_addr,
+        b.PORT as port,
+        b.username AS user,
+        b.`password`,
+        a.main_system_code
+        from basedata_eqpbook a
+        left join basedata_eqpbook_channel b on a.eqp_book_id = b.eqp_book_id
+        where type in
+            <foreach item="algIda" collection="algId" open="(" separator="," close=")">
+                #{algIda}
+            </foreach>
+    </select>
+
+
     <select id="selectPatroByAllDev" parameterType="PatrolResult" resultMap="PatrolResultResult">
         select a.*,c.area_name from patrol_result a
         left JOIN basedata_patrolpoint b on a.device_id=b.patrol_point_id