From d45e6830c15541053b4d5be1c47afe14842e630a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 六月 2024 17:59:19 +0800
Subject: [PATCH] 用户管理界面，增加部门查询、角色下拉查询、分配密码策略接口，联调修改代码上传
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java | 134 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 9 deletions(-)
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 5aac379..e9a2c13 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
@@ -1,22 +1,29 @@
package com.vci.frameworkcore.compatibility.impl;
import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.UserEntityInfo;
+import com.vci.corba.framework.data.PasswordStrategyInfo;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.model.OrgDeptForPlatform1;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
+import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.frameworkcore.enumpck.RoleClassifyEnum;
+import com.vci.frameworkcore.enumpck.RoleControlAreaEnum;
+import com.vci.frameworkcore.model.SmPasswordStrategyDO;
+import com.vci.frameworkcore.model.SmPasswordStrategyForPlatform1;
+import com.vci.frameworkcore.model.SmRoleForPlatform1;
import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.omd.utils.ObjectTool;
-import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.model.SmPasswordStrategyDO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.Func;
+import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +31,7 @@
import org.springframework.util.CollectionUtils;
import java.util.*;
-import java.util.function.Function;
import java.util.stream.Collectors;
-
import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
@@ -50,6 +55,12 @@
private SmUserQueryServiceI smUserQueryService;
/**
+ * 骞冲彴璋冪敤瀹㈡埛绔�
+ */
+ @Autowired
+ private PlatformClientUtil platformClientUtil;
+
+ /**
* 鑾峰彇榛樿瀵嗙爜绛栫暐
* @return
*/
@@ -66,6 +77,111 @@
return pwdStrategyDO2VO(passwordStrategyDO);
}
return null;
+ }
+
+ /**
+ * 瀵嗙爜绛栫暐鍒嗛〉鏌ヨ
+ * @param conditionMap
+ * @param pageHelper
+ * @return
+ */
+ @Override
+ public DataGrid<SmPasswordStrategyVO> refDataGrid(Map<String, String> conditionMap, PageHelper pageHelper) throws PLException {
+ if(pageHelper == null){
+ pageHelper = new PageHelper(-1);
+ }
+ pageHelper.addDefaultAsc("pname");
+ VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap, SmPasswordStrategyDO.class,pageHelper);
+ //queryWrapper.eq("pltype","2");
+ platformClientUtil.getFrameworkService().fetchAllPasswordStrategy();
+ //platformClientUtil.getFrameworkService().fetchpassword();
+ List<SmPasswordStrategyForPlatform1> smPasswordStrategyForPlatform1s = boService.selectByQueryWrapper(queryWrapper, SmPasswordStrategyForPlatform1.class);
+ DataGrid<SmPasswordStrategyVO> dataGrid = new DataGrid<>();
+ if(!CollectionUtils.isEmpty(smPasswordStrategyForPlatform1s)){
+ dataGrid.setData(pltPwdStrategy2SmPwdStrategyVOs(smPasswordStrategyForPlatform1s));
+ dataGrid.setTotal(boService.countByQueryWrapper(queryWrapper,SmPasswordStrategyForPlatform1.class));
+ }
+ return dataGrid;
+ }
+
+ /**
+ * 鏌ヨ瀵嗙爜瀹夊叏绛栫暐锛屼笅鎷変娇鐢ㄧ殑鎺ュ彛
+ * @param conditionMap
+ * @return key涓哄瘑鐮佺瓥鐣ame锛寁alue涓哄瘑鐮佺瓥鐣ョ殑oid
+ * @throws VciBaseException
+ */
+ @Override
+ public List<Map<String,String>> selectPwdStrategyMap(Map<String, String> conditionMap) throws PLException {
+ PageHelper pageHelper = new PageHelper(-1);
+ pageHelper.addDefaultAsc("plname");
+ PasswordStrategyInfo[] passwordStrategyInfos = platformClientUtil.getFrameworkService().fetchAllPasswordStrategy();
+ List<Map<String,String>> mapArrayList = new ArrayList<>();
+ if(Func.isEmpty(passwordStrategyInfos)){
+ return mapArrayList;
+ }
+ Arrays.stream(passwordStrategyInfos).forEach(item->{
+ Map<String, String> map = new HashMap<>();
+ map.put("name",item.name);
+ map.put("id",item.id);
+ mapArrayList.add(map);
+ });
+ return mapArrayList;
+ }
+
+ /**
+ * 鍘熷钩鍙板瘑鐮佺瓥鐣ヨ浆SmPasswordStrategyVOS瀵硅薄
+ * @param smPasswordStrategyForPlatform1s 鍘熷钩鍙扮殑瀵嗙爜绛栫暐
+ * @return
+ */
+ private List<SmPasswordStrategyVO> pltPwdStrategy2SmPwdStrategyVOs(List<SmPasswordStrategyForPlatform1> smPasswordStrategyForPlatform1s){
+ List<SmPasswordStrategyVO> smPasswordStrategyVOList = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(smPasswordStrategyForPlatform1s)){
+ smPasswordStrategyForPlatform1s.stream().forEach(s -> {
+ smPasswordStrategyVOList.add(pltPwdStrategy2SmPwdStrategyVO(s));
+ });
+ }
+ return smPasswordStrategyVOList;
+ }
+
+ /**
+ * 鍘熷钩鍙板瘑鐮佺瓥鐣ヨ浆SmPasswordStrategyVO瀵硅薄
+ * @param strategyForPlatform1 鍘熷钩鍙扮殑瀵嗙爜绛栫暐
+ * @return 鏂扮殑瀵嗙爜绛栫暐瀵硅薄
+ */
+ private SmPasswordStrategyVO pltPwdStrategy2SmPwdStrategyVO(SmPasswordStrategyForPlatform1 strategyForPlatform1){
+ SmPasswordStrategyVO strategyVO = new SmPasswordStrategyVO();
+ strategyVO.setOid(strategyForPlatform1.getPluid());
+ strategyVO.setId("");
+ strategyVO.setName(strategyForPlatform1.getPname());
+ strategyVO.setMaxLength(strategyForPlatform1.getPlmaxlength());
+ strategyVO.setMinLength(strategyForPlatform1.getPlength());
+ strategyVO.setValidDay(strategyForPlatform1.getPremindday());
+ strategyVO.setRemindDay(strategyForPlatform1.getPremindday());
+ strategyVO.setRetryTime(strategyForPlatform1.getPretrytime());
+ strategyVO.setLockTime(strategyForPlatform1.getPlocktime());
+ strategyVO.setDefaultFlag(strategyForPlatform1.getPlisdefault() == 1);
+ strategyVO.setDescription(strategyForPlatform1.getPldesc());
+ strategyVO.setCreateTime(strategyForPlatform1.getPlcreatetime());
+ strategyVO.setCreator(strategyForPlatform1.getPlcreateuser());
+ strategyVO.setLastModifyTime(strategyForPlatform1.getPlupdatetime());
+ strategyVO.setLastModifier(strategyForPlatform1.getPlupdateuser());
+ strategyVO.getRequireCharType(strategyForPlatform1.getPcharspecies());
+ strategyVO.setLicensors(strategyForPlatform1.getPllicensors());
+ strategyVO.setRequireCharCount(strategyForPlatform1.getPlrequiredtype());
+ return strategyVO;
+ }
+
+ /**
+ * 淇濆瓨鐢ㄦ埛鍏宠仈瀵嗙爜绛栫暐
+ * @param userIds
+ * @param passwordStrategId
+ * @return
+ */
+ @Override
+ public boolean saveUserPasswordStrateg(String[] userIds, String passwordStrategId) throws PLException {
+ VciBaseUtil.alertNotNull(userIds,"鐢ㄦ埛涓婚敭",passwordStrategId,"瀵嗙爜瀹夊叏绛栫暐涓婚敭");
+ //TODO锛氳繖閲屾病鏈夊仛鏌ラ噸澶勭悊锛屾槑澶╄寰楅獙璇佷竴涓嬭繖鍎挎槸涓嶆槸浼氳嚜鍔ㄥ仛saveOrUpdate鐨勫鐞�
+ return platformClientUtil.getFrameworkService().saveUserPasswordStrateg(userIds,passwordStrategId,new UserEntityInfo());
}
/**
@@ -163,10 +279,10 @@
@Override
public SmPasswordStrategyVO getPasswordStrategyVOByUserOid(String userOid) throws PLException {
WebUtil.alertNotNull(userOid,"鐢ㄦ埛鐨勪富閿�");
- if(smUserQueryService.checkUserExist(null,userOid)){
+ if(!smUserQueryService.checkUserExist(null,userOid)){
throw new VciBaseException(DATA_OID_NOT_EXIST);
}
- String sql = "select plpasswordstrategyuid,pluseruid from pluserpasswordstrategy where pluseruid = '"+ userOid +"')";
+ String sql = "select plpasswordstrategyuid,pluseruid from pluserpasswordstrategy where pluseruid = '"+ userOid +"'";
List<BusinessObject> cbos = boService.queryBySql(sql, null);
if(Func.isNotEmpty(cbos)){
return getPasswordStrategyVOByOid(ObjectTool.getNewBOAttributeValue(cbos.get(0), "plpasswordstrategyuid"));
--
Gitblit v1.9.3