fangcheng / regional-platform

Download as
Browse Code »

Commit 5eef04df1e56260dfcabc7e8b2a8c8cf1dcf5437

Authored by hujiaqi
1 parent 8c7774e88d
Exists in master and in 1 other branch nobuildprocess

出生医学证明暂时提交

Showing 4 changed files with 47 additions and 32 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java View file @ 5eef04d
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3 import com.lyms.platform.common.base.BaseController;
  4 +import com.lyms.platform.common.base.LoginContext;
4 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
5 6 import com.lyms.platform.common.enums.BCEnums;
6 7 import com.lyms.platform.common.result.BaseListResponse;
... ... @@ -8,6 +9,7 @@
8 9 import com.lyms.platform.common.utils.BeanUtils;
9 10 import com.lyms.platform.common.utils.DateUtil;
10 11 import com.lyms.platform.common.utils.ExcelUtil;
  12 +import com.lyms.platform.common.utils.ExceptionUtils;
11 13 import com.lyms.platform.operate.web.facade.BCTransferInFacade;
12 14 import com.lyms.platform.operate.web.request.BCTransferInCancelRequest;
13 15 import com.lyms.platform.operate.web.request.BCTransferInQueryRequest;
14 16  
... ... @@ -63,12 +65,9 @@
63 65 bcTransferInSaveRequest.setStartCode(startCode);
64 66 bcTransferInSaveRequest.setEndCode(endCode);
65 67  
66   - // TODO HuJiaqi-这里是自测使用的调试需要修改
67   - // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext");
68   - // Integer operatorId = loginContext.getId();
69   - Integer operatorId = 123456;
  68 + bcTransferInSaveRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
70 69  
71   - BCTransferInSaveResult bcTransferInSaveResult = bcTransferInFacade.save(bcTransferInSaveRequest, operatorId);
  70 + BCTransferInSaveResult bcTransferInSaveResult = bcTransferInFacade.save(bcTransferInSaveRequest);
72 71 if (bcTransferInSaveResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
73 72 baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInSaveResult.getErrorcode()).setErrormsg(bcTransferInSaveResult.getErrormsg());
74 73 return baseObjectResponse;
... ... @@ -76,7 +75,7 @@
76 75 baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInSaveResult.getErrorcode()).setErrormsg(bcTransferInSaveResult.getErrormsg()).setData(bcTransferInSaveResult);
77 76 } catch (Exception e) {
78 77 baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
79   - log.error("bc/transfer/in/save异常：" + e);
  78 + ExceptionUtils.catchException(e, "bc/transfer/in/save异常");
80 79 }
81 80 return baseObjectResponse;
82 81 }
83 82  
... ... @@ -95,12 +94,9 @@
95 94 BCTransferInCancelRequest bcTransferInCancelRequest = new BCTransferInCancelRequest();
96 95 bcTransferInCancelRequest.setId(id);
97 96  
98   - // TODO HuJiaqi-这里是自测使用的调试需要修改
99   - // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext");
100   - // Integer operatorId = loginContext.getId();
101   - Integer operatorId = 123456;
  97 + bcTransferInCancelRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
102 98  
103   - BCTransferInCancelResult bcTransferInCancelResult = bcTransferInFacade.cancel(bcTransferInCancelRequest, operatorId);
  99 + BCTransferInCancelResult bcTransferInCancelResult = bcTransferInFacade.cancel(bcTransferInCancelRequest);
104 100 if (bcTransferInCancelResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
105 101 baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInCancelResult.getErrorcode()).setErrormsg(bcTransferInCancelResult.getErrormsg());
106 102 return baseObjectResponse;
... ... @@ -108,7 +104,7 @@
108 104 baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInCancelResult.getErrorcode()).setErrormsg(bcTransferInCancelResult.getErrormsg()).setData(bcTransferInCancelResult);
109 105 } catch (Exception e) {
110 106 baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
111   - log.error("bc/transfer/in/cancel异常：" + e);
  107 + ExceptionUtils.catchException(e, "bc/transfer/in/cancel异常");
112 108 }
113 109 return baseObjectResponse;
114 110 }
... ... @@ -145,7 +141,7 @@
145 141 baseListResponse = new BaseListResponse().setErrorcode(bcTransferInQueryResult.getErrorcode()).setErrormsg(bcTransferInQueryResult.getErrormsg()).setData(bcTransferInQueryResult.getData()).setPageInfo(bcTransferInQueryResult.getPageInfo());
146 142 } catch (Exception e) {
147 143 baseListResponse = new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
148   - log.error("bc/transfer/in/query异常：" + e);
  144 + ExceptionUtils.catchException(e, "bc/transfer/in/query异常");
149 145 }
150 146 return baseListResponse;
151 147 }
... ... @@ -185,7 +181,7 @@
185 181 httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("证明入库（" + startDate + "至" + endDate + "）.xls").getBytes("UTF-8"), "ISO-8859-1"));
186 182 ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header);
187 183 } catch (Exception e) {
188   - log.error("bc/transfer/in/excel导出excel失败：" + e);
  184 + ExceptionUtils.catchException(e, "bc/transfer/in/excel异常");
189 185 }
190 186 }
191 187  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java View file @ 5eef04d
... ... @@ -50,19 +50,19 @@
50 50 * @createTime 2016年11月18日 15时02分
51 51 * @discription 新增入库
52 52 */
53   - public BCTransferInSaveResult save(BCTransferInSaveRequest bcTransferInSaveRequest, Integer operatorId) {
  53 + public BCTransferInSaveResult save(BCTransferInSaveRequest bcTransferInSaveRequest) {
54 54  
55 55 BCTransferInSaveResult bcTransferInSaveResult = new BCTransferInSaveResult();
56 56  
  57 + Integer operatorId = bcTransferInSaveRequest.getOperatorId();
  58 +
57 59 // TODO HuJiaqi-是否需要判断用户级别
58   - // Users users = usersService.getUsers(operatorId);
59   - // if (users == null) {
60   - // bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
61   - // bcTransferInSaveResult.setErrormsg("用户信息异常");
62   - // return bcTransferInSaveResult;
63   - // }
64   - Users users = new Users();
65   - users.setName("HuJiaqi");
  60 + Users users = usersService.getUsers(operatorId);
  61 + if (users == null) {
  62 + bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  63 + bcTransferInSaveResult.setErrormsg("用户信息异常");
  64 + return bcTransferInSaveResult;
  65 + }
66 66  
67 67 // 计算总量
68 68 Integer total = (int) (bcTransferInSaveRequest.getEndCode() - bcTransferInSaveRequest.getStartCode() + 1);
69 69  
70 70  
... ... @@ -104,19 +104,19 @@
104 104 return bcTransferInSaveResult;
105 105 }
106 106  
107   - public BCTransferInCancelResult cancel(BCTransferInCancelRequest bcTransferInCancelRequest, Integer operatorId) {
  107 + public BCTransferInCancelResult cancel(BCTransferInCancelRequest bcTransferInCancelRequest) {
108 108  
109 109 BCTransferInCancelResult bcTransferInCancelResult = new BCTransferInCancelResult();
110 110  
  111 + Integer operatorId = bcTransferInCancelRequest.getOperatorId();
  112 +
111 113 // TODO HuJiaqi-是否需要判断用户级别
112   - // Users users = usersService.getUsers(operatorId);
113   - // if (users == null) {
114   - // bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
115   - // bcTransferInSaveResult.setErrormsg("用户信息异常");
116   - // return bcTransferInSaveResult;
117   - // }
118   - Users users = new Users();
119   - users.setName("HuJiaqi");
  114 + Users users = usersService.getUsers(operatorId);
  115 + if (users == null) {
  116 + bcTransferInCancelResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  117 + bcTransferInCancelResult.setErrormsg("用户信息异常");
  118 + return bcTransferInCancelResult;
  119 + }
120 120  
121 121 // 1、查询这条历史记录
122 122 BCTransferInHistoryModel bcTransferInHistoryModel = bcTransferInHistoryService.findById(bcTransferInCancelRequest.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInCancelRequest.java View file @ 5eef04d
... ... @@ -17,12 +17,22 @@
17 17 */
18 18 private String id;
19 19  
  20 + private Integer operatorId;
  21 +
20 22 public String getId() {
21 23 return id;
22 24 }
23 25  
24 26 public void setId(String id) {
25 27 this.id = id;
  28 + }
  29 +
  30 + public Integer getOperatorId() {
  31 + return operatorId;
  32 + }
  33 +
  34 + public void setOperatorId(Integer operatorId) {
  35 + this.operatorId = operatorId;
26 36 }
27 37 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInSaveRequest.java View file @ 5eef04d
... ... @@ -31,6 +31,8 @@
31 31 */
32 32 private Long endCode;
33 33  
  34 + private Integer operatorId;
  35 +
34 36 public String getEnCode() {
35 37 return enCode;
36 38 }
... ... @@ -55,5 +57,12 @@
55 57 this.endCode = endCode;
56 58 }
57 59  
  60 + public Integer getOperatorId() {
  61 + return operatorId;
  62 + }
  63 +
  64 + public void setOperatorId(Integer operatorId) {
  65 + this.operatorId = operatorId;
  66 + }
58 67 }