diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java index 7d929b3..4554922 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.BCEnums; import com.lyms.platform.common.result.BaseListResponse; @@ -8,6 +9,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExcelUtil; +import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.operate.web.facade.BCTransferInFacade; import com.lyms.platform.operate.web.request.BCTransferInCancelRequest; import com.lyms.platform.operate.web.request.BCTransferInQueryRequest; @@ -63,12 +65,9 @@ public class BCTransferInController extends BaseController { bcTransferInSaveRequest.setStartCode(startCode); bcTransferInSaveRequest.setEndCode(endCode); - // TODO HuJiaqi-这里是自测使用的调试需要修改 - // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext"); - // Integer operatorId = loginContext.getId(); - Integer operatorId = 123456; + bcTransferInSaveRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); - BCTransferInSaveResult bcTransferInSaveResult = bcTransferInFacade.save(bcTransferInSaveRequest, operatorId); + BCTransferInSaveResult bcTransferInSaveResult = bcTransferInFacade.save(bcTransferInSaveRequest); if (bcTransferInSaveResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInSaveResult.getErrorcode()).setErrormsg(bcTransferInSaveResult.getErrormsg()); return baseObjectResponse; @@ -76,7 +75,7 @@ public class BCTransferInController extends BaseController { baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInSaveResult.getErrorcode()).setErrormsg(bcTransferInSaveResult.getErrormsg()).setData(bcTransferInSaveResult); } catch (Exception e) { baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); - log.error("bc/transfer/in/save异常：" + e); + ExceptionUtils.catchException(e, "bc/transfer/in/save异常"); } return baseObjectResponse; } @@ -95,12 +94,9 @@ public class BCTransferInController extends BaseController { BCTransferInCancelRequest bcTransferInCancelRequest = new BCTransferInCancelRequest(); bcTransferInCancelRequest.setId(id); - // TODO HuJiaqi-这里是自测使用的调试需要修改 - // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext"); - // Integer operatorId = loginContext.getId(); - Integer operatorId = 123456; + bcTransferInCancelRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); - BCTransferInCancelResult bcTransferInCancelResult = bcTransferInFacade.cancel(bcTransferInCancelRequest, operatorId); + BCTransferInCancelResult bcTransferInCancelResult = bcTransferInFacade.cancel(bcTransferInCancelRequest); if (bcTransferInCancelResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInCancelResult.getErrorcode()).setErrormsg(bcTransferInCancelResult.getErrormsg()); return baseObjectResponse; @@ -108,7 +104,7 @@ public class BCTransferInController extends BaseController { baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInCancelResult.getErrorcode()).setErrormsg(bcTransferInCancelResult.getErrormsg()).setData(bcTransferInCancelResult); } catch (Exception e) { baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); - log.error("bc/transfer/in/cancel异常：" + e); + ExceptionUtils.catchException(e, "bc/transfer/in/cancel异常"); } return baseObjectResponse; } @@ -145,7 +141,7 @@ public class BCTransferInController extends BaseController { baseListResponse = new BaseListResponse().setErrorcode(bcTransferInQueryResult.getErrorcode()).setErrormsg(bcTransferInQueryResult.getErrormsg()).setData(bcTransferInQueryResult.getData()).setPageInfo(bcTransferInQueryResult.getPageInfo()); } catch (Exception e) { baseListResponse = new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); - log.error("bc/transfer/in/query异常：" + e); + ExceptionUtils.catchException(e, "bc/transfer/in/query异常"); } return baseListResponse; } @@ -185,7 +181,7 @@ public class BCTransferInController extends BaseController { httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("证明入库（" + startDate + "至" + endDate + "）.xls").getBytes("UTF-8"), "ISO-8859-1")); ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); } catch (Exception e) { - log.error("bc/transfer/in/excel导出excel失败：" + e); + ExceptionUtils.catchException(e, "bc/transfer/in/excel异常"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java index bfde361..d7f5319 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java @@ -50,19 +50,19 @@ public class BCTransferInFacade { * @createTime 2016年11月18日 15时02分 * @discription 新增入库 */ - public BCTransferInSaveResult save(BCTransferInSaveRequest bcTransferInSaveRequest, Integer operatorId) { + public BCTransferInSaveResult save(BCTransferInSaveRequest bcTransferInSaveRequest) { BCTransferInSaveResult bcTransferInSaveResult = new BCTransferInSaveResult(); + Integer operatorId = bcTransferInSaveRequest.getOperatorId(); + // TODO HuJiaqi-是否需要判断用户级别 - // Users users = usersService.getUsers(operatorId); - // if (users == null) { - // bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); - // bcTransferInSaveResult.setErrormsg("用户信息异常"); - // return bcTransferInSaveResult; - // } - Users users = new Users(); - users.setName("HuJiaqi"); + Users users = usersService.getUsers(operatorId); + if (users == null) { + bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + bcTransferInSaveResult.setErrormsg("用户信息异常"); + return bcTransferInSaveResult; + } // 计算总量 Integer total = (int) (bcTransferInSaveRequest.getEndCode() - bcTransferInSaveRequest.getStartCode() + 1); @@ -104,19 +104,19 @@ public class BCTransferInFacade { return bcTransferInSaveResult; } - public BCTransferInCancelResult cancel(BCTransferInCancelRequest bcTransferInCancelRequest, Integer operatorId) { + public BCTransferInCancelResult cancel(BCTransferInCancelRequest bcTransferInCancelRequest) { BCTransferInCancelResult bcTransferInCancelResult = new BCTransferInCancelResult(); + Integer operatorId = bcTransferInCancelRequest.getOperatorId(); + // TODO HuJiaqi-是否需要判断用户级别 - // Users users = usersService.getUsers(operatorId); - // if (users == null) { - // bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); - // bcTransferInSaveResult.setErrormsg("用户信息异常"); - // return bcTransferInSaveResult; - // } - Users users = new Users(); - users.setName("HuJiaqi"); + Users users = usersService.getUsers(operatorId); + if (users == null) { + bcTransferInCancelResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + bcTransferInCancelResult.setErrormsg("用户信息异常"); + return bcTransferInCancelResult; + } // 1、查询这条历史记录 BCTransferInHistoryModel bcTransferInHistoryModel = bcTransferInHistoryService.findById(bcTransferInCancelRequest.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInCancelRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInCancelRequest.java index f92f337..bd4a8d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInCancelRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInCancelRequest.java @@ -17,6 +17,8 @@ public class BCTransferInCancelRequest { */ private String id; + private Integer operatorId; + public String getId() { return id; } @@ -24,4 +26,12 @@ public class BCTransferInCancelRequest { public void setId(String id) { this.id = id; } + + public Integer getOperatorId() { + return operatorId; + } + + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInSaveRequest.java index 11a4d29..fc56553 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInSaveRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInSaveRequest.java @@ -31,6 +31,8 @@ public class BCTransferInSaveRequest { */ private Long endCode; + private Integer operatorId; + public String getEnCode() { return enCode; } @@ -55,4 +57,11 @@ public class BCTransferInSaveRequest { this.endCode = endCode; } + public Integer getOperatorId() { + return operatorId; + } + + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } }