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/OrgDeptQueryServiceImpl.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java | 92 ++++++++++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java | 11 +
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java | 10 +
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java | 5
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/bo/TreeWrapperOptions.java | 1
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java | 25 ----
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java | 30 +++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java | 43 +++++++-
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java | 3
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java | 18 +++
11 files changed, 193 insertions(+), 49 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/bo/TreeWrapperOptions.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/bo/TreeWrapperOptions.java
index eefb733..8780d54 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/bo/TreeWrapperOptions.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/bo/TreeWrapperOptions.java
@@ -22,6 +22,7 @@
* 澶氫釜鏄剧ず鏂囨湰鐨勫睘鎬ф椂鐨勫垎闅旂锛堟渶缁堟樉绀虹殑鍊肩殑鍒嗛殧绗︼級
*/
private String textValueSep = " ";
+
/**
* 涓婄骇鏁版嵁鐨勫睘鎬у悕绉�
*/
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
index 81af35d..b16511e 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
@@ -8,6 +8,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
* 缁熶竴鐨勬暟鎹繑鍥炲璞★紝淇濊瘉feign銆乺estTemplate鎴栬�呭叾浠杛est璇锋眰瀹㈡埛绔彲浠ョ粺涓�澶勭悊
@@ -84,7 +85,7 @@
/**
* 鏁版嵁锛宔asyui浣跨敤鐨剅ows, extjs鍜宭ayui榛樿涓篸ata;easyui涔熷彲浠ヤ慨鏀逛负data锛屽洜姝ゅ潎浣跨敤data
*/
- private Collection<T> data ;
+ private Collection<T> data;
/**
* 鏍戠殑鏁版嵁
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java
index 0ebbc69..8791b93 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmPwdStrategyQueryServiceI.java
@@ -30,13 +30,15 @@
* @param pageHelper
* @return
*/
- DataGrid<SmPasswordStrategyVO> refDataGrid(Map<String, String> conditionMap, PageHelper pageHelper);
+ DataGrid<SmPasswordStrategyVO> refDataGrid(Map<String, String> conditionMap, PageHelper pageHelper) throws PLException;
/**
- * 鏌ヨ鎵�鏈夊瘑鐮佸畨鍏ㄧ瓥鐣�
- * @return
+ * 鏌ヨ瀵嗙爜瀹夊叏绛栫暐锛屼笅鎷変娇鐢ㄧ殑鎺ュ彛
+ * @param conditionMap
+ * @return key涓哄瘑鐮佺瓥鐣ame锛寁alue涓哄瘑鐮佺瓥鐣ョ殑oid
+ * @throws VciBaseException
*/
- //List<SmPasswordStrategyVO> listPasswordStrategyVO(Map<String, String> conditionMap);
+ List<Map<String,String>> selectPwdStrategyMap(Map<String, String> conditionMap) throws PLException;
/**
* 淇濆瓨鐢ㄦ埛鍏宠仈瀵嗙爜绛栫暐
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 3d433a9..3f73e92 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
@@ -387,8 +387,9 @@
VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(conditionMap,OrgDeptForPlatform1.class);
orgDepartmentVOList = deptDO2VOs(boService.selectByQueryWrapper(queryWrapperForDO,OrgDeptForPlatform1.class));
}
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions("pkFatherDepartment");
+ TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions();
BeanUtil.convert(treeQueryObject,treeWrapperOptions);
+ treeWrapperOptions.setParentFieldName("pkFatherDepartment");
return revisionModelUtil.doList2Trees(orgDepartmentVOList,treeWrapperOptions,dept->{
return dept.getId() + " " + dept.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equals(dept.getLcStatus())?"銆愬仠鐢ㄣ��":"");
});
@@ -458,6 +459,5 @@
}
return true;
}
-
}
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..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
@@ -2,11 +2,18 @@
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;
@@ -79,8 +86,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;
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
index c71204f..4543a1b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
@@ -105,15 +105,13 @@
* @throws VciBaseException 鍙傛暟涓虹┖鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public DataGrid<SmRoleVO> gridRoles(Map<String, String> queryMap,
- PageHelper pageHelper) throws VciBaseException {
+ public DataGrid<SmRoleVO> gridRoles(Map<String, String> queryMap, PageHelper pageHelper) throws VciBaseException {
if(pageHelper == null){
pageHelper = new PageHelper(-1);
}
pageHelper.addDefaultAsc("plname");
VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(queryMap,SmRoleForPlatform1.class,pageHelper);
- //鎴戜滑涓嶈兘鏄剧ず涓夊憳鍜岀鐞嗗憳鐨勮鑹�
- queryWrapper.eq("pltype","2");
+ //queryWrapper.eq("pltype","2");
List<SmRoleForPlatform1> roleForPlatform1s = boService.selectByQueryWrapper(queryWrapper, SmRoleForPlatform1.class);
DataGrid<SmRoleVO> dataGrid = new DataGrid<>();
if(!CollectionUtils.isEmpty(roleForPlatform1s)){
@@ -522,25 +520,6 @@
public boolean saveRights(String userOid, String[] roleIds) throws PLException {
VciBaseUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭");
//roleIds鍏佽涓虹┖锛屼负绌烘椂娓呯┖褰撳墠鐢ㄦ埛鐨勬潈闄�
- //鍏堟煡閲�
- if(Func.isNotEmpty(roleIds)){
- List<String> repeatRoleOidList = new ArrayList<>();
- //寰幆杩涜鏌ラ噸锛岄伩鍏峣n澶т簬1000
- WebUtil.switchCollectionForOracleIn(Arrays.asList(roleIds)).stream().forEach(deptoids->{
- String sql = "select pluseruid,plroleuid from pluserrole where pluseruid = '" + userOid
- + "' and " + "plroleuid in ("+WebUtil.toInSql(deptoids.toArray(new String[0]))+")";
- List<BusinessObject> cbos = boService.queryBySql(sql, null);
- if(!CollectionUtils.isEmpty(cbos)){
- cbos.stream().forEach(cbo->{
- repeatRoleOidList.add(ObjectTool.getNewBOAttributeValue(cbo,"plroleuid"));
- });
- }
- });
- //绉婚櫎閲嶅鐨�
- List<String> tempList = new ArrayList<>(Arrays.asList(roleIds));
- tempList.removeAll(repeatRoleOidList);
- roleIds = tempList.toArray(new String[tempList.size()]);
- }
return platformClientUtil.getFrameworkService().saveRights(roleIds,new String[]{userOid},new UserEntityInfo());
}
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 da185df..46be906 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
@@ -1,17 +1,15 @@
package com.vci.frameworkcore.controller;
-import com.vci.corba.common.PLException;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -39,6 +37,7 @@
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refTree",method = RequestMethod.GET)
+ //@VciUnCheckRight
public BaseResult<Tree> refTree(TreeQueryObject treeQueryObject) throws VciBaseException{
List<Tree> deptTreeList = deptQueryService.refTreeDept(treeQueryObject);
return BaseResult.tree(deptTreeList);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
index 7e10c88..47b20fb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
@@ -3,6 +3,7 @@
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
@@ -15,6 +16,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* @author ludc
@@ -32,12 +35,13 @@
private SmPwdStrategyQueryServiceI pwdStrategyQueryService;
/**
- * 鐢ㄦ埛鐨勫垪琛ㄥ弬鐓э紝
- * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚簡鏌ヨ鏉′欢锛屽垎椤碉紝鎺掑簭绛�,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
- * @return 鏅�氱敤鎴凤紙涓嶅寘鍚笁鍛橈紝涔熶笉鍖呭惈鍋滅敤鐨勶級鐨勬樉绀哄璞″垪琛ㄦ暟鎹紝璇疯幏鍙栧叾涓殑data灞炴��
+ * 瀵嗙爜瀹夊叏绛栫暐鐨勫垪琛ㄥ弬鐓ф煡璇�
+ * @param queryObject 鏌ヨ鏉′欢
+ * @return
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refDataGrid",method = RequestMethod.GET)
+ @VciUnCheckRight
public BaseResult<SmPasswordStrategyVO> refDataGrid(BaseQueryObject queryObject) throws VciBaseException {
try {
DataGrid<SmPasswordStrategyVO> pwdStrategyVODataGrid = pwdStrategyQueryService.refDataGrid(queryObject.getConditionMap(),queryObject.getPageHelper());
@@ -50,6 +54,26 @@
}
}
+ /**
+ * 鏌ヨ瀵嗙爜瀹夊叏绛栫暐锛屼笅鎷変娇鐢ㄧ殑鎺ュ彛
+ * @param queryObject
+ * @return key涓哄瘑鐮佺瓥鐣ame锛寁alue涓哄瘑鐮佺瓥鐣ョ殑oid
+ * @throws VciBaseException
+ */
+ @RequestMapping(value = "/selectPwdStrategyMap",method = RequestMethod.GET)
+ @VciUnCheckRight
+ public BaseResult<List<Map<String,String>>> selectPwdStrategyMap(BaseQueryObject queryObject) throws VciBaseException {
+ try {
+ List<Map<String,String>> pwdStrategyVODataGrid = pwdStrategyQueryService.selectPwdStrategyMap(queryObject.getConditionMap());
+ return BaseResult.dataList(pwdStrategyVODataGrid);
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("瀵嗙爜瀹夊叏绛栫暐涓嬫媺鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("瀵嗙爜瀹夊叏绛栫暐涓嬫媺鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ }
+ }
+
@RequestMapping(value = "/saveUserPasswordStrateg",method = RequestMethod.POST)
public BaseResult saveUserPasswordStrateg(String[] userIds, String passwordStrategId){
try {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
index 8cbe7c2..3ba6449 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
@@ -2,6 +2,7 @@
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmRoleVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.VciBaseUtil;
@@ -39,14 +40,42 @@
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refDataGrid",method = RequestMethod.GET)
- public BaseResult<SmRoleVO> refDataGrid(BaseQueryObject queryObject) throws VciBaseException {
- if(queryObject == null){
- queryObject = new BaseQueryObject();
+ public BaseResult<SmRoleVO> refDataGrid(BaseQueryObject queryObject) {
+ try {
+ if(queryObject == null){
+ queryObject = new BaseQueryObject();
+ }
+ DataGrid<SmRoleVO> roleVODataGrid = roleQueryService.refGridRoles(queryObject.getConditionMap(),queryObject.getPageHelper());
+ return BaseResult.dataGrid(roleVODataGrid);
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("鏌ヨ瑙掕壊鍒楄〃鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("鏌ヨ瑙掕壊鍒楄〃鏃跺嚭鐜伴敊璇紝鍘熷洜" + exceptionMessage);
}
- DataGrid<SmRoleVO> roleVODataGrid = roleQueryService.refGridRoles(queryObject.getConditionMap(),queryObject.getPageHelper());
- return BaseResult.dataGrid(roleVODataGrid);
- //濡傛灉鏄�佺殑椤圭洰锛屽簲璇ュ湪refGridRoles涓婃坊鍔爐ry锛宑atch锛岀劧鍚巆atch閲屽簲璇ヤ娇鐢ㄤ笅闈㈢殑浠ｇ爜
- //BaseResult.fail("杩欓噷杩斿洖鍓嶇鐨勯敊璇俊鎭�");
+ }
+
+ /**
+ * 瑙掕壊鐨勫垪琛ㄦ煡璇細鐢ㄤ簬涓嬫媺锛岃繕鏈夊垪琛ㄧ瓑鍏ㄦ煡璇㈠満鏅�
+ * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚簡鏌ヨ鏉′欢锛屽垎椤碉紝鎺掑簭绛�,鍗冲厑璁镐娇鐢⊿mRoleVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠�
+ * @return 鍖呭惈涓夊憳鐨勮鑹� 鐨勬樉绀哄璞″垪琛ㄦ暟鎹紝璇疯幏鍙栧叾涓殑data灞炴��
+ * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
+ */
+ @RequestMapping(value = "/gridRoles",method = RequestMethod.GET)
+ //@VciUnCheckRight
+ public BaseResult<SmRoleVO> gridRoles(BaseQueryObject queryObject) {
+ try {
+ if(queryObject == null){
+ queryObject = new BaseQueryObject();
+ }
+ DataGrid<SmRoleVO> roleVOData = roleQueryService.gridRoles(queryObject.getConditionMap(),queryObject.getPageHelper());
+ return BaseResult.dataGrid(roleVOData);
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("鏌ヨ瑙掕壊鍒楄〃鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("鏌ヨ瑙掕壊鍒楄〃鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+exceptionMessage);
+ }
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java
index 6d8d369..343d71d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmPasswordStrategyForPlatform1.java
@@ -1,10 +1,15 @@
package com.vci.frameworkcore.model;
+import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
+import com.vci.starter.web.annotation.VciBtmType;
+import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
+
import java.util.Date;
/**
* 鍘熷钩鍙扮殑瀵嗙爜瀹夊叏绛栫暐
*/
+@VciBtmType(name = FrameWorkBtmTypeConstant.SM_PASSWORD_STRATEGY,tableName = "plpasswordstrategy",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
public class SmPasswordStrategyForPlatform1 {
/**
* 涓婚敭
@@ -22,7 +27,7 @@
private Integer plength;
/**
- *
+ * 鏈夋晥澶╂暟
*/
private Integer poverdueday;
@@ -77,7 +82,7 @@
private Integer pcharspecies;
/**
- * 璁稿彲
+ * 鎺堟潈鑰�
*/
private String pllicensors;
@@ -87,7 +92,7 @@
private Integer plmaxlength;
/**
- * 闇�瑕佺殑绫诲瀷
+ * 闇�瑕佺殑绫诲瀷(蹇呭～绉嶇被瀛楁)
*/
private Integer plrequiredtype;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java
index be33d9e..1b032a9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmPasswordStrategyVO.java
@@ -59,6 +59,22 @@
*/
private Integer requireCharCount;
+ /**
+ * 鎺堟潈鑰�
+ */
+ private String licensors;
+
+ public void setLicensors(String licensors) {
+ this.licensors = licensors;
+ }
+
+ public String getLicensors() {
+ return licensors;
+ }
+
+ public String getRequireCharType() {
+ return requireCharType;
+ }
public Integer getRequireCharCount() {
return requireCharCount;
@@ -124,7 +140,7 @@
this.maxLength = maxLength;
}
- public String getRequireCharType() {
+ public String getRequireCharType(Integer plrequiredtype) {
return requireCharType;
}
--
Gitblit v1.9.3