diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index 677fb87..ab19cc6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -16,6 +16,6 @@ public interface BizMessageMapper extends BaseMapper { Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId); - List findMessageVoList(BizMessageVo vo); + IPage findMessageVoList(@Param("param") IPage page,BizMessageVo vo); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index da79a91..99b262e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -19,13 +19,13 @@ \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java index e63151b..b15db1b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -8,6 +8,7 @@ public class BizMessageVo extends BizMessage{ private String authorizestate; private String templatetype; private String userId; - private Integer datanum; + private Long datanum; + private Integer size; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java index b415eda..10b0df8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java @@ -104,12 +104,21 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService */ @Override public List selectMsgListByType(BizMessageVo vo) { - + vo.setSize(vo.getSize()!=null?vo.getSize():5); vo.setUserId(service.getCacheUser().getUserId()); if(vo.getAuthorizestate()==null||"".equals(vo.getAuthorizestate())){ vo.setAuthorizestate("0"); } - List list = mapper.findMessageVoList(vo); + PageDTO page = new PageDTO(); + page.setPageSize(vo.getSize()); + + IPage pageEntity = mapper.findMessageVoList(new Page(page.getPageNo(), page.getPageSize()),vo); + + List list = pageEntity.getRecords(); + + list.forEach(l->{ + l.setDatanum(pageEntity.getCurrent()); + }); return list; }