feat:图片轮巡增加管道id查询

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java

@@ -9,6 +9,11 @@ import javax.validation.constraints.Min;
 @Data
 @ApiModel(value = "分页对象", description = "分页对象描述")
 public class PageVo {
+
+
+    @ApiModelProperty(value = "通道id", example = "12345")
+    private Integer channelId;
+
     @Min(value = 1, message = "分页位置最小从1开始")
     @ApiModelProperty(value = "分页位置从1开始", required = true, example = "1")
     private int pageindex;

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java

@@ -27,7 +27,7 @@ public interface TerminalChannelMapperDao {
     List<TerminalChannelMapper> selectAll();
 
 //    List<TerminalChannelMapper> selectAllByPhotoTime(@Param("time") BigInteger time);
-    List<TerminalChannelMapper> selectAllByPhotoTime(@Param("status") Integer status);
+    List<TerminalChannelMapper> selectAllByPhotoTime(@Param("status") Integer status , @Param("channelId") Integer channelId);
 
     int updateByPrimaryKeySelective(TerminalChannelMapper record);
 

xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml

@@ -50,6 +50,9 @@
         from (terminals a left join
         terminal_channel_mapper b on a.id = b.term_id)
         where a.status = #{status}
+        <if test="null != channelId and channelId &gt; 0">
+            and b.channel_id = #{channelId}
+        </if>
     </select>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         select

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -548,7 +548,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 //        DateTime dateTime = MyDateUtils.offsetDay(new Date(), -1);
 //        long l = MyDateUtils.TimeMillSecond2Second(dateTime);
 //        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(BigInteger.valueOf(l));
-        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value());
+        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value() , vo.getChannelId());
         ArrayList<BigInteger> photolist = new ArrayList<>();
         List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(list)) {