PLTWEB.git - Gitblit

			@@ -1,5 +1,7 @@
			package com.vci.web.service.impl;

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.vci.common.utility.ObjectUtility;
			import com.vci.corba.common.PLException;
			import com.vci.corba.common.data.UserEntityInfo;
			@@ -1075,6 +1077,7 @@
			break;
			}

			d.setNavigatorType(pdVO.getNavigatorType());
			d = setEventDataToPLDefination(d,pdVO);
			//转xml赋值到plDefination中
			pd.plDefination = UITools.getPLDefinationText(d);
			@@ -1191,7 +1194,7 @@
			d = ulci.getNewPLDefination(d);
			break;
			}

			d.setNavigatorType(pdVO.getNavigatorType());
			d = setEventDataToPLDefination(d,pdVO);
			pd.plDefination = UITools.getPLDefinationText(d);

			@@ -1366,7 +1369,7 @@
			*/
			@Override
			public BaseResult addTabButton(PLTabButtonVO tabButtonVO) {
			boolean res = this.saveOrUpdateTapButton(tabButtonVO, true);
			boolean res = this.saveOrUpdateTabButton(tabButtonVO, true);
			return res ? BaseResult.success("按钮配置添加成功！"):BaseResult.success("按钮配置添加失败！");
			}

			@@ -1377,7 +1380,7 @@
			*/
			@Override
			public BaseResult updateTabButton(PLTabButtonVO tabButtonVO) {
			boolean res = this.saveOrUpdateTapButton(tabButtonVO, false);
			boolean res = this.saveOrUpdateTabButton(tabButtonVO, false);
			return res ? BaseResult.success("按钮配置修改成功！"):BaseResult.success("按钮配置修改失败！");
			}

			@@ -1387,11 +1390,10 @@
			* @return
			*/
			@Override
			public boolean saveOrUpdateTapButton(PLTabButtonVO tabButtonVO,boolean isAdd){
			VciBaseUtil.alertNotNull(tabButtonVO,"按钮配置对象",tabButtonVO.getLabel(),"参数名称");
			public boolean saveOrUpdateTabButton(PLTabButtonVO tabButtonVO,boolean isAdd){
			VciBaseUtil.alertNotNull(tabButtonVO,"按钮配置对象",tabButtonVO.getLabel(),"参数名称",tabButtonVO.getTableOId(),"页面定义主键");
			//检查当前添加的列表是否重复，但是这儿只支持单条数据保存，所有当前列表判重可以前端来做
			//String btnParamValidate = this.geCheckRes();

			if (tabButtonVO.getSeq() < 1 \|\| tabButtonVO.getSeq() > 63) {
			throw new VciBaseException("按序号超出范围，请修改，按钮【编号】只能在【1-63】范围内。");
			}
			@@ -1467,7 +1469,7 @@
			platformClientUtil.getUIService().savePLCommandParameter(plCommandParameter);
			} catch (PLException e) {
			e.printStackTrace();
			throw new VciBaseException("保存按钮信息时发生异常："+ e.getMessage());
			throw new VciBaseException("保存按钮参数时发生异常："+ e.getMessage());
			}
			}
			}
			@@ -1788,8 +1790,13 @@
			convertTreeDOO2Map(treeList,allTreeMap);
			List<RoleRightDTO> roleRightDTOList = new ArrayList<>();
			List<Tree> selectTreeList = uiAuthorDTO.getSelectTreeList();
			List<Tree> selectTreeList2 = this.authTreeListConvert(selectTreeList);
			getSelectedRoleRightObjs_old(uiAuthorDTO.getRoleId(),selectTreeList2,allTreeMap,roleRightDTOList);
			List<Tree> filterSelectTreeList = this.authTreeListConvert(selectTreeList);
			//过滤出选择的按钮
			List<String> checkButtonList = selectTreeList.stream()
			.filter(item -> item.getData() instanceof PLTabButton \|\| item.isLeaf())
			.map(item -> item.getOid()).collect(Collectors.toList());

			getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),filterSelectTreeList,checkButtonList,allTreeMap,roleRightDTOList);
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			String currentUserName = sessionInfo.getUserId();
			//boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
			@@ -1811,7 +1818,6 @@
			* @param selectTreeList
			*/
			private List<Tree> authTreeListConvert(List<Tree> selectTreeList){

			// 创建一个包含另一个集合中满足条件的 oid 的集合
			List<String> validOids = selectTreeList.stream()
			.filter(Tree::isChecked) // checked 为 true
			@@ -1830,19 +1836,20 @@
			* @param allTreeMap
			* @param roleRightDTOList
			*/
			private void getSelectedRoleRightObjs_old(String roleOid, List<Tree> selectTreeList, HashMap<String,Tree> allTreeMap, List<RoleRightDTO> roleRightDTOList){
			private void getSelectedRoleRightObjs(String roleOid, List<Tree> selectTreeList, List<String> checkButtonList, HashMap<String,Tree> allTreeMap, List<RoleRightDTO> roleRightDTOList){
			Map<String,RoleRightDTO> roleRightDTOMap = new HashMap<>();

			if(!CollectionUtil.isEmpty(selectTreeList)){
			selectTreeList.stream().forEach(tree -> {
			String oid = tree.getOid();
			if(allTreeMap.containsKey(oid)){
			tree = allTreeMap.get(oid);
			Object data = tree.getData();
			Object data = tree.getData();
			if (data instanceof String) {
			getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//向下获取所有模块的权限值
			getRightValue(roleOid, tree, allTreeMap, checkButtonList,false, roleRightDTOMap);//向下获取所有模块的权限值
			} else if (!(data instanceof PLTabButton)) {//业务类型
			getRightValue(roleOid, tree, allTreeMap, true, roleRightDTOMap);//向上处理
			getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//向下处理（包含当前节点）
			getRightValue(roleOid, tree, allTreeMap, checkButtonList, true, roleRightDTOMap);//向上处理
			getRightValue(roleOid, tree, allTreeMap, checkButtonList, false, roleRightDTOMap);//向下处理（包含当前节点）
			} else if (data instanceof PLTabButton) {//按钮
			String parrentId=tree.getParentId();
			if(allTreeMap.containsKey(parrentId)){
			@@ -1851,7 +1858,7 @@
			boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
			Tree parentNode= allTreeMap.get(parrentId);
			String funcId = parentNode.getOid();
			getRightValue(roleOid, tree, allTreeMap, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
			getRightValue(roleOid, parentNode, allTreeMap, checkButtonList, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
			if(!roleRightDTOMap.containsKey(funcId)){
			RoleRightDTO roleRightDTO = new RoleRightDTO();
			roleRightDTO.setId(ObjectUtility.getNewObjectID36());//主键
			@@ -1862,7 +1869,7 @@
			}else{
			roleRightDTO.setRightType((short) 2);
			}
			roleRightDTO.setRightValue(countRightValue(parentNode,false));// 权限值，没有操作的模块权限值存储为0
			roleRightDTO.setRightValue(countRightValue(parentNode,checkButtonList,false));// 权限值，没有操作的模块权限值存储为0
			roleRightDTO.setRoleId(roleOid);//角色ID
			roleRightDTO.setCreateUser(currentUserName);//创建者
			roleRightDTO.setCreateTime(VciDateUtil.date2Str(new Date(),""));//创建时间
			@@ -1891,16 +1898,18 @@
			* 获取权限
			* @param isUp 是否是向上获取，如果是向上获取，传进来的必然是模块节点，且上级模块必然是没有选中
			*/
			private void getRightValue(String roleId,Tree node,HashMap<String,Tree> allTreeMap,boolean isUp,Map<String,RoleRightDTO> rightMap){
			private void getRightValue(String roleId,Tree node,Map<String,Tree> allTreeMap,List<String> checkButton,boolean isUp,Map<String,RoleRightDTO> rightMap){
			SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
			String currentUserName = sessionInfo.getUserId();
			boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
			String id=ObjectUtility.getNewObjectID36();
			Object data=node.getData();
			if(isUp) {//向上获取，存储每个上级模块的权限值
			while (!"root".equals(node.getData())){
			data=node.getData();
			String oid=node.getOid();
			String parentId = node.getParentId();
			Tree parentNode = allTreeMap.get(parentId);
			while (!"root".equals(parentNode.getData())){
			data=parentNode.getData();
			String oid=parentNode.getOid();
			if(allTreeMap.containsKey(oid)){
			String funcId = "";
			if (data instanceof BizType) {
			@@ -1937,9 +1946,9 @@
			if(!rightMap.containsKey(funcId)){
			rightMap.put(funcId, roleRightDTO);
			}
			oid= node.getParentId();
			oid = parentNode.getParentId();
			if(allTreeMap.containsKey(oid)) {
			node=allTreeMap.get(oid);
			parentNode = allTreeMap.get(oid);
			}
			}
			}
			@@ -1983,14 +1992,14 @@
			}
			for (int i = 0; i < node.getChildren().size(); i++) {
			//对每个子向下递归遍历
			getRightValue(roleId, node.getChildren().get(i), allTreeMap, false, rightMap);
			getRightValue(roleId, node.getChildren().get(i), allTreeMap, checkButton,false, rightMap);
			}
			} else {
			if (!rightMap.containsKey(funcId)) {
			RoleRightDTO roleRightDTO = new RoleRightDTO();
			roleRightDTO.setFuncId(funcId);
			roleRightDTO.setRightType((short) 2); // 设置UI权限
			roleRightDTO.setRightValue(countRightValue(node, true));//没有操作的模块权限值存储为0
			roleRightDTO.setRightValue(countRightValue(node, checkButton,true));//没有操作的模块权限值存储为0
			roleRightDTO.setRoleId(roleId);

			roleRightDTO.setCreateUser(currentUserName);
			@@ -2010,11 +2019,12 @@
			* @param isAll 是否子级全部选中
			* @return
			*/
			private long countRightValue(Tree node,boolean isAll){
			private long countRightValue(Tree node,List<String> checkButton,boolean isAll){
			long value = 0;
			for(int i = 0; i < node.getChildren().size(); i++){
			Tree childNode = (Tree)node.getChildren().get(i);
			if(isAll \|\| node.getData() instanceof PLTabButton ){
			//node.getData() instanceof PLTabButton这儿应该换成是否是选中的按钮节点
			if(isAll \|\| checkButton.contains(node.getOid())){
			PLTabButton obj = (PLTabButton)childNode.getData();
			value += (long)Math.pow(2, obj.plSeq);//累计加上各个操作的权限值
			}
			@@ -3341,11 +3351,10 @@
			*/
			protected boolean checkQTIsExist(String tip, String txtQTName, String txtType) throws PLException {
			boolean res = false;

			String sql = "select count(1) count_ from PL_QTEMPLATE qt " +
			"where qt.btmname ='" + txtType.trim() + "' " +
			"and qt.qtname='" + txtQTName.trim() + "'";

			res = checkCountNotEqualZero(sql);
			if(!res){
			throw new PLException("500",
			new String[]{String.format("%s %s 无效！", tip, txtQTName)});
			@@ -3530,7 +3539,7 @@
			*/
			private boolean checkLinkTypeInputIsOk(String txtVIName/选择的模板/,String txtQTName/查询模板/,String btmType) throws PLException {
			boolean res = false;
			if(!(this.checkBtmTypeTxtIsOk("目标对象", linkType,true))){
			if(!(this.checkLinkTypeTxtIsOk("目标对象", linkType,true))){
			res = false;
			} else if(!(this.checkPortalVITxtIsOk("选择模板", txtVIName, linkType,true))){
			res = false;