From 56de7a42d2567ce72885be8ebb1d1250d68ddd1b Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 16 八月 2024 17:53:34 +0800 Subject: [PATCH] 业务类型接口联调调整,首页系统模块配置查询接口上传 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java | 5 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java | 12 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java | 48 ---- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java | 14 + Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json | 91 +++++++++ Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 21 +- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 244 ++++++++++++++--------- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java | 27 ++ Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java | 2 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 21 - Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java | 15 + Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java | 2 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java | 36 +++ Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java | 8 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java | 2 15 files changed, 367 insertions(+), 181 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java index 4ac72ba..0e185a2 100644 --- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java +++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java @@ -86,11 +86,6 @@ private String lifeCycleId; /** - * 鐢熷懡鍛ㄦ湡鐨勪腑鏂囧悕绉� - */ - private String lifeCycleName; - - /** * 鐗堟瑙勫垯 */ private String versionRule; @@ -104,11 +99,6 @@ * 澶囩敤鐢熷懡鍛ㄦ湡鑻辨枃鍚嶇О */ private String subLifeCycleId; - - /** - * 澶囩敤鐢熷懡鍛ㄦ湡涓枃鍚嶇О - */ - private String subLifeCycleName; /** * 鏄惁涓鸿鍥� @@ -136,14 +126,9 @@ private String delimiter; /** - * 娣诲姞鎴栬�呯Щ闄ょ殑灞炴�т俊鎭� - */ - private List<OsBtmTypeLinkAttributesDTO> attributes; - - /** * 娣诲姞鎴栫Щ闄ょ殑灞炴�� */ - private String[] apNameArray; + private String apNameArray; /** * 鏃堕棿鎴筹紝鐢ㄤ簬鏍¢獙鏄惁鏈�鏂版暟鎹� @@ -170,11 +155,11 @@ */ private Date lastModifyTime; - public void setApNameArray(String[] apNameArray) { + public void setApNameArray(String apNameArray) { this.apNameArray = apNameArray; } - public String[] getApNameArray() { + public String getApNameArray() { return apNameArray; } @@ -338,14 +323,6 @@ this.versionRule = versionRule; } - public List<OsBtmTypeLinkAttributesDTO> getAttributes() { - return attributes; - } - - public void setAttributes(List<OsBtmTypeLinkAttributesDTO> attributes) { - this.attributes = attributes; - } - public Date getTs() { return ts; } @@ -386,28 +363,12 @@ this.lifeCycleId = lifeCycleId; } - public String getLifeCycleName() { - return lifeCycleName; - } - - public void setLifeCycleName(String lifeCycleName) { - this.lifeCycleName = lifeCycleName; - } - public String getSubLifeCycleId() { return subLifeCycleId; } public void setSubLifeCycleId(String subLifeCycleId) { this.subLifeCycleId = subLifeCycleId; - } - - public String getSubLifeCycleName() { - return subLifeCycleName; - } - - public void setSubLifeCycleName(String subLifeCycleName) { - this.subLifeCycleName = subLifeCycleName; } public String getClassFullName() { @@ -436,14 +397,11 @@ ", implClass='" + implClass + '\'' + ", shape='" + shape + '\'' + ", lifeCycleId='" + lifeCycleId + '\'' + - ", lifeCycleName='" + lifeCycleName + '\'' + ", versionRule='" + versionRule + '\'' + ", subLifeCycleId='" + subLifeCycleId + '\'' + - ", subLifeCycleName='" + subLifeCycleName + '\'' + ", viewFlag=" + viewFlag + ", viewCreateSql='" + viewCreateSql + '\'' + ", classFullName='" + classFullName + '\'' + - ", attributes=" + attributes + ", ts=" + ts + '}'; } diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java index 48769fb..473c411 100644 --- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java +++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java @@ -33,7 +33,6 @@ */ private Boolean hasChildren; - /** * 鑿滃崟缂栧彿 */ @@ -103,11 +102,25 @@ * 鏄惁鏂扮獥鍙f墦寮� */ private String isOpenName; + + /** + * 鍙拡瀵逛簬棣栭〉绯荤粺妯″潡閰嶇疆浣跨敤锛岀敤浜庡尯鍒嗙偣鍑讳笉鍚岀殑鑺傜偣锛屽睍寮�鐨勪笉鍚屾煡璇㈤�昏緫 + */ + private String modeType; + /** * 鍓嶇鏄惁闅愯棌 */ private HashMap<String,Boolean> meta = new HashMap<>(); + public String getModeType() { + return modeType; + } + + public void setModeType(String modeType) { + this.modeType = modeType; + } + public String getId() { return id; } diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java index b03a021..f2cf29e 100644 --- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java +++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeAttributeVO.java @@ -53,7 +53,7 @@ /** * 鏁版嵁绫诲瀷 */ - private String attrDataType; + private String attributeDataType; /** * 鏄惁鍙互涓虹┖ @@ -191,12 +191,12 @@ this.description = description; } - public String getAttrDataType() { - return attrDataType; + public String getAttributeDataType() { + return attributeDataType; } - public void setAttrDataType(String attrDataType) { - this.attrDataType = attrDataType; + public void setAttributeDataType(String attributeDataType) { + this.attributeDataType = attributeDataType; } public boolean isReferFlag() { @@ -379,7 +379,7 @@ ", name='" + name + '\'' + ", attributeLength=" + attributeLength + ", description='" + description + '\'' + - ", attrDataType='" + attrDataType + '\'' + + ", attributeDataType='" + attributeDataType + '\'' + ", nullableFlag=" + nullableFlag + ", defaultValue='" + defaultValue + '\'' + ", precisionLength=" + precisionLength + diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java index 0804d92..8ba5e9e 100644 --- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java +++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java @@ -1,5 +1,7 @@ package com.vci.pagemodel; +import com.vci.starter.web.pagemodel.Tree; + import java.util.Date; import java.util.List; diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java index dcf7cc8..8106ccf 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java @@ -1,9 +1,11 @@ package com.vci.frameworkcore.compatibility; +import com.vci.common.exception.VciException; import com.vci.corba.common.PLException; import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum; import com.vci.pagemodel.MenuVO; import com.vci.pagemodel.SmFunctionVO; +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.pagemodel.Tree; @@ -52,13 +54,23 @@ List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException; /** + * 閫氳繃妯″潡ID鑾峰彇瀛愮骇鍒楄〃 + * @param parentId + * @param isAll 鏄惁鍖呮嫭鏃犳晥鐨勬ā鍧楋紝true鍒欏寘鎷� + * @return + * @throws VciBaseException + */ + List<MenuVO> getSysModelTreeMenuByPID(String parentId,boolean isAll) throws VciBaseException; + + int checkChildObject(String moduleId) throws VciException; + + /** * 鑾峰彇鎵�鏈夌殑鍔熻兘鑿滃崟 * @param treeQueryObject 鏍戞煡璇㈠璞� * @param resourceControlTypeEnum 瑙掕壊鎺у埗鍖哄煙锛屼篃鏄姛鑳芥帶鍒剁殑鍖哄煙 * @return 鏍戣妭鐐癸紝鍑虹幇閿欒浼氬湪寮傚父澶勭悊鍣ㄤ腑缁熶竴杩斿洖Json */ List<Tree> treeAllMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum); - /** * 閫氳繃涓婄骇鑺傜偣鑾峰彇涓嬬骇鐨勬墍鏈夌殑鑿滃崟鑺傜偣 diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java index ec3221a..1f6c4de 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java @@ -2,8 +2,13 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.vci.client.ClientSession; +import com.vci.common.exception.VciException; +import com.vci.common.locale.LocaleDisplay; import com.vci.corba.common.PLException; +import com.vci.corba.framework.data.FuncOperationInfo; import com.vci.corba.framework.data.FunctionInfo; +import com.vci.corba.framework.data.OperateInfo; import com.vci.corba.framework.data.RoleRightInfo; import com.vci.corba.omd.data.BusinessObject; import com.vci.corba.portal.data.PLUILayout; @@ -14,13 +19,13 @@ import com.vci.pagemodel.MenuVO; import com.vci.pagemodel.SmFunctionVO; import com.vci.omd.utils.ObjectTool; -import com.vci.pagemodel.SmFunctionVO; import com.vci.starter.web.constant.QueryOptionConstant; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.*; import com.vci.starter.web.util.VciBaseUtil; import com.vci.starter.web.wrapper.VciQueryWrapperForDO; import com.vci.pagemodel.UIContentVO; +import com.vci.web.properties.JsonConfigReader; import com.vci.web.service.UIEngineServiceI; import com.vci.web.service.WebBoServiceI; import com.vci.web.util.Func; @@ -279,107 +284,156 @@ } functionVOList.add(functionVO); } + //濡傛灉鏄紑鍙戞垨鑰呮祴璇曠敤鎴凤紝闇�鍝熻幏鍙栫郴缁熸ā鍧楅厤缃彍鍗� if(adminOrDeveloperOrRoot){ - functionVOList.addAll(this.getSystemMenu()); + //鑾峰彇棣栭〉绯荤粺妯″潡閰嶇疆鑿滃崟 + MenuVO menuVO = JsonConfigReader.getMenuVO(); + functionVOList.add(menuVO); } return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList()); } /** - * 鑾峰彇棣栭〉绯荤粺妯″潡閰嶇疆鑿滃崟 + * 閫氳繃妯″潡ID鑾峰彇瀛愮骇鍒楄〃 + * @param parentId + * @param isAll 鏄惁鍖呮嫭鏃犳晥鐨勬ā鍧楋紝true鍒欏寘鎷� + * @return + * @throws VciBaseException + */ + @Override + public List<MenuVO> getSysModelTreeMenuByPID(String parentId,boolean isAll) throws VciBaseException{ + List<MenuVO> menuVOList = new ArrayList<>(); + if(Func.isBlank(parentId)){ + return menuVOList; + } + if(parentId.equals("mangeModel") || parentId.equals("businessModel")){ + if(parentId.equalsIgnoreCase("FunctionObject")){ + try { + /**鍒ゆ柇璇ユā鍧椾笅瀛愬璞℃槸妯″潡杩樻槸鎿嶄綔锛�0琛ㄧず鏃犲瓙鑺傜偣锛�1琛ㄧず鏄ā鍧楋紝2琛ㄧず鏄搷浣�**/ + int childType = this.checkChildObject(parentId); + if(childType == 2){ + try{ + FuncOperationInfo[] infos = platformClientUtil.getFrameworkService().getFuncOperationByModule(parentId, "", false); + for(int i = 0;i < infos.length ;i++){ + FuncOperationInfo info = infos[i]; + MenuVO menuVO = new MenuVO(); + menuVO.setId(info.id); + menuVO.setCode(info.funcId); + menuVO.setId(info.operId); + menuVO.setName(info.operName); + //menuVO.setOperIndentify(info.operIndentify); + menuVO.setAlias(info.operAlias); + menuVO.setRemark(info.operDesc); + menuVO.setSort((int) info.number); + //menuVO.setIsValid(info.isValid); + menuVO.setHasChildren(false); + menuVOList.add(menuVO); + } + }catch (PLException e) { + e.printStackTrace(); + throw new VciBaseException(String.valueOf(e.code), e.messages); + } + }else if(childType == 1){ + try{ + FunctionInfo[] funcInfos = platformClientUtil.getFrameworkService().getModuleListByParentId(parentId, isAll); + for(int i = 0;i < funcInfos.length; i++){ + FunctionInfo funcInfo = funcInfos[i]; + MenuVO menuVO = this.functionInfoToMenuVO(funcInfo); + menuVOList.add(menuVO); + } + }catch (PLException e) { + e.printStackTrace(); + throw new VciBaseException(String.valueOf(e.code),e.messages); + } + } + } catch (Exception e) { + e.printStackTrace(); + throw new VciBaseException("妯″潡鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+VciBaseUtil.getExceptionMessage(e)); + } + }else{ + try{ + FunctionInfo[] funcInfos = platformClientUtil.getFrameworkService().getModuleListByParentId(parentId, isAll); + for(int i = 0;i < funcInfos.length; i++){ + FunctionInfo funcInfo = funcInfos[i]; + MenuVO menuVO = this.functionInfoToMenuVO(funcInfo); + menuVO.setModeType("FunctionObject"); + menuVOList.add(menuVO); + } + }catch (PLException e) { + e.printStackTrace(); + throw new VciBaseException(String.valueOf(e.code),e.messages); + } + } + }else if(parentId.equals("operateType")){ + //鍔犺浇鎵�鏈夋搷浣� + try{ + OperateInfo[] operateInfos = platformClientUtil.getFrameworkService().getOperateTreeList(parentId); + for(int i = 0; i < operateInfos.length;i++ ){ + OperateInfo operateInfo = operateInfos[i]; + MenuVO menuVO = new MenuVO(); + menuVO.setId(operateInfo.id); + menuVO.setName(operateInfo.name); + menuVO.setCode(operateInfo.identify); + menuVO.setAlias(operateInfo.alias); + menuVO.setCategory(2); + menuVO.setRemark(operateInfo.desc); + menuVO.getMeta().put("keepAlive",false); + menuVO.setSort((int) operateInfo.seq); + menuVO.setModeType("operateObject"); + menuVO.setHasChildren(false); + menuVOList.add(menuVO); + } + }catch (PLException e) { + e.printStackTrace(); + throw new VciBaseException(String.valueOf(e.code),new String[]{VciBaseUtil.getExceptionMessage(e)}); + } + } + return menuVOList; + } + + /** + * functionInfo杞琕O瀵硅薄 + * @param funcInfo * @return */ - private List<MenuVO> getSystemMenu(){ - /*濡傛灉鏄祴璇曡处鍙锋垨鑰呭紑鍙戣处鍙凤紝澶勭悊杩斿洖systemManagmentNode鍜宮odelManagmentNode浠ュ锛� - 杩橀渶瑕佽繑鍥炴搷浣滅被鍨嬬鐞嗚彍鍗曡妭鐐癸紙operateNode锛夊拰绯荤粺閰嶇疆銆佺郴缁熻繍琛岀洃鎺ц妭鐐�*/ - List<MenuVO> functionVOList = new ArrayList<>(); - String menuJson = "{\n" + - " \"hasChildren\": true,\n" + - " \"children\": [\n" + - " {\n" + - " \"hasChildren\": true,\n" + - " \"children\": [],\n" + - " \"id\": \"systemManagmentNode\",\n" + - " \"name\": \"绠$悊鍔熻兘妯″潡\",\n" + - " \"parentId\": \"VCIBaseTreeNode\",\n" + - " \"code\": \"systemManagmentNode\",\n" + - " \"alias\": \"system\",\n" + - " \"meta\": {\n" + - " \"keepAlive\": false\n" + - " },\n" + - " \"sort\": 2,\n" + - " \"soruce\": \"\"\n" + - " },\n" + - " {\n" + - " \"hasChildren\": true,\n" + - " \"children\": [],\n" + - " \"id\": \"modelManagmentNode\",\n" + - " \"name\": \"涓氬姟鍔熻兘妯″潡\",\n" + - " \"parentId\": \"VCIBaseTreeNode\",\n" + - " \"code\": \"modelManagmentNode\",\n" + - " \"alias\": \"model\",\n" + - " \"meta\": {\n" + - " \"keepAlive\": false\n" + - " },\n" + - " \"sort\": 3,\n" + - " \"soruce\": \"\"\n" + - " },\n" + - " {\n" + - " \"hasChildren\": true,\n" + - " \"children\": [],\n" + - " \"id\": \"operateNode\",\n" + - " \"name\": \"鎿嶄綔绫诲瀷绠$悊\",\n" + - " \"parentId\": \"VCIBaseTreeNode\",\n" + - " \"code\": \"operateNode\",\n" + - " \"alias\": \"operate\",\n" + - " \"meta\": {\n" + - " \"keepAlive\": false\n" + - " },\n" + - " \"sort\": 4,\n" + - " \"soruce\": \"\"\n" + - " },\n" + - " {\n" + - " \"hasChildren\": false,\n" + - " \"children\": [],\n" + - " \"id\": \"sysOptionNode\",\n" + - " \"name\": \"绯荤粺閰嶇疆\",\n" + - " \"parentId\": \"VCIBaseTreeNode\",\n" + - " \"code\": \"sysOptionNode\",\n" + - " \"alias\": \"sysOption\",\n" + - " \"meta\": {\n" + - " \"keepAlive\": false\n" + - " },\n" + - " \"sort\": 5,\n" + - " \"soruce\": \"\"\n" + - " },\n" + - " {\n" + - " \"hasChildren\": false,\n" + - " \"children\": [],\n" + - " \"id\": \"sysMonitorNode\",\n" + - " \"name\": \"绯荤粺杩愯鐩戞帶\",\n" + - " \"parentId\": \"VCIBaseTreeNode\",\n" + - " \"code\": \"sysMonitorNode\",\n" + - " \"alias\": \"sysMonitor\",\n" + - " \"meta\": {\n" + - " \"keepAlive\": false\n" + - " },\n" + - " \"sort\": 5,\n" + - " \"soruce\": \"\"\n" + - " }\n" + - " ],\n" + - " \"id\": \"VCIBaseTreeNode\",\n" + - " \"name\": \"绯荤粺妯″潡閰嶇疆\",\n" + - " \"parentId\": \"\",\n" + - " \"code\": \"rootNode\",\n" + - " \"alias\": \"root\",\n" + - " \"meta\": {\n" + - " \"keepAlive\": false\n" + - " },\n" + - " \"sort\": 1,\n" + - " \"soruce\": \"\"\n" + - "}"; - functionVOList.add(JSON.parseObject(menuJson, MenuVO.class)); - return functionVOList; + private MenuVO functionInfoToMenuVO(FunctionInfo funcInfo){ + MenuVO menuVO = new MenuVO(); + menuVO.setId(funcInfo.id); + menuVO.setSource(funcInfo.image); + //if(StringUtils.isBlank(menu.resourceB)){ + // continue; + //} + menuVO.setPath(funcInfo.resourceB); + menuVO.setParentId(funcInfo.parentId); + menuVO.setCode(funcInfo.aliasName); + menuVO.setAlias(funcInfo.aliasName); + menuVO.setName(funcInfo.name); + menuVO.getMeta().put("keepAlive",false); + menuVO.setSort((int) funcInfo.seq); + if(this.checkChildObject(menuVO.getId()) == 0){ + menuVO.setHasChildren(false); + }else{ + menuVO.setHasChildren(true); + } + return menuVO; + } + + /** + * 閫氳繃妯″潡ID妫�鏌ヨ妯″潡瀛愮骇瀵硅薄鏄ā鍧楄繕鏄搷浣� + * @param moduleId + * @return 0琛ㄧず娌℃湁妯″潡涔熸病鏈夋搷浣滐紝1琛ㄧず鏈夋ā鍧楋紝2琛ㄧず鏈夋搷浣� + * @throws VciException + */ + @Override + public int checkChildObject(String moduleId) throws VciBaseException { + long res = 0; + try{ + res = ClientSession.getFrameworkService().checkChildObject(moduleId); + }catch (PLException e) { + e.printStackTrace(); + throw new VciBaseException(String.valueOf(e.code),e.messages); + } + return (int)res; } public List<MenuVO> findChildFunctionVO(String parentOid,Map<String, List<FunctionInfo>> map) throws PLException { @@ -723,6 +777,7 @@ } return dataGrid(queryMap,pageHelper); } + /** * 鎵归噺鏍规嵁瑙掕壊鐨勪富閿幏鍙栧叧鑱旂殑鏉冮檺 * @@ -755,7 +810,6 @@ } return gridFunctionByRoleOid(roleOidCollection.stream().collect(Collectors.joining(",")), queryMap,pageHelper,resourceControlTypeEnum,false); } - /** * 娓呴櫎缂撳瓨 diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java index 87f6987..7e9968d 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java @@ -6,8 +6,12 @@ import com.vci.pagemodel.MenuVO; import com.vci.pagemodel.SmFunctionVO; import com.vci.starter.web.annotation.controller.VciUnCheckRight; +import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.*; import com.vci.pagemodel.UIContentVO; +import com.vci.starter.web.util.VciBaseUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,6 +33,10 @@ @Autowired private ISmFunctionQueryService functionQueryService; + /** + * 鏃ュ織 + */ + private Logger logger = LoggerFactory.getLogger(getClass()); /** * 鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗� @@ -41,6 +49,25 @@ } /** + * 鑾峰彇褰撳墠妯″潡涓嬬殑瀛愭ā鍧� + * @param parentId + * @return + * @throws PLException + */ + @GetMapping("/getSysModelTreeMenuByPID") + @VciUnCheckRight + public List<MenuVO> getSysModelTreeMenuByPID(String parentId) { + try { + return functionQueryService.getSysModelTreeMenuByPID(parentId,true); + }catch (Exception e){ + e.printStackTrace(); + String errorMsg = "鏌ヨ瀛愭ā鍧楁椂鍑虹幇閿欒锛屽師鍥狅細"+VciBaseUtil.getExceptionMessage(e); + logger.error(errorMsg); + throw new VciBaseException(errorMsg); + } + } + + /** * 鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗� * @param treeQueryObject 鏍戞煡璇㈠璞� * @return 鏍戣妭鐐癸紝鍑虹幇閿欒浼氬湪寮傚父澶勭悊鍣ㄤ腑缁熶竴杩斿洖Json diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java index 5e6f1f0..270d46a 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java @@ -54,7 +54,6 @@ @RequestMapping("/btmTypeController") @VciBusinessLog(modelName="涓氬姟绫诲瀷") @RestController -@VciUnCheckRight public class WebBtmTypeController { /** @@ -191,7 +190,7 @@ * btmTypeDTO 閾炬帴绫诲瀷淇敼鐨勫璞� * @return 淇濆瓨缁撴灉 */ - @PostMapping("/updateBtmType") + @PutMapping("/updateBtmType") public BaseResult updateBtmType(@RequestBody OsBtmTypeDTO btmTypeDTO){ try { return btmService.updateBtmType(btmTypeDTO) ? BaseResult.success("涓氬姟绫诲瀷淇敼鎴愬姛锛�"):BaseResult.fail("涓氬姟绫诲瀷淇敼澶辫触锛�"); @@ -469,7 +468,7 @@ OsBtmTypeAttributeVO attributeVO = new OsBtmTypeAttributeVO(); BeanUtil.convert(attr,attributeVO); attributeVO.setAttributeLength(attr.getAttrLength()); - attributeVO.setAttrDataType(attr.getAttributeDataType()); + attributeVO.setAttributeDataType(attr.getAttributeDataType()); attributeVO.setReferBtmTypeId(attr.getBtmTypeId()); attributeVO.setReferBtmTypeName(attr.getBtmTypeName()); finalBoAttrs.add(attributeVO); diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java new file mode 100644 index 0000000..840d4f0 --- /dev/null +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java @@ -0,0 +1,36 @@ +package com.vci.web.properties; + +import com.alibaba.fastjson.JSON; +import com.vci.pagemodel.MenuVO; +import org.apache.commons.io.FileUtils; +import org.springframework.util.ResourceUtils; + +import java.io.*; + +/** + * 璇诲彇json閰嶇疆鏂囦欢锛岃彍鍗曠瓑 + * @author ludc + * @date 2024/8/16 10:09 + */ +public class JsonConfigReader { + + /** + * 鑿滃崟json閰嶇疆鏂囦欢锛屽鏈夊叾浠栭渶瑕佽鍙栫殑锛屽彲浠ヤ豢鐓у綋鍓嶉�昏緫缂栧啓 + */ + private static MenuVO menuVO; + + static{ + try { + File file = ResourceUtils.getFile("classpath:menuConfig.json"); + String json = FileUtils.readFileToString(file, "UTF-8"); + menuVO = JSON.parseObject(json, MenuVO.class); + }catch (IOException e) { + e.printStackTrace(); + } + } + + public static MenuVO getMenuVO() { + return menuVO; + } + +} diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java index 3c5921f..3f0f4d3 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java @@ -232,7 +232,7 @@ BeanUtil.convert(attributeVO,btmTypeAttributeVO); btmTypeAttributeVO.setPkBtmType(vo.getOid()); btmTypeAttributeVO.setBtmTypeId(vo.getId()); - btmTypeAttributeVO.setAttrDataType(attributeVO.getAttributeDataType()); + btmTypeAttributeVO.setAttributeDataType(attributeVO.getAttributeDataType()); btmTypeAttributeVO.setAttributeLength(attributeVO.getAttrLength()); btmTypeAttributeVO.setDefaultValue(attributeVO.getDefaultValue()); if("secretgrade".equalsIgnoreCase(attributeVO.getId())){ @@ -385,7 +385,7 @@ attributeService.getDefaultAttributeVOs().stream().forEach(attr->{ OsBtmTypeAttributeVO attributeVO = new OsBtmTypeAttributeVO(); BeanUtil.convert(attr, attributeVO); - attributeVO.setAttrDataType(attr.getAttributeDataType()); + attributeVO.setAttributeDataType(attr.getAttributeDataType()); attributeVO.setAttributeLength(attr.getAttrLength()); attributeVO.setReferBtmTypeId(attr.getBtmTypeId()); attributeVO.setReferBtmTypeName(attr.getBtmTypeName()); @@ -648,7 +648,7 @@ AttributeDef sysAttributeDef = collect.get(attrName.toLowerCase()); OsBtmTypeAttributeVO vo = new OsBtmTypeAttributeVO(); vo.setOid(sysAttributeDef.oid); - vo.setAttrDataType(sysAttributeDef.vtDataType); + vo.setAttributeDataType(sysAttributeDef.vtDataType); vo.setPkBtmType(btmName); vo.setCreateTime(new Date(sysAttributeDef.createTime)); vo.setCreator(sysAttributeDef.creator); @@ -667,7 +667,7 @@ for (AttributeDef attribute : attributeDefs) { OsBtmTypeAttributeVO vo = new OsBtmTypeAttributeVO(); vo.setOid(attribute.oid); - vo.setAttrDataType(attribute.vtDataType); + vo.setAttributeDataType(attribute.vtDataType); vo.setPkBtmType(btmName); vo.setCreateTime(new Date(attribute.createTime)); vo.setCreator(attribute.creator); @@ -695,6 +695,7 @@ */ private BizType dto2BizType(OsBtmTypeDTO dto){ BizType bizType = new BizType(); + bizType.oid = dto.getOid(); bizType.name =dto.getId(); bizType.isAbstract = dto.isAbstractFlag(); bizType.label = dto.getName(); @@ -710,24 +711,24 @@ } bizType.description = dto.getDescription(); bizType.revLevel = dto.getRevLevel(); - bizType.revRuleName = dto.getRevisionRuleId(); bizType.revInput = dto.isInputRevisionFlag(); bizType.delimiter = (dto.getDelimiter() == null ? "" : dto.getDelimiter()); - bizType.verRuleName = Short.parseShort(dto.getVersionRule()); + bizType.verRuleName = Func.isBlank(dto.getVersionRule()) ? 0:Short.parseShort(dto.getVersionRule()); //bizType.imageName = dto.get; //List<String> attrIdList = dto.getAttributesDTOList().stream().map(OsBtmTypeLinkAttributesDTO::getId).collect(Collectors.toList()); - bizType.apNameArray = dto.getApNameArray();//attrIdList.toArray(new String[attrIdList.size()]); + bizType.apNameArray = dto.getApNameArray().split(",");//attrIdList.toArray(new String[attrIdList.size()]); String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(); long timeMillis = System.currentTimeMillis(); bizType.creator = Func.isBlank(dto.getCreator()) ? userId:dto.getCreator(); bizType.createTime = Func.isEmpty(dto.getCreateTime()) ? timeMillis:dto.getCreateTime().getTime(); bizType.modifier = userId; bizType.modifyTime = timeMillis; + bizType.ts = Func.isEmpty(dto.getTs())? timeMillis:dto.getTs().getTime(); return bizType; } @@ -856,14 +857,14 @@ checkRevLevel(dbBizType,btmTypeDTO); checkVersionInfo(btmTypeDTO); //澶勭悊涓氬姟绫诲瀷涓嬬殑灞炴�� - List<String> lastAttrList = new ArrayList<>(Arrays.asList(btmTypeDTO.getApNameArray())); + List<String> lastAttrList = new ArrayList<>(Arrays.asList(btmTypeDTO.getApNameArray().split(","))); //涓嶈兘绉婚櫎鐨勫睘鎬� String[] unRemovableFields = null; List<String> unRemovableFields_ = null; //闇�瑕佺Щ闄ょ殑灞炴�� List<String> removableFields = null; //淇敼鍓嶄笟鍔$被鍨嬪湪鏁版嵁搴撲腑宸插瓨鍦ㄧ殑鎵�鏈夊睘鎬� - String[] apNameArray = btmTypeDTO.getApNameArray(); + String[] apNameArray = btmTypeDTO.getApNameArray().split(","); Set<String> dbApNameArray = Arrays.stream(dbBizType.apNameArray) .collect(Collectors.toSet()); //杩囨护鍑洪渶瑕佺Щ闄ょ殑灞炴�� @@ -1481,7 +1482,7 @@ if(StringUtils.isBlank(bizType.getfName())){ continue; } - if(bizType.getfName().equals(parentBIzType.getName())){ + if(bizType.getfName().equals(parentBIzType.getId())){ Tree tree = new Tree(); tree.setOid(bizType.getOid()); tree.setParentName(parentBIzType.getfName()); diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java index 70e4ff8..2bbb45b 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java @@ -412,7 +412,7 @@ if(StringUtils.isBlank(idAttr.getName())){ idAttr.setName("缂栧彿"); } - idAttr.setAttrDataType(VciFieldTypeEnum.VTString.name()); + idAttr.setAttributeDataType(VciFieldTypeEnum.VTString.name()); if(idAttr.getAttributeLength() == null || idAttr.getAttributeLength() <= 0){ idAttr.setAttributeLength(50); } @@ -426,7 +426,7 @@ if(StringUtils.isBlank(nameAttr.getName())){ nameAttr.setName("鍚嶇О"); } - nameAttr.setAttrDataType(VciFieldTypeEnum.VTString.name()); + nameAttr.setAttributeDataType(VciFieldTypeEnum.VTString.name()); if(nameAttr.getAttributeLength() == null || nameAttr.getAttributeLength() <= 0){ nameAttr.setAttributeLength(150); } @@ -440,7 +440,7 @@ if(StringUtils.isBlank(descAttr.getName())){ descAttr.setName("鎻忚堪"); } - descAttr.setAttrDataType(VciFieldTypeEnum.VTString.name()); + descAttr.setAttributeDataType(VciFieldTypeEnum.VTString.name()); if(descAttr.getAttributeLength() == null || descAttr.getAttributeLength() <= 0){ descAttr.setAttributeLength(250); } @@ -455,7 +455,7 @@ if(VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(attributeBO.getId())){ attributeBO.setName("鐘舵��"); } - attributeBO.setVciAttrDataType(attr.getAttrDataType()); + attributeBO.setVciAttrDataType(attr.getAttributeDataType()); attributeBO.setNullable(String.valueOf(attr.isNullableFlag())); attributeBO.setAttrDataType(getAttrDateTypeFromVci(attributeBO.getVciAttrDataType())); attributeBO.setJdbcType(getJdbcTypeFromVci(attributeBO.getVciAttrDataType())); diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java index c9cf8d5..f69df86 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java @@ -319,7 +319,7 @@ } OsBtmTypeAttributeVO attributeVO = attributeVOMap.getOrDefault(attrId.toLowerCase(Locale.ROOT), null); if(attributeVO!=null){ - String vtType = attributeVO.getAttrDataType(); + String vtType = attributeVO.getAttributeDataType(); String attrType = ""; VciFieldTypeEnum fieldTypeEnum = VciFieldTypeEnum.forValue(vtType); if(fieldTypeEnum == null) { diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java index 95693ac..b8724f9 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java @@ -735,7 +735,7 @@ OsBtmTypeAttributeVO idAttrVO = new OsBtmTypeAttributeVO(); idAttrVO.setId("id"); idAttrVO.setName("缂栧彿"); - idAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name()); + idAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name()); idAttrVO.setAttributeLength(50); idAttrVO.setNullableFlag(true); attributes.add(idAttrVO); @@ -743,7 +743,7 @@ OsBtmTypeAttributeVO nameAttrVO = new OsBtmTypeAttributeVO(); nameAttrVO.setId("name"); nameAttrVO.setName("鍚嶇О"); - nameAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name()); + nameAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name()); nameAttrVO.setAttributeLength(50); nameAttrVO.setNullableFlag(true); attributes.add(nameAttrVO); @@ -751,7 +751,7 @@ OsBtmTypeAttributeVO descAttrVO = new OsBtmTypeAttributeVO(); descAttrVO.setId("description"); descAttrVO.setName("鎻忚堪"); - descAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name()); + descAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name()); descAttrVO.setAttributeLength(150); descAttrVO.setNullableFlag(true); attributes.add(descAttrVO); @@ -894,7 +894,7 @@ //鐒跺悗灞炴�х殑涓枃鍚嶇О rowDataList.add(new WriteExcelData(rowIndex, 3, attributeVO.getName())); //灞炴�х殑绫诲瀷 - rowDataList.add(new WriteExcelData(rowIndex, 4, VciFieldTypeEnum.getTextByValue(attributeVO.getAttrDataType()))); + rowDataList.add(new WriteExcelData(rowIndex, 4, VciFieldTypeEnum.getTextByValue(attributeVO.getAttributeDataType()))); //鏄惁鍙互涓虹┖ rowDataList.add(new WriteExcelData(rowIndex, 5, attributeVO.isNullableFlag() ? "鏄�" : "鍚�")); //灞炴�ч暱搴� @@ -1064,7 +1064,7 @@ } columnData.put(wordFieldProperties.getColumnId(),btmTypeAttributeVO.getId().toLowerCase()); columnData.put(wordFieldProperties.getColumnName(),btmTypeAttributeVO.getName()); - String attrDataType = btmTypeAttributeVO.getAttrDataType(); + String attrDataType = btmTypeAttributeVO.getAttributeDataType(); String columnType = VciFieldTypeEnum.getTextByValue(attrDataType); if(StringUtils.isBlank(columnType)){ columnType = "瀛楃涓�"; @@ -1194,15 +1194,8 @@ } else { btmItem.verRuleName = 0; } - //鍖呭惈鐨勫睘鎬х殑鏁扮粍 - List<OsBtmTypeLinkAttributesDTO> attributesDTOList = btmTypeDTO.getAttributes(); - List<String> attrIdList = new ArrayList<String>(); - if (!CollectionUtils.isEmpty(attributesDTOList)) { - for (OsBtmTypeLinkAttributesDTO attr : attributesDTOList) { - attrIdList.add(attr.getId().toLowerCase()); - } - } - btmItem.apNameArray = attrIdList.toArray(new String[0]); + //鍖呭惈鐨勫睘鎬у悕绉� + btmItem.apNameArray = btmTypeDTO.getApNameArray().split(","); } /** diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java index 0bddb66..64041e6 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java @@ -465,7 +465,7 @@ Collections.addAll(fields,btmTypeClass.getDeclaredFields()); List<OsBtmTypeLinkAttributesDTO> btmTypeLinkAttributesDTOList = new ArrayList<OsBtmTypeLinkAttributesDTO>(); scanAttributes(fields,attributeDTOMap,btmTypeLinkAttributesDTOList,processAttributeInfo); - btmTypeDTO.setAttributes(btmTypeLinkAttributesDTOList); + btmTypeDTO.setApNameArray(btmTypeLinkAttributesDTOList.stream().map(OsBtmTypeLinkAttributesDTO::getId).collect(Collectors.joining(","))); btmTypeDTOMap.put(btmTypeDTO.getId().toLowerCase().trim(),btmTypeDTO); } diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json new file mode 100644 index 0000000..ff3052b --- /dev/null +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json @@ -0,0 +1,91 @@ +{ + "hasChildren": true, + "children": [ + { + "hasChildren": true, + "children": [], + "id": "systemManagmentNode", + "name": "绠$悊鍔熻兘妯″潡", + "parentId": "VCIBaseTreeNode", + "code": "systemManagmentNode", + "alias": "system", + "meta": { + "keepAlive": false + }, + "sort": 2, + "soruce": "", + "path": "views/systemModel/mangeModel/index" + }, + { + "hasChildren": true, + "children": [], + "id": "modelManagmentNode", + "name": "涓氬姟鍔熻兘妯″潡", + "parentId": "VCIBaseTreeNode", + "code": "modelManagmentNode", + "alias": "model", + "meta": { + "keepAlive": false + }, + "sort": 3, + "soruce": "", + "path": "views/systemModel/businessModel/index" + }, + { + "hasChildren": true, + "children": [], + "id": "operateNode", + "name": "鎿嶄綔绫诲瀷绠$悊", + "parentId": "VCIBaseTreeNode", + "code": "operateNode", + "alias": "operate", + "meta": { + "keepAlive": false + }, + "sort": 4, + "soruce": "", + "path": "views/systemModel/operateType/index" + }, + { + "hasChildren": false, + "children": [], + "id": "sysOptionNode", + "name": "绯荤粺閰嶇疆", + "parentId": "VCIBaseTreeNode", + "code": "sysOptionNode", + "alias": "sysOption", + "meta": { + "keepAlive": false + }, + "sort": 5, + "soruce": "", + "path": "views/systemModel/systemConfig/index" + }, + { + "hasChildren": false, + "children": [], + "id": "sysMonitorNode", + "name": "绯荤粺杩愯鐩戞帶", + "parentId": "VCIBaseTreeNode", + "code": "sysMonitorNode", + "alias": "sysMonitor", + "meta": { + "keepAlive": false + }, + "sort": 5, + "soruce": "", + "path": "views/systemModel/systemMonitor/index" + } + ], + "id": "VCIBaseTreeNode", + "name": "绯荤粺妯″潡閰嶇疆", + "parentId": "systemManagmentNode", + "code": "rootNode", + "alias": "root", + "meta": { + "keepAlive": false + }, + "sort": 0, + "soruce": "", + "path": "" +} \ No newline at end of file -- Gitblit v1.9.3