From b183736b9b8ec60e2be39a3ef99f7ef0f6708f80 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 09 七月 2024 09:51:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 96 insertions(+), 3 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 e0f7987..36e1db7 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
@@ -2,17 +2,25 @@
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.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.omd.utils.ObjectTool;
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.util.WebThreadLocalUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.Func;
@@ -79,8 +87,89 @@
* @return
*/
@Override
- public DataGrid<SmPasswordStrategyVO> refDataGrid(Map<String, String> conditionMap, PageHelper pageHelper) {
- return null;
+ 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;
}
/**
@@ -93,7 +182,11 @@
public boolean saveUserPasswordStrateg(String[] userIds, String passwordStrategId) throws PLException {
VciBaseUtil.alertNotNull(userIds,"鐢ㄦ埛涓婚敭",passwordStrategId,"瀵嗙爜瀹夊叏绛栫暐涓婚敭");
//TODO锛氳繖閲屾病鏈夊仛鏌ラ噸澶勭悊锛屾槑澶╄寰楅獙璇佷竴涓嬭繖鍎挎槸涓嶆槸浼氳嚜鍔ㄥ仛saveOrUpdate鐨勫鐞�
- return platformClientUtil.getFrameworkService().saveUserPasswordStrateg(userIds,passwordStrategId,new UserEntityInfo());
+ return platformClientUtil.getFrameworkService().saveUserPasswordStrateg(
+ userIds,
+ passwordStrategId,
+ new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(),null)
+ );
}
/**
--
Gitblit v1.9.3