From ec59f62a4928e738115f1788d7a6b6aaa5163cc5 Mon Sep 17 00:00:00 2001
From: huangfeng <beehuang74@hotmail.com>
Date: Fri, 7 Mar 2025 10:53:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20getPhotoList=E5=A2=9E=E5=8A=A0presetId?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java    | 2 ++
 .../main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java | 2 +-
 xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml  | 3 +++
 .../shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java  | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java
index ec20de4..55cb896 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java
@@ -49,4 +49,6 @@ public class TerminalPhotoSelectVo {
     @Min(value = 1, message = "分页大小最小为1")
     @ApiModelProperty(value = "分页大小", required = true, example = "1")
     private int pagesize;
+
+    private Integer presetId;
 }
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
index 21af9cc..d3862f8 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
@@ -18,7 +18,7 @@ public interface TerminalPhotoDao {
 
     List<TerminalPhoto> selectPhotoListByOrginIdAndTermList(@Param("list") List<TerminalImgAlarmsDto> list);
 
-    List<TerminalPhoto> selectPhotoListByTermList(@Param("terminalidlist") List<Integer> terminalid, @Param("channelidlist") List<Integer> channelid, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
+    List<TerminalPhoto> selectPhotoListByTermList(@Param("terminalidlist") List<Integer> terminalid, @Param("channelidlist") List<Integer> channelid, @Param("presetId") Integer presetId, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
 
 
     TerminalPhoto getLatestPhoto(@Param("termId") Integer termId);
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index a900d22..501981b 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -175,6 +175,9 @@
         #{item}
       </foreach>
     </if>
+    <if test="presetId != null">
+      and preset_id = #{presetId}
+    </if>
     order by photo_time desc
   </select>
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
index d68bfc5..0bcc17f 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
@@ -529,7 +529,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 channelidlist.add(channelid);
             }
             PageUtils.SetPage(pageindex, pagesize);
-            list = terminalPhotoDao.selectPhotoListByTermList(termidlist, channelidlist, BigInteger.valueOf(start), BigInteger.valueOf(end));
+            list = terminalPhotoDao.selectPhotoListByTermList(termidlist, channelidlist, vo.getPresetId(), BigInteger.valueOf(start), BigInteger.valueOf(end));
             boolean empty = CollectionUtil.isEmpty(list);
             if (empty) {
                 model.setList(new ArrayList<>());