diff --git a/mainData/src/main/resources/mainOrm/YmNotifications.xml b/mainData/src/main/resources/mainOrm/YmNotifications.xml index 601de8f..2ce9feb 100644 --- a/mainData/src/main/resources/mainOrm/YmNotifications.xml +++ b/mainData/src/main/resources/mainOrm/YmNotifications.xml @@ -82,7 +82,7 @@ and type = #{type,jdbcType=INTEGER} and content = #{content,jdbcType=VARCHAR} -and created = #{created,jdbcType=TIMESTAMP} +and created >= #{created,jdbcType=TIMESTAMP} and yn = #{yn,jdbcType=INTEGER} diff --git a/mainData/src/main/resources/mainOrm/YmPushMessages.xml b/mainData/src/main/resources/mainOrm/YmPushMessages.xml index 8beab04..770b869 100644 --- a/mainData/src/main/resources/mainOrm/YmPushMessages.xml +++ b/mainData/src/main/resources/mainOrm/YmPushMessages.xml @@ -74,7 +74,7 @@ and id = #{id,jdbcType=INTEGER} and content = #{content,jdbcType=VARCHAR} -and created = #{created,jdbcType=TIMESTAMP} +and created >= #{created,jdbcType=TIMESTAMP} and reception_id = #{receptionId,jdbcType=INTEGER} diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java index 18d5b71..e9112af 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java @@ -44,15 +44,14 @@ public class NotificationsController extends BaseController{ @RequestMapping(value = "/notifications", method = RequestMethod.GET) @TokenRequired public void getNotifications(HttpServletResponse response, - HttpServletRequest request -// , @RequestParam(value = "time",required = false) long time - ){ + HttpServletRequest request, + @RequestParam("time") long time){ //系统消息 YmNotificationsQuery notificationsQuery = new YmNotificationsQuery(); notificationsQuery.setYn(YnEnum.yes.getId()); notificationsQuery.setSort("created desc"); -// notificationsQuery.setCreated(new Date(time*1000)); + notificationsQuery.setCreated(new Date(time*1000)); List notificationsList = notificationsService.queryYmNotifications(notificationsQuery); List list = new ArrayList<>(); @@ -69,8 +68,8 @@ public class NotificationsController extends BaseController{ } //接种通知 - List inculateList = getInculateList(request); -// List inculateList = getInculateList(request,time); +// List inculateList = getInculateList(request); + List inculateList = getInculateList(request,time); if (CollectionUtils.isNotEmpty(inculateList)){ list.addAll(inculateList); } @@ -96,7 +95,7 @@ public class NotificationsController extends BaseController{ ResultUtils.buildSuccessResultAndWrite(response,list); } - private List getInculateList(HttpServletRequest request) { + private List getInculateList(HttpServletRequest request,long time) { List dataList = new ArrayList<>(); LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); @@ -104,7 +103,7 @@ public class NotificationsController extends BaseController{ YmPushMessagesQuery query = new YmPushMessagesQuery(); query.setYn(YnEnum.yes.getId()); query.setReceptionId(loginContext.getId()); -// query.setCreated(new Date(time * 1000)); + query.setCreated(new Date(time * 1000)); List messagesList = ymPushMessagesService.queryYmPushMessages(query); if (CollectionUtils.isNotEmpty(messagesList)){ for (YmPushMessages data : messagesList){