From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java | 157 ++++++++++++++++++++++++++--------------------------
1 files changed, 79 insertions(+), 78 deletions(-)
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-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
similarity index 94%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
index 6b9efb7..5cca29c 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-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
@@ -1,30 +1,27 @@
-package com.vci.frameworkcore.compatibility.impl;
+package com.vci.web.service.impl;
+import com.vci.common.util.ThreeDES;
import com.vci.common.utility.ObjectUtility;
+import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.framework.data.RoleInfo;
+import com.vci.corba.framework.data.UserInfo;
import com.vci.corba.framework.data.UserLogonInfo;
+import com.vci.corba.omd.data.BusinessObject;
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;
-import com.vci.corba.common.data.UserEntityInfo;
-import com.vci.corba.framework.data.UserInfo;
-import com.vci.corba.omd.data.BusinessObject;
-import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
-import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
-import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
-import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.enumpck.OrgTypeEnum;
+import com.vci.enumpck.UI.OrgTypeEnum;
+import com.vci.enumpck.UserTypeEnum;
import com.vci.model.SmUserDO;
-import com.vci.pagemodel.SmUserVO;
-import com.vci.po.SmUserPO;
+import com.vci.omd.utils.ObjectTool;
import com.vci.pagemodel.OrgDepartmentVO;
import com.vci.pagemodel.SmPasswordStrategyVO;
import com.vci.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.properties.ConfigCorbaReader;
-import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.SmUserVO;
+import com.vci.po.SmUserPO;
+import com.vci.properties.OsConfig;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
@@ -35,10 +32,9 @@
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.*;
+import com.vci.starter.web.util.Lcm.Func;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.enumpck.UserTypeEnum;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.Func;
+import com.vci.web.service.*;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -53,8 +49,6 @@
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
-
-import static com.vci.web.util.WebUtil.arryAndSqlToBusinessObject;
/**
* 鐢ㄦ埛鐨勬煡璇㈢浉鍏崇殑鏈嶅姟锛屽彲浠ュ吋瀹硅�佸钩鍙板拰鑰佺殑pdm
@@ -94,7 +88,7 @@
* 瀵嗙爜绛栫暐鏌ヨ鏈嶅姟
*/
@Autowired
- private SmPwdStrategyQueryServiceI smPwdStrategyQueryService;
+ private WebPwdStrategyQueryServiceI smPwdStrategyQueryService;
/**
* 浣跨敤瑙掕壊鐨勫睘鎬ф煡璇㈢敤鎴锋椂
@@ -150,6 +144,11 @@
* 鏃ュ織
*/
private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
+ * 骞冲彴閰嶇疆
+ */
+ private OsConfig osConfig;
/**
* 妫�鏌ョ敤鎴锋槸鍚﹀瓨鍦紝鍙互鏍规嵁鐢ㄦ埛鍚嶏紝涔熷彲浠ユ牴鎹敤鎴穙id
@@ -209,7 +208,7 @@
try{
String[][] sqlQueryResult = platformClientUtil.getBOFService().getSqlQueryResult(sql + fromSql, null);
if(sqlQueryResult.length>0){
- BusinessObject cbo = arryAndSqlToBusinessObject(queryWrapper.getSelectFieldSql(),sqlQueryResult[0]);
+ BusinessObject cbo = WebUtil.arryAndSqlToBusinessObject(queryWrapper.getSelectFieldSql(),sqlQueryResult[0]);
return cbo2VO(cbo);
}
}catch (Exception e){
@@ -254,7 +253,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public List<SmUserVO> listUserByUserIds(Collection<String> userIdCollections)throws VciBaseException {
+ public List<SmUserVO> listUserByUserIds(Collection<String> userIdCollections) {
WebUtil.alertNotNull(userIdCollections,"鐢ㄦ埛鍚嶉泦鍚�");
try {
UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByNames(VciBaseUtil.collection2StrArr(userIdCollections));
@@ -271,7 +270,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public SmUserVO getUserByUserOid(String userOid) throws VciBaseException {
+ public SmUserVO getUserByUserOid(String userOid) {
WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭");
try {
UserInfo userInfo = platformClientUtil.getFrameworkService().getUserObjectByoid(userOid);
@@ -288,7 +287,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮暟鎹簱瀛樺湪闂鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public List<SmUserVO> listUserByUserOids(Collection<String> userOidCollections) throws VciBaseException {
+ public List<SmUserVO> listUserByUserOids(Collection<String> userOidCollections) {
WebUtil.alertNotNull(userOidCollections,"鐢ㄦ埛涓婚敭闆嗗悎");
try {
UserInfo[] userInfoArr = platformClientUtil.getFrameworkService().getUserObjectByoids(VciBaseUtil.collection2StrArr(userOidCollections));
@@ -417,7 +416,7 @@
*/
private SmUserVO smUserDO2VO(SmUserDO smUserDO){
SmUserVO smUserVO = new SmUserVO();
- BeanUtil.convert(smUserDO,smUserVO);
+ BeanUtilForVCI.convert(smUserDO,smUserVO);
return smUserVO;
}
@@ -465,7 +464,7 @@
}else{
userDO.setLockFlag(BooleanEnum.TRUE.getValue());
}
- BeanUtil.convert(userDO,userVO);
+ BeanUtilForVCI.convert(userDO,userVO);
return userVO;
}
@@ -532,44 +531,49 @@
* @return
*/
@Override
- public DataGrid<SmUserVO> getDataGridUsers(Map<String, String> conditionMap, PageHelper pageHelper) throws PLException {
+ public DataGrid<SmUserVO> getDataGridUsers(Map<String, String> conditionMap, PageHelper pageHelper) {
if(pageHelper == null){
pageHelper = new PageHelper(-1);
}
pageHelper.addDefaultAsc("PLTRUENAME");
String loginUserId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
- //String loginUserId = "Ludc";
- //鍒嗛〉鏌ヨ
- UserInfo[] userInfos = platformClientUtil.getFrameworkService().fetchUserInfoByCondition(
- conditionMap.get("name"),
- conditionMap.get("id"),
- conditionMap.get("pkDepartment"),
- conditionMap.get("pkPerson"),
- loginUserId, //褰撳墠鐧诲綍鐨勭敤鎴峰悕
- pageHelper.getPage(),
- pageHelper.getLimit()
- );
- DataGrid<SmUserVO> dataGrid = new DataGrid<>();
- if(Func.isNotEmpty(userInfos)){
- List<String> idList = Arrays.stream(userInfos).map(item -> item.id).collect(Collectors.toList());
- orgDepartmentVOMap = orgDeptQueryService.batchMapDeptNameByUserOids(idList, null);
- smRoleVOMap = smRoleQueryService.batchListRoleByUserOids(idList,null);
- smPwdStrategyVOMap = smPwdStrategyQueryService.batchSmPwdStrategyByUserOids(idList);
- dataGrid.setData(userInfoArr2VO(userInfos));
- //鐢ㄥ畬浜嗘竻绌�
- orgDepartmentVOMap = null;
- smRoleVOMap = null;
- smPwdStrategyVOMap = null;
- //TODO: 杩欎釜缁熻鎬绘暟鏈夐棶棰橈紝甯﹁繃鍘荤殑鍙傛暟涓嶈兘鍍忎笂闈㈤偅涓猣etchUserInfoByCondition鏌ヨ涓�鏍风粺璁＄殑鍗寸殑鎬绘暟
- dataGrid.setTotal(
- platformClientUtil.getFrameworkService().getUserTotalByCondition(
- conditionMap.get("name"),
- conditionMap.get("id"),
- conditionMap.get("pkDepartment"),
- conditionMap.get("pkPerson"),
- loginUserId //褰撳墠鐧诲綍鐨勭敤鎴峰悕
- )
+ DataGrid<SmUserVO> dataGrid = null;
+ try {
+ //String loginUserId = "Ludc";
+ //鍒嗛〉鏌ヨ
+ UserInfo[] userInfos = platformClientUtil.getFrameworkService().fetchUserInfoByCondition(
+ conditionMap.get("name"),
+ conditionMap.get("id"),
+ conditionMap.get("pkDepartment"),
+ conditionMap.get("pkPerson"),
+ loginUserId, //褰撳墠鐧诲綍鐨勭敤鎴峰悕
+ pageHelper.getPage(),
+ pageHelper.getLimit()
);
+ dataGrid = new DataGrid<>();
+ if(Func.isNotEmpty(userInfos)){
+ List<String> idList = Arrays.stream(userInfos).map(item -> item.id).collect(Collectors.toList());
+ orgDepartmentVOMap = orgDeptQueryService.batchMapDeptNameByUserOids(idList, null);
+ smRoleVOMap = smRoleQueryService.batchListRoleByUserOids(idList,null);
+ smPwdStrategyVOMap = smPwdStrategyQueryService.batchSmPwdStrategyByUserOids(idList);
+ dataGrid.setData(userInfoArr2VO(userInfos));
+ //鐢ㄥ畬浜嗘竻绌�
+ orgDepartmentVOMap = null;
+ smRoleVOMap = null;
+ smPwdStrategyVOMap = null;
+ //TODO: 杩欎釜缁熻鎬绘暟鏈夐棶棰橈紝甯﹁繃鍘荤殑鍙傛暟涓嶈兘鍍忎笂闈㈤偅涓猣etchUserInfoByCondition鏌ヨ涓�鏍风粺璁＄殑鍗寸殑鎬绘暟
+ dataGrid.setTotal(
+ platformClientUtil.getFrameworkService().getUserTotalByCondition(
+ conditionMap.get("name"),
+ conditionMap.get("id"),
+ conditionMap.get("pkDepartment"),
+ conditionMap.get("pkPerson"),
+ loginUserId //褰撳墠鐧诲綍鐨勭敤鎴峰悕
+ )
+ );
+ }
+ } catch (Exception e) {
+ throw new VciBaseException("鑾峰彇鐢ㄦ埛鍒楄〃澶辫触锛�", new Object[]{}, e);
}
return dataGrid;
}
@@ -625,7 +629,7 @@
* @throws VciBaseException
*/
@Override
- public List<SmUserVO> countSmUserByDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException {
+ public List<SmUserVO> countSmUserByDeptOid(String deptOid, Map<String, String> queryMap) {
//鏄惁鏌ヨ瀛愰儴闂ㄤ笅鍏宠仈鐨勭敤鎴�
List<OrgDepartmentVO> orgDepartmentVOList = orgDeptQueryService.listAllLevelChildrenDeptByParentOid(deptOid, null);
List<String> deptOidCollection = orgDepartmentVOList.stream().map(OrgDepartmentVO::getOid).collect(Collectors.toList());
@@ -658,7 +662,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public List<SmUserVO> listUserByDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException {
+ public List<SmUserVO> listUserByDeptOid(String deptOid, Map<String, String> queryMap) {
//鏌ヨ褰撳墠閫変腑鐨勯儴闂ㄤ笅鐨勭敤鎴�
return listUserVOByDeptOid(queryMap,Arrays.asList(deptOid),false );
}
@@ -671,7 +675,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public List<SmUserVO> listUserUnInDeptOid(String deptOid, Map<String, String> queryMap) throws VciBaseException {
+ public List<SmUserVO> listUserUnInDeptOid(String deptOid, Map<String, String> queryMap) {
// TODO:鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰喅瀹氳兘鏌ラ偅浜涚敤鎴�
String userType = "0";//WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUsertype();
//鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴风被鍨嬩笉鍚岋紝鏌ヨ涓嶅悓鐨勭敤鎴�
@@ -790,7 +794,7 @@
*/
@Override
public Map<String, List<SmUserVO>> batchListUserByDeptOids(
- Collection<String> deptOidCollection) throws VciBaseException {
+ Collection<String> deptOidCollection) {
if(CollectionUtils.isEmpty(deptOidCollection)){
return new HashMap<>();
}
@@ -810,7 +814,7 @@
*/
@Override
public List<SmUserVO> listUserByRoleOid(String roleOid,
- Map<String, String> queryMap) throws VciBaseException {
+ Map<String, String> queryMap) {
return listUserVOByRoleOid(queryMap,roleOid,false);
}
@@ -823,7 +827,7 @@
*/
@Override
public List<SmUserVO> listUserUnInRoleOid(String roleOid,
- Map<String, String> queryMap) throws VciBaseException {
+ Map<String, String> queryMap) {
// TODO:鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰喅瀹氳兘鏌ラ偅浜涚敤鎴�
String usertype = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUsertype();
//鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴风被鍨嬩笉鍚岋紝鏌ヨ涓嶅悓鐨勭敤鎴�
@@ -882,7 +886,7 @@
*/
@Override
public Map<String, List<SmUserVO>> batchListUserByRoleOids(
- Collection<String> roleOidCollection) throws VciBaseException {
+ Collection<String> roleOidCollection) {
if(CollectionUtils.isEmpty(roleOidCollection)){
return new HashMap<>();
}
@@ -928,7 +932,7 @@
*/
@Override
public DataGrid<SmUserVO> refGridUsers(Map<String, String> queryMap,
- PageHelper pageHelper) throws VciBaseException {
+ PageHelper pageHelper) {
return gridUserByQueryField(null,null,queryMap,pageHelper,false);
}
@@ -939,8 +943,7 @@
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public List<Tree> refTreeUsers(TreeQueryObject treeQueryObject)
- throws VciBaseException {
+ public List<Tree> refTreeUsers(TreeQueryObject treeQueryObject) {
VciQueryWrapperForDO queryWrapper = getQueryWrapper(null, null, treeQueryObject.getConditionMap(), null, false);
queryWrapper.wrapperSql();
String sql = queryWrapper.getSelectFieldSql();
@@ -972,7 +975,7 @@
* @throws VciBaseException
*/
@Override
- public List<Tree> refPersonOrgTree(TreeQueryObject treeQueryObject) throws VciBaseException {
+ public List<Tree> refPersonOrgTree(TreeQueryObject treeQueryObject) {
List<Tree> rootTreeList=new ArrayList<>();
Map<String,String> conditionMap=treeQueryObject.getConditionMap();
if(CollectionUtils.isEmpty(conditionMap)) {
@@ -1254,8 +1257,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呭瓨鍌ㄥ埌鏁版嵁搴撲腑鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void updateUserPwdWrongCount(String userOid, int wrongCount)
- throws VciBaseException {
+ public void updateUserPwdWrongCount(String userOid, int wrongCount){
WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭");
String sql = "update pllogoninfo set plwrongnum = " + wrongCount +" where pluserid ='" + userOid + "'";
try {
@@ -1271,7 +1273,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void updateUserLoginTime(String userOid) throws VciBaseException {
+ public void updateUserLoginTime(String userOid) {
WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭");
String sql = "update pllogoninfo set pllogontime = sysdate where pluserid ='" + userOid + "'";
try {
@@ -1501,8 +1503,7 @@
// 璁剧疆琛ㄥ崟鍒楀悕
List<String> columns = new ArrayList<>(Arrays.asList("璐﹀彿", "瀵嗙爜", "濮撳悕", "鐢靛瓙閭", "涓撲笟", "鎻忚堪", "閮ㄩ棬(涓婁笅绾ч儴闂ㄤ箣闂翠互鍙嶆枩鏉犻殧寮�(/))"));
//鑾峰彇鏄惁瀵煎嚭瀵嗙骇閰嶇疆椤�
- String flag = ConfigCorbaReader.getConfigValue("exportSecretGrade");
- if (flag != null && flag.equalsIgnoreCase("true")) {
+ if (osConfig.isExportSecretGrade()) {
columns = new ArrayList<>(Arrays.asList("璐﹀彿", "瀵嗙爜", "濮撳悕", "鐢靛瓙閭", "涓撲笟", "鎻忚堪", "閮ㄩ棬(涓婁笅绾ч儴闂ㄤ箣闂翠互鍙嶆枩鏉犻殧寮�(/))" ,"瀵嗙骇"));
}
//璁剧疆蹇呭～鍒�
@@ -1553,7 +1554,7 @@
String loginUserId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
UserEntityInfo userEntityInfo = new UserEntityInfo(loginUserId,null);
//鏄惁瀵煎叆瀵嗙骇閰嶇疆
- boolean exportSecretGrade = Boolean.parseBoolean(ConfigCorbaReader.getConfigValue("exportSecretGrade"));
+ boolean exportSecretGrade = osConfig.isExportSecretGrade();
List<SmUserPO> poList = ExcelUtil.readDataObjectFromExcel(file, SmUserPO.class,excelOption,(value, po, fieldName)->{
Integer secretValue = UserSecretEnum.getSecretValueByText(po.getSecretGradeText());
//鏄惁蹇呴』瀵煎叆瀵嗙骇
@@ -1606,7 +1607,7 @@
//淇濆瓨閫昏緫
poList.stream().forEach(smUserPO->{
SmUserDTO smUserDTO = new SmUserDTO();
- BeanUtil.convert(smUserPO,smUserDTO);
+ BeanUtilForVCI.convert(smUserPO,smUserDTO);
//鐢ㄦ埛淇℃伅鏄惁瑙勮寖妫�鏌�
this.check(smUserDTO,true,true);
//鐢熸垚瀛樺偍鐨凞O瀵硅薄
@@ -1649,7 +1650,7 @@
* @return
*/
@Override
- public List<String> queryUserNameByRoleType(String roleType) throws PLException {
+ public List<String> queryUserNameByRoleType(String roleType) {
List<String> userNameList = new ArrayList<>();
if(Func.isBlank(roleType)){
return userNameList;
--
Gitblit v1.9.3