From 3faac1edf6673219a1ec1f7b415871c0c8d15d0c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 12 七月 2024 15:58:07 +0800
Subject: [PATCH] 密码策略接口联调修改上传
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java | 6 +++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java | 4 +---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 19 +++++++++++++++----
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java | 13 +++++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 5 ++---
6 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
index 865899f..aa8bd9b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
@@ -5,9 +5,7 @@
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
-import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.Collection;
import java.util.List;
@@ -196,7 +194,7 @@
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
- void changePassword(String userOid, String password, String confirmPassword) throws VciBaseException;
+ void changePassword(String userOid, String password, String confirmPassword) throws PLException;
/**
* 鏇存柊鐢ㄦ埛鐨勫瘑鐮侀敊璇鏁�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
index 57b148a..8770ca0 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
@@ -273,7 +273,7 @@
}
//鍒ゆ柇鍓嶇鏄惁鏈彁浜わ紝鏄惁榛樿瀛楁
if(Func.isEmpty(strategy.getDefaultFlag())){
- strategy.setDefaultFlag(0);
+ strategy.setDefaultFlag("false");
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index 0c8ae50..c38f4cc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1027,15 +1027,26 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void changePassword(String userOid, String password,
- String confirmPassword) throws VciBaseException {
+ String confirmPassword) throws PLException {
WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
if(!password.equals(confirmPassword)){
throw new VciBaseException("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉鐩哥瓑");
}
+ SmUserVO smUserVO = getUserByUserOid(userOid);
+ if(Func.isEmpty(smUserVO)){
+ throw new VciBaseException("褰撳墠淇敼鐨勭敤鎴蜂笉瀛樺湪锛�");
+ }
+ //TODO:鏍￠獙瀵嗙爜鏄惁绗﹀悎绛栫暐
+ String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(smUserVO.getId(), password,null);
+ if (!StringUtils.isBlank(error)) {
+ throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃");
+ }
ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
String encPassword = des.getEncString(password);
- String sql = "update pluser set plpassword = '" + encPassword + "' where pluid = '" + userOid.trim() + "'";
+
+ //淇敼瀵嗙爜鐨勫悓鏃堕渶瑕佸皢瀵嗙爜淇敼鏃堕棿涔熸洿鏂�
+ String sql = "update pluser set plpassword = '" + encPassword + "' plpwdupdatetime = '"+ System.currentTimeMillis() +"' where pluid = '" + userOid.trim() + "'";
try {
platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
} catch (PLException vciError) {
@@ -1213,8 +1224,8 @@
}
//鏍规嵁褰撳墠鍒涘缓杩欎釜鐢ㄦ埛鐨勪汉鎵�缁戝畾瀵嗙爜绛栫暐鏉ヨ繘琛屽瘑鐮佹牎楠�
try {
- String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
- String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(userName, smUserDTO.getPassword(),null);
+ String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(userId, smUserDTO.getPassword(),null);
if (!StringUtils.isBlank(error)) {
throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃");
}
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..9a38877 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.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.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,7 +204,7 @@
* @param confirmPassword 纭瀵嗙爜
*/
@RequestMapping(value = "/changePassword",method = RequestMethod.POST)
- public BaseResult changePassword(String userOid, String password, String confirmPassword) {
+ public BaseResult changePassword(String userOid, String password, String confirmPassword) throws PLException {
userQueryService.changePassword(userOid, password, confirmPassword);
return BaseResult.success("淇敼瀵嗙爜鎴愬姛");
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java
index cab7107..80ea4ea 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/dto/SmPasswordStrategyDTO.java
@@ -42,7 +42,7 @@
/**
* 鏄惁涓洪粯璁�
*/
- private Integer defaultFlag;
+ private String defaultFlag;
/**
* 瀵嗙爜鐨勬渶澶ч暱搴�
@@ -160,14 +160,14 @@
/**
* 鑾峰彇 鏄惁涓洪粯璁�
*/
- public Integer getDefaultFlag (){
+ public String getDefaultFlag (){
return defaultFlag;
}
/**
* 璁剧疆 鏄惁涓洪粯璁�
*/
- public void setDefaultFlag (Integer defaultFlag){
+ public void setDefaultFlag (String defaultFlag){
this.defaultFlag = defaultFlag;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
index 42c4e4e..909f184 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
@@ -81,6 +81,11 @@
private String pkDepartmentName;
/**
+ * 鎵�灞為儴闂ㄧ紪鍙�
+ */
+ private String pkDepartmentNum;
+
+ /**
* 鎵�灞炶亴鍔�
*/
private String pkDuty;
@@ -170,6 +175,14 @@
*/
private short status;
+ public String getPkDepartmentNum() {
+ return pkDepartmentNum;
+ }
+
+ public void setPkDepartmentNum(String pkDepartmentNum) {
+ this.pkDepartmentNum = pkDepartmentNum;
+ }
+
public String getPassword() {
return password;
}
--
Gitblit v1.9.3