Browse Source

修改退出方法

lwx_dev
erdanergou 3 years ago
parent
commit
9a018f36f8
  1. 10
      src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java
  2. 4
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 6
      src/main/java/com/dreamchaser/depository_manage/controller/UserController.java

10
src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java

@ -122,4 +122,14 @@ public class NoticeController {
}
}
@PostMapping("/noticeInfo")
public RestResponse noticeInfo(@RequestBody Map< String,Object> map){
if(map.containsKey("id")){
NoticeP notice = noticeService.findNoticeById(ObjectFormatUtil.toInteger(map.get("id")));
return new RestResponse(notice);
}else{
throw new MyException("缺少必要参数");
}
}
}

4
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -339,6 +339,9 @@ public class PageController {
}
mv.addObject("depositoryCount", depositoryIdList.size());
Integer inventoryCountByDepository = materialService.findInventoryCountByDepository(depositoryIdList);
if(inventoryCountByDepository == null){
inventoryCountByDepository = 0;
}
mv.addObject("allPrice",(int)(inventoryCountByDepository / 100));
mv.addObject("allMaterial", materialService.findMaterialCount(new HashMap<>()));
/**
@ -2950,6 +2953,7 @@ public class PageController {
ModelAndView mv = new ModelAndView();
mv.setViewName("pages/notice/notice-view");
NoticeP noticeById = noticeService.findNoticeById(id);
String token = request.getHeader("user-token");
if (token == null) {

6
src/main/java/com/dreamchaser/depository_manage/controller/UserController.java

@ -538,7 +538,11 @@ public class UserController {
@PostMapping("/accountLook")
public RestResponse accountLook(HttpServletRequest request) {
Object userToken = request.getAttribute("userToken");
String token = request.getHeader("user-token");
if (token == null) {
token = (String) request.getSession().getAttribute("userToken");
}
UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
return new RestResponse(userToken);
}

Loading…
Cancel
Save