|
|
|
@ -317,7 +317,6 @@ public class PageController { |
|
|
|
List<SimpleTaskP> list = getUserSimpleTaskP(userToken); |
|
|
|
mv.setViewName("pages/other/welcome"); |
|
|
|
mv.addObject("myTaskList", list); |
|
|
|
|
|
|
|
Map<String, Object> 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<SimpleTaskP> list = getUserSimpleTaskP(userToken); |
|
|
|
mv.addObject("myTaskList", list); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("begin", 0); |
|
|
|
map.put("size", 6); |
|
|
|
/** |
|
|
|
* 获取当天日期 |
|
|
|
*/ |
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
List<String> 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"); |
|
|
|
|
