From f4c832689ac771a1bd2eb42e6152dec7f742d308 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 7 Apr 2023 13:03:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 35 ++++++++++++++++++- .../resources/templates/index_mobile.html | 2 +- target/classes/templates/index_mobile.html | 2 +- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index b9c60de2..e516c46b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -317,7 +317,6 @@ public class PageController { List list = getUserSimpleTaskP(userToken); mv.setViewName("pages/other/welcome"); mv.addObject("myTaskList", list); - Map map = new HashMap<>(); map.put("begin", 0); map.put("size", 6); @@ -380,6 +379,40 @@ public class PageController { return mv; } + + + @GetMapping("/message") + public ModelAndView userMessage(HttpServletRequest request){ + ModelAndView mv = new ModelAndView(); + mv.setViewName("pages/message/message"); + String header = request.getHeader("user-agent"); + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + List list = getUserSimpleTaskP(userToken); + mv.addObject("myTaskList", list); + Map map = new HashMap<>(); + map.put("begin", 0); + map.put("size", 6); + /** + * 获取当天日期 + */ + Calendar instance = Calendar.getInstance(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + List days = new ArrayList<>(); + instance.add(Calendar.DATE, 1); + days.add(formatter.format(instance.getTime())); + instance.add(Calendar.DATE, -1); + days.add(formatter.format(instance.getTime())); + map.put("startDate", days.get(1)); + map.put("endDate", days.get(0)); + map.put("userAgent", Md5.crypt(header)); + mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken)); + return mv; + } + @GetMapping("/depository_add") public ModelAndView depository_add(HttpServletRequest request) { String token = request.getHeader("user-token"); diff --git a/src/main/resources/templates/index_mobile.html b/src/main/resources/templates/index_mobile.html index adde7dbf..6d9f9df4 100644 --- a/src/main/resources/templates/index_mobile.html +++ b/src/main/resources/templates/index_mobile.html @@ -139,7 +139,7 @@
- 消息 diff --git a/target/classes/templates/index_mobile.html b/target/classes/templates/index_mobile.html index adde7dbf..6d9f9df4 100644 --- a/target/classes/templates/index_mobile.html +++ b/target/classes/templates/index_mobile.html @@ -139,7 +139,7 @@
- 消息