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..a1fd86c 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 @@ -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; 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 1f2a484..11691de 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 @@ -27,7 +27,7 @@ public interface TerminalChannelMapperDao { List selectAll(); // List selectAllByPhotoTime(@Param("time") BigInteger time); - List selectAllByPhotoTime(@Param("status") Integer status); + List selectAllByPhotoTime(@Param("status") Integer status , @Param("channelId") Integer channelId); int updateByPrimaryKeySelective(TerminalChannelMapper record); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml index a33b6e5..6fd9891 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml +++ b/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} + + and b.channel_id = #{channelId} +