From 37d730454255d0680c2bc4f1e15dc5cd1a55e6a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 十月 2024 09:58:36 +0800
Subject: [PATCH] 部门分配成员接口和界面传参修改，枚举修改报错修复提交
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java | 29 ++------------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java | 4 +-
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 | 59 +++++++++++++++--------------
Source/plt-web/plt-web-ui/src/api/system/departMent/api.js | 2
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 4 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 6 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 5 +-
9 files changed, 49 insertions(+), 66 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 4b161db..47cb4ec 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
@@ -198,12 +198,12 @@
/**
* 淇敼瀵嗙爜
- * @param userOid 鐢ㄦ埛涓婚敭
+ * @param userName 鐢ㄦ埛涓婚敭
* @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
- boolean changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws Exception;
+ boolean changePassword(String userName,String oldPassword, String password, String confirmPassword) throws Exception;
/**
* 鏇存柊鐢ㄦ埛鐨勫瘑鐮侀敊璇鏁�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
index 557cda4..16e89a2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
@@ -596,30 +596,11 @@
@Override
public boolean saveUsersDept(String[] userOIds, String deptId) throws PLException {
VciBaseUtil.alertNotNull(deptId,"閮ㄩ棬涓婚敭");
-
- //鍏堟煡閲嶅鐞�
- List<String> repeatUserOidList = new ArrayList<>();
- //寰幆杩涜鏌ラ噸锛岄伩鍏峣n澶т簬1000
- WebUtil.switchCollectionForOracleIn(Arrays.asList(userOIds)).stream().forEach(userOId->{
- String sql = "select pluseruid,pldeptuid from pluserdept where pldeptuid = '" + deptId
- + "' and " + "pluseruid in ("+WebUtil.toInSql(userOId.toArray(new String[0]))+")";
- List<BusinessObject> cbos = boService.queryBySql(sql, null);
- if(!CollectionUtils.isEmpty(cbos)){
- cbos.stream().forEach(cbo->{
- repeatUserOidList.add(ObjectTool.getNewBOAttributeValue(cbo,"pluseruid"));
- });
- }
- });
-
- //浠庡嵆灏嗚鎵ц淇濆瓨鐨勭敤鎴穙id涓Щ闄ゅ綋鍓嶇敤鎴峰凡缁忓瓨鍦ㄥ叧鑱斿叧绯荤殑oid
- //绉婚櫎閲嶅鐨�
- List<String> tempList = new ArrayList<>(Arrays.asList(userOIds));
- tempList.removeAll(repeatUserOidList);
- userOIds = tempList.toArray(new String[tempList.size()]);
- if(Func.isNotEmpty(userOIds)){
- platformClientUtil.getFrameworkService().saveUserDept(userOIds, deptId,new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(),null));
- }
- return true;
+ //涓虹┖鐨勮瘽璇存槑鏄竻绌哄綋鍓嶈繖涓儴闂ㄤ笅鍒嗛厤鐨勬垚鍛�
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ UserEntityInfo userEntityInfo = new UserEntityInfo(sessionInfo.getUserId(), null);
+ boolean resBoolean = platformClientUtil.getFrameworkService().saveRighForDept(deptId, userOIds, userEntityInfo);
+ return resBoolean;
}
/**
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 50f9485..4321cb6 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
@@ -1,7 +1,10 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.framework.data.RoleInfo;
+import com.vci.corba.omd.etm.EnumItem;
+import com.vci.corba.omd.etm.EnumType;
import com.vci.dto.SmUserDTO;
import com.vci.common.util.ThreeDES;
import com.vci.corba.common.PLException;
@@ -117,6 +120,11 @@
* 浣跨敤瑙掕壊鏌ヨ鐨勬椂鍊欑殑鏌ヨ瀛楁
*/
public static final String QUERY_FIELD_ROLE = "roleUser.plroleuid";
+
+ /**
+ * 瀵嗙骇鐨勬灇涓緆ey
+ */
+ private static final String ENUM_USERSECURITYENUM = "usersecurityenum";
/**
* 蹇呭～鍒�
@@ -317,7 +325,16 @@
smUserVO.setId(userInfo.userName);
smUserVO.setName(userInfo.trueName);
smUserVO.setSecretGrade(userInfo.secretGrade);
- smUserVO.setSecretGradeText(UserSecretEnum.getSecretText(userInfo.secretGrade));
+ //瀵嗙骇澶勭悊
+ String secretGrade = "" + userInfo.secretGrade;
+ EnumType item = platformClientUtil.getEnumService().getEnumTypeByName(ENUM_USERSECURITYENUM);
+ EnumItem[] children = item.items;
+ for(EnumItem child: children){
+ if(child.value.equals(secretGrade)){
+ smUserVO.setSecretGradeText(child.name);
+ break;
+ }
+ }
smUserVO.setUserType(String.valueOf(userInfo.userType));
smUserVO.setUserTypeText(UserTypeEnum.getTextByValue(String.valueOf(userInfo.userType)));
smUserVO.setDescription(userInfo.desc);
@@ -1115,18 +1132,18 @@
/**
* 鏍￠獙瀵嗙爜鏄惁鐩稿悓锛屽湪鏂板钩鍙颁腑瀛樺偍鐨勫瘑鐮佹槸涓ゆmd5
- * @param userOid 鐢ㄦ埛涓婚敭
+ * @param userName 鐢ㄦ埛鍚�
* @param md5Password 宸茬粡md5鍔犲瘑涓�娆＄殑瀵嗙爜--鑰佺殑骞冲彴閲屼笉鑳藉姞瀵�
* @return true 琛ㄧず鐩哥瓑锛宖alse琛ㄧず涓嶇浉绛�
*/
@Override
- public boolean checkPasswordEqual(String md5Password, String userOid) {
- if(StringUtils.isBlank(md5Password) || StringUtils.isBlank(userOid)){
+ public boolean checkPasswordEqual(String md5Password, String userName) {
+ if(StringUtils.isBlank(md5Password) || StringUtils.isBlank(userName)){
return false;
}
- String sql = " select plpassword from pluser where pluid = :userOid";
+ String sql = " select plpassword from pluser where plusername = :userName";
Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("userOid",userOid.trim());
+ conditionMap.put("userName",userName.trim());
List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
if(CollectionUtils.isEmpty(BusinessObjectList)){
return false;
@@ -1193,16 +1210,16 @@
/**
* 淇敼瀵嗙爜
- * @param userOid 鐢ㄦ埛涓婚敭
+ * @param userName 鐢ㄦ埛涓婚敭
* @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean changePassword(String userOid,String oldPassword, String password,
+ public boolean changePassword(String userName,String oldPassword, String password,
String confirmPassword) throws Exception {
- WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",oldPassword,"鐧诲綍瀵嗙爜",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
+ VciBaseUtil.alertNotNull(userName,"鐢ㄦ埛鍚�",oldPassword,"鐧诲綍瀵嗙爜",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
if(!password.equals(confirmPassword)){
throw new VciBaseException("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉鐩哥瓑");
}
@@ -1210,39 +1227,25 @@
oldPassword = Func.decryptAes(oldPassword,"daliantan0v0vcip");
password = Func.decryptAes(password,"daliantan0v0vcip");
//瀵规瘮鏃у瘑鐮�
- boolean b = this.checkPasswordEqual(oldPassword, userOid);
+ boolean b = this.checkPasswordEqual(oldPassword, userName);
if(!b){
throw new PLException("500", new String[] { "鎮ㄨ緭鍏ョ殑瀵嗙爜涓庣櫥褰曞瘑鐮佷笉涓�鑷�,璇烽噸鏂拌緭鍏�!"});
}
- SmUserVO smUserVO = getUserByUserOid(userOid);
- if(Func.isEmpty(smUserVO)){
+ UserInfo userInfo = platformClientUtil.getFrameworkService().getUserObjectByUserName(userName);
+ if(Func.isEmpty(userInfo) || Func.isBlank(userInfo.id)){
throw new VciBaseException("褰撳墠淇敼鐨勭敤鎴蜂笉瀛樺湪锛�");
}
//TODO:鏍￠獙瀵嗙爜鏄惁绗﹀悎绛栫暐
- String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(smUserVO.getId(), password,null);
+ String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(userInfo.id, password,null);
if (!StringUtils.isBlank(error)) {
throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃!");
}
//TODO:鑰冭檻鏄惁闇�瑕佸皢淇敼鏂瑰紡鏀规垚鐩存帴璋冪敤骞冲彴鐨勬帴鍙ｏ紝鍥犱负鐜板湪鐨勪慨鏀规柟寮忔病鑳芥纭殑鏇存柊缂撳瓨
- /*UserInfo userInfo = new UserInfo();
- userInfo.id = userOid.trim();
userInfo.pwd = password;
userInfo.pwdUpdateTime = System.currentTimeMillis();
boolean updateBoolean = platformClientUtil.getFrameworkService().updateUser(userInfo, new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(), null));
- return updateBoolean;*/
-
- ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
- des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
- String encPassword = des.getEncString(password);
- //淇敼瀵嗙爜鐨勫悓鏃堕渶瑕佸皢瀵嗙爜淇敼鏃堕棿涔熸洿鏂�
- String sql = "update pluser set plpassword = '" + encPassword + "', plpwdupdatetime = TO_DATE('"
- + Func.format(new Date(),"yyyy-MM-dd HH:mm:ss") +"','yyyy-MM-dd hh24:mi:ss') where pluid = '" + userOid.trim() + "'";
- try {
- return platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- } catch (PLException vciError) {
- throw WebUtil.getVciBaseException(vciError);
- }
+ return updateBoolean;
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
index 36e9d23..5b3a1bb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
@@ -88,13 +88,13 @@
public BaseResult saveUsersDepts(String[] userOIds, String deptId){
//涓嶈兘鍚屾椂涓虹┖
if(Func.isEmpty(userOIds) && Func.isBlank(deptId)){
- return BaseResult.fail("瑙掕壊涓婚敭鍜岄儴闂ㄤ富閿紝鍙傛暟涓嶈兘鍚屾椂涓虹┖!");
+ return BaseResult.fail("鍙傛暟銆愮敤鎴蜂富閿�戝拰銆愰儴闂ㄤ富閿�戯紝涓嶈兘鍚屾椂涓虹┖!");
}
try {
return deptQueryService.saveUsersDept(userOIds,deptId) ? BaseResult.success("閮ㄩ棬鍒嗛厤鎴愬姛锛�"):BaseResult.fail("閮ㄩ棬鍒嗛厤澶辫触锛�");
}catch (Exception e){
e.printStackTrace();
- String exceptionMessage = "鍏宠仈鐨勯儴闂ㄦ椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ String exceptionMessage = "鍏宠仈閮ㄩ棬鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
logger.error(exceptionMessage);
return BaseResult.fail(exceptionMessage);
}
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 52ab560..f3d796e 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
@@ -200,15 +200,15 @@
/**
* 淇敼瀵嗙爜
- * @param userOid 鐢ㄦ埛涓婚敭
+ * @param userName 鐢ㄦ埛鍚�
* @param password 鏂板瘑鐮�
* @param confirmPassword 纭瀵嗙爜
*/
@RequestMapping(value = "/changePassword",method = RequestMethod.POST)
@VciUnCheckRight
- public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException {
+ public BaseResult changePassword(String userName,String oldPassword, String password, String confirmPassword) throws PLException {
try {
- return userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? BaseResult.success(true,"鐢ㄦ埛淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛淇敼澶辫触锛�");
+ return userQueryService.changePassword(userName, oldPassword, password, confirmPassword) ? BaseResult.success(true,"鐢ㄦ埛淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛淇敼澶辫触锛�");
}catch (Exception e){
e.printStackTrace();
String exceptionMessage = "淇敼瀵嗙爜鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
index bb4ab4f..b4be78a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
@@ -326,7 +326,7 @@
//3銆佸垽鏂瘑鐮佹槸鍚︽纭�
if (checkPassword) {
- boolean passwordIsEqual = userQueryService.checkPasswordEqual(userDTO.getPassword(), user.getOid());
+ boolean passwordIsEqual = userQueryService.checkPasswordEqual(userDTO.getPassword(), user.getName());
if (!passwordIsEqual) {
if (logger.isDebugEnabled()) {
logger.debug("{}瀵嗙爜涓嶆纭�", user.getId());
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index 00c2d6b..3af82b5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -700,9 +700,8 @@
*/
private EnumType osEnumDTO2EnumType(OsEnumDTO osEnumDTO){
EnumType enumType = new EnumType();
- //enumType.oid = osEnumDTO.getOid();
- //鏋氫妇鍚嶇粺涓�杞垚灏忓啓锛岄伩鍏嶅悗鏈熷嚭鐜板叾浠栭棶棰�
- enumType.name = osEnumDTO.getId().toLowerCase(Locale.ROOT);
+ enumType.oid = osEnumDTO.getOid();
+ enumType.name = osEnumDTO.getId();//osEnumDTO.getId().toLowerCase(Locale.ROOT);
enumType.label = osEnumDTO.getName();
enumType.length = osEnumDTO.getLength();
enumType.creator = osEnumDTO.getCreator();
diff --git a/Source/plt-web/plt-web-ui/src/api/system/departMent/api.js b/Source/plt-web/plt-web-ui/src/api/system/departMent/api.js
index 0acd660..be3db14 100644
--- a/Source/plt-web/plt-web-ui/src/api/system/departMent/api.js
+++ b/Source/plt-web/plt-web-ui/src/api/system/departMent/api.js
@@ -63,7 +63,7 @@
});
}
-// 宸查�変汉鍛樻煡璇�
+// 鍒嗛厤鎴愬憳
export function saveUsersDepts(params) {
let formData = new FormData;
for (let key in params){
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index bcc41bd..92cd98c 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -338,11 +338,11 @@
// 鍒嗛厤鎴愬憳绌挎妗嗗洖濉�
departTransferSend(row) {
let params = {
- userOids: row.join(','),
+ userOIds: row.join(','),
deptId: this.departCurrenRow.oid
}
saveUsersDepts(params).then(res => {
- console.log(res);
+ //console.log(res);
this.$message.success(res.data.obj);
this.getTableList();
}).catch(err => {
--
Gitblit v1.9.3