From 370b26066c560f15f6a84caca2be149e48e86556 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期二, 07 一月 2025 15:52:05 +0800
Subject: [PATCH] 系统菜单 默认显示&&系统配置、对象建模按钮权限以及按钮图标
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java | 141 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 125 insertions(+), 16 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
index 5cca29c..9c24c4f 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
@@ -4,10 +4,7 @@
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.framework.data.*;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.etm.EnumItem;
import com.vci.corba.omd.etm.EnumType;
@@ -959,7 +956,7 @@
tree.setOid(cbo.oid);
tree.setText(cbo.id + " " + cbo.name);
Map<String,String> attributeMap = new HashMap<>();
- WebUtil.copyValueToCboFromMap(cbo,attributeMap);
+ WebUtil.copyValueToMapFromBos(cbo,attributeMap);
tree.setAttributes(attributeMap);
tree.setLeaf(true);
treeList.add(tree);
@@ -1141,19 +1138,21 @@
if(StringUtils.isBlank(md5Password) || StringUtils.isBlank(userName)){
return false;
}
- String sql = " select plpassword from pluser where plusername = :userName";
+ /*String sql = " select plpassword from pluser where plusername = :userName";
Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("userName",userName.trim());
- List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
- if(CollectionUtils.isEmpty(BusinessObjectList)){
+ conditionMap.put("userName",userName.trim());*/
+ SmUserVO userVO = this.getUserByUserId(userName);
+ //List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
+ if(Func.isEmpty(userVO) || Func.isBlank(userVO.getOid())){
return false;
}
- ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
- des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
+ //ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
+ //des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
//瀵规煡璇㈠嚭鏉ョ殑瀵嗙爜瑙ｅ瘑
- String plpassword = ObjectTool.getNewBOAttributeValue(BusinessObjectList.get(0), "plpassword");
- plpassword = des.getDesString(plpassword);
+ //String plpassword = ObjectTool.getNewBOAttributeValue(BusinessObjectList.get(0), "plpassword");
+ String plpassword = userVO.getPassword();
+ //plpassword = des.getDesString(plpassword);
if(md5Password.equals(plpassword)){
return true;
}
@@ -1456,7 +1455,7 @@
userInfo.updateUser = user.getLastModifier() == null ? "" : user.getLastModifier();
userInfo.pwdUpdateTime = user.getPwdUpdateTime().getTime();
userInfo.grantor = user.getGrantor() == null ? "" : user.getGrantor();
- userInfo.secretGrade = user.getSecretGrade() == null ? 2 : Integer.valueOf(user.getGrantor());
+ userInfo.secretGrade = user.getSecretGrade() == null ? 2 : Integer.valueOf(user.getSecretGrade());
userInfo.isDeptLeader = user.getIsDeptLeader() == null ? "0" : user.getIsDeptLeader();
return userInfo;
}
@@ -1671,13 +1670,123 @@
* @throws VciBaseException
*/
@Override
- public List<SmUserVO> listUserByUserType() throws PLException {
+ public List<SmUserVO> listUserByUserType(Integer type) throws PLException {
try {
- UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
+ UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(type != null ? type.shortValue() :Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
return userInfoArr2VO(userInfo);
} catch (PLException e) {
throw new VciBaseException("鐧诲綍鏃讹紝鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛�"+e.getMessage());
}
}
+ /**
+ * 瀵煎嚭鐢ㄦ埛鍒楄〃涓夊憳璐﹀彿闄ゅ
+ * @return
+ */
+ @Override
+ public String expUser() throws PLException {
+ // 璁剧疆琛ㄥ崟鍒楀悕
+ List<String> columns = new ArrayList<>(Arrays.asList("濮撳悕, 璐﹀彿, 鐘舵��, 瀵嗙爜绛栫暐, 閿佸畾鐘舵��, 鎵�灞為儴闂�, 涓撲笟, 瑙掕壊, 鐢靛瓙閭欢, 鎻忚堪, 閮ㄩ棬棰嗗, 瀵嗙骇".split(",")));
+ //璁剧疆蹇呭～鍒�
+ ColumnNameisRed.clear();
+ ColumnNameisRed.add(0);
+ ColumnNameisRed.add(1);
+ ColumnNameisRed.add(2);
+ //鍐檈xcel
+ String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + "userList.xls";
+ try {
+ new File(excelPath).createNewFile();
+ } catch (Throwable e) {
+ throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[]{excelPath}, e);
+ }
+ //璁剧疆鍒�
+ List<WriteExcelData> excelDataList = new ArrayList<>();
+ for (int index = 0; index < columns.size(); index++) {
+ //鍒ゆ柇鏄惁涓哄繀濉垪锛岀粰蹇呭～鍒楄缃鑹�
+ if(ColumnNameisRed.contains(index)){
+ WriteExcelData excelData = new WriteExcelData(0, index, columns.get(index));
+ excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
+ excelDataList.add(excelData);
+ }else{
+ excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
+ }
+ }
+ UserInfo[] userInfos = platformClientUtil.getFrameworkService().fetchUserInfoWithOutSanYuan();
+ //閮ㄩ棬淇℃伅闆嗗悎
+ Hashtable<String, String> deptHashTable = new Hashtable<String, String>();
+ for(int index = 1; index <= userInfos.length; index++){
+ UserInfo userInfo = userInfos[index-1];
+ excelDataList.add(new WriteExcelData(index,0, userInfo.trueName));
+ excelDataList.add(new WriteExcelData(index,1, userInfo.userName));
+ excelDataList.add(new WriteExcelData(index,2, userInfo.status==1 ? "鍋滅敤":"鍚敤"));
+ /**瀵嗙爜绛栫暐**/
+ PasswordStrategyInfo pwsObj = platformClientUtil.getFrameworkService().fetchPasswordStrategyByUserId(userInfo.id);
+ excelDataList.add(new WriteExcelData(index,3, pwsObj.name));
+ /**閿佸畾鐘舵��**/
+ UserLogonInfo lockObj = platformClientUtil.getFrameworkService().fetchUserLogonObj(userInfo.id);
+ if (pwsObj != null)
+ excelDataList.add(new WriteExcelData(index,4, (pwsObj.retryTime > 0 && lockObj.plWrongNum >= pwsObj.retryTime) ? "閿佸畾" : "鏈攣瀹�"));
+ else
+ excelDataList.add(new WriteExcelData(index,4, "鏈攣瀹�"));
+ DeptInfo obj = null;
+ RoleInfo[] roles = null;
+ String deptName = "";
+ obj = platformClientUtil.getFrameworkService().fetchDeptByUserId(userInfo.id);
+ if (obj != null){
+ if(!deptHashTable.containsKey((obj.id))){
+ deptName = getDeptObjectAllByDeptId(obj);
+ deptHashTable.put(obj.id, deptName);
+ }else{
+ deptName = deptHashTable.get(obj.id);
+ }
+ }
+ roles = platformClientUtil.getFrameworkService().fetchRoleInfoByUserId(userInfo.id);
+ excelDataList.add(new WriteExcelData(index,5, deptName));
+ excelDataList.add(new WriteExcelData(index,6, userInfo.specialties));
+ String roleNames = "";
+ if (roles.length != 0){
+ for(int j = 0 ; j < roles.length ; j ++){
+ if (j < roles.length -1){
+ roleNames += roles[j].name + ",";
+ }else {
+ roleNames += roles[j].name;
+ }
+ }
+ }
+ excelDataList.add(new WriteExcelData(index,7, roleNames));
+ excelDataList.add(new WriteExcelData(index,8, userInfo.email));
+ excelDataList.add(new WriteExcelData(index,9, userInfo.desc));
+ excelDataList.add(new WriteExcelData(index,10, userInfo.isDeptLeader.equals("1") ? "鏄�" : "鍚�"));
+ String secretGrade = String.valueOf(userInfo.secretGrade);
+ try {
+ EnumType item = platformClientUtil.getEnumService().getEnumTypeByName(ENUM_USERSECURITYENUM);
+ EnumItem[] children = item.items;
+ String securityShowName = "";
+ for(EnumItem child: children){
+ if(child.value.equals(secretGrade)){
+ securityShowName = child.name;
+ break;
+ }
+ }
+ excelDataList.add(new WriteExcelData(index,11, securityShowName));
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ }
+ WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
+ ExcelUtil.writeDataToFile(excelPath, excelOption);
+ return excelPath;
+ }
+ //鏍规嵁瀛愰儴闂ㄦ煡璇㈡墍灞炵殑鐖剁被閮ㄩ棬锛屽苟鎷兼帴鎴愬瓧绗︿覆褰㈠紡锛岃繑鍥�
+ public String getDeptObjectAllByDeptId(DeptInfo obj) throws PLException {
+ String fetchDepName = "";
+ DeptInfo[] depObjectAll = platformClientUtil.getFrameworkService().fetchDepartmentInfosBySonId(obj.id);
+ for(int i=depObjectAll.length-1;i>=0; i--){
+ fetchDepName += depObjectAll[i].name+"/";
+ }
+ if(fetchDepName.length() != 0){
+ fetchDepName = fetchDepName.substring(0, fetchDepName.length() - 1);
+ }
+ return fetchDepName;
+ }
}
--
Gitblit v1.9.3