From 27278845b93c317b668046052048fd5b8e4fdd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= <guocheng@xinying.com>
Date: Thu, 26 Sep 2024 11:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=BD=AE=E5=B7=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java
index 4e7ab51..1168ce7 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java
@@ -16,4 +16,7 @@ public class PageVo {
     @Min(value = 1, message = "分页大小最小为1")
     @ApiModelProperty(value = "分页大小", required = true, example = "1")
     private int pagesize;
+
+    @ApiModelProperty(value = "通道编号", example = "123455")
+    private Integer channelid;
 }
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java
index 16ea407..5b82e53 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java
@@ -2,6 +2,7 @@ package com.shxy.xymanager_dao.dao;
 
 import com.shxy.xymanager_common.entity.TerminalChannelMapper;
 import com.shxy.xymanager_common.entity.TerminalChannelMapperExample;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigInteger;
@@ -15,7 +16,7 @@ public interface TerminalChannelMapperDao {
 
     List<TerminalChannelMapper> selectAll();
 
-    List<TerminalChannelMapper> selectAllByPhotoTime(@Param("status") Integer status,@Param("list")List termlist);
+    List<TerminalChannelMapper> selectAllByPhotoTime(@Param("status") Integer status, @Param("list")List termlist , @Param("channelid") Integer channelid);
 
 
 
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml
index 199c8a7..6f4dea0 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml
@@ -297,6 +297,9 @@
                 a.id = #{item}
             </foreach>
         </if>
+        <if test="channelid != null and channelid &gt; 0">
+            and b.channel_id = #{channelid}
+        </if>
     </select>
 
     <select id="selectTermAndMapByTowerId" resultMap="BaseResultMap">
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 e849165..950c8e8 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
@@ -765,7 +765,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         int pageindex = vo.getPageindex();
         int pagesize = vo.getPagesize();
         PageUtils.SetPage(pageindex, pagesize);
-        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value(), termpList);
+        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value(), termpList , vo.getChannelid());
 
         ArrayList<BigInteger> photolist = new ArrayList<>();
         List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>();