From e977b8737d88aa1bd0286fe27bf4fd22cb2501d9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 七月 2024 17:34:42 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 21 +++++++++++++--------
1 files changed, 13 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 a35c5aa..7dda639 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.starter.web.annotation.controller.VciUnCheckRight;
+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;
@@ -12,7 +12,6 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.util.Func;
-import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -205,9 +204,15 @@
* @param confirmPassword 纭瀵嗙爜
*/
@RequestMapping(value = "/changePassword",method = RequestMethod.POST)
- public BaseResult changePassword(String userOid, String password, String confirmPassword) {
- userQueryService.changePassword(userOid, password, confirmPassword);
- return BaseResult.success("淇敼瀵嗙爜鎴愬姛");
+ public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException {
+ try {
+ return BaseResult.success(userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? "淇敼瀵嗙爜鎴愬姛锛�":"淇敼瀵嗙爜澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "淇敼瀵嗙爜鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
--
Gitblit v1.9.3