feat: getPhotoList增加presetId查询参数

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

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

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>
 

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<>());