From 118211ba511524e94952c896bd508ff9baec46c8 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 15 八月 2024 23:23:07 +0800 Subject: [PATCH] 业务类型接口联调调整,菜单查询调整 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java index 9a38877..375ec71 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java @@ -1,10 +1,10 @@ package com.vci.frameworkcore.controller; +import com.vci.dto.SmUserDTO; import com.vci.corba.common.PLException; import com.vci.frameworkcore.compatibility.SmUserQueryServiceI; -import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant; -import com.vci.frameworkcore.model.dto.SmUserDTO; -import com.vci.frameworkcore.pagemodel.SmUserVO; +import com.vci.constant.FrameWorkLangCodeConstant; +import com.vci.pagemodel.SmUserVO; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.*; import com.vci.starter.web.util.ControllerUtil; @@ -204,9 +204,15 @@ * @param confirmPassword 纭瀵嗙爜 */ @RequestMapping(value = "/changePassword",method = RequestMethod.POST) - public BaseResult changePassword(String userOid, String password, String confirmPassword) throws PLException { - userQueryService.changePassword(userOid, password, confirmPassword); - return BaseResult.success("淇敼瀵嗙爜鎴愬姛"); + public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException { + try { + return userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? BaseResult.success("鐢ㄦ埛淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛淇敼澶辫触锛�"); + }catch (Exception e){ + e.printStackTrace(); + String exceptionMessage = "淇敼瀵嗙爜鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e); + logger.error(exceptionMessage); + return BaseResult.fail(exceptionMessage); + } } /** @@ -224,7 +230,7 @@ e.printStackTrace(); String exceptionMessage = "鐢ㄦ埛绠$悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e); logger.error(exceptionMessage); - return BaseResult.fail(e.getMessage()); + return BaseResult.fail(exceptionMessage); } } @@ -253,7 +259,7 @@ @RequestMapping(value = "/updateUser",method = RequestMethod.PUT) public BaseResult updateUser(@RequestBody SmUserDTO smUserDTO){ try { - return BaseResult.success(userQueryService.updateUser(smUserDTO) ? "鐢ㄦ埛淇敼鎴愬姛锛�":"鐢ㄦ埛淇敼澶辫触锛�"); + return userQueryService.updateUser(smUserDTO) ? BaseResult.success("鐢ㄦ埛淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛淇敼澶辫触锛�"); }catch (Exception e){ e.printStackTrace(); String exceptionMessage = "淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e); -- Gitblit v1.9.3