Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java

@@ -46,16 +46,6 @@
    private String revisionRuleId;

    /**
     * ç‰ˆæœ¬è§„则的名称
     */
    private String revisionRuleName;

    /**
     * åˆ†éš”符
     */
    private String revisionSep;

    /**
     * æ˜¯å¦æ‰‹åŠ¨è¾“入版本
     */
    private boolean inputRevisionFlag;
@@ -96,11 +86,6 @@
    private String lifeCycleId;

    /**
     * ç”Ÿå‘½å‘¨æœŸçš„中文名称
     */
    private String lifeCycleName;

    /**
     * ç‰ˆæ¬¡è§„则
     */
    private String versionRule;
@@ -114,11 +99,6 @@
     * å¤‡ç”¨ç”Ÿå‘½å‘¨æœŸè‹±æ–‡åç§°
     */
    private String subLifeCycleId;

    /**
     * å¤‡ç”¨ç”Ÿå‘½å‘¨æœŸä¸­æ–‡åç§°
     */
    private String subLifeCycleName;

    /**
     * æ˜¯å¦ä¸ºè§†å›¾
@@ -146,14 +126,9 @@
    private String delimiter;

    /**
     * æ·»åŠ æˆ–者移除的属性信息
     */
    private List<OsBtmTypeLinkAttributesDTO> attributesDTOList;

    /**
     * æ·»åŠ æˆ–移除的属性
     */
    private String[] apNameArray;
    private String apNameArray;

    /**
     * æ—¶é—´æˆ³ï¼Œç”¨äºŽæ ¡éªŒæ˜¯å¦æœ€æ–°æ•°æ®
@@ -180,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;
    }

@@ -284,22 +259,6 @@
        this.revisionRuleId = revisionRuleId;
    }

    public String getRevisionRuleName() {
        return revisionRuleName;
    }

    public void setRevisionRuleName(String revisionRuleName) {
        this.revisionRuleName = revisionRuleName;
    }

    public String getRevisionSep() {
        return revisionSep;
    }

    public void setRevisionSep(String revisionSep) {
        this.revisionSep = revisionSep;
    }

    public boolean isInputRevisionFlag() {
        return inputRevisionFlag;
    }
@@ -364,14 +323,6 @@
        this.versionRule = versionRule;
    }

    public List<OsBtmTypeLinkAttributesDTO> getAttributesDTOList() {
        return attributesDTOList;
    }

    public void setAttributesDTOList(List<OsBtmTypeLinkAttributesDTO> attributesDTOList) {
        this.attributesDTOList = attributesDTOList;
    }

    public Date getTs() {
        return ts;
    }
@@ -412,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() {
@@ -453,8 +388,7 @@
                ", tableName='" + tableName + '\'' +
                ", description='" + description + '\'' +
                ", revisionRuleId='" + revisionRuleId + '\'' +
                ", revisionRuleName='" + revisionRuleName + '\'' +
                ", revisionSep='" + revisionSep + '\'' +
                ", delimiter='" + delimiter + '\'' +
                ", inputRevisionFlag=" + inputRevisionFlag +
                ", abstractFlag=" + abstractFlag +
                ", revisionFlag=" + revisionFlag +
@@ -463,14 +397,11 @@
                ", implClass='" + implClass + '\'' +
                ", shape='" + shape + '\'' +
                ", lifeCycleId='" + lifeCycleId + '\'' +
                ", lifeCycleName='" + lifeCycleName + '\'' +
                ", versionRule='" + versionRule + '\'' +
                ", subLifeCycleId='" + subLifeCycleId + '\'' +
                ", subLifeCycleName='" + subLifeCycleName + '\'' +
                ", viewFlag=" + viewFlag +
                ", viewCreateSql='" + viewCreateSql + '\'' +
                ", classFullName='" + classFullName + '\'' +
                ", attributesDTOList=" + attributesDTOList +
                ", ts=" + ts +
                '}';
    }

 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 @@
     * æ˜¯å¦æ–°çª—口打开
     */
    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;
    }

 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 +

 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;

@@ -54,11 +56,6 @@
     * ç‰ˆæœ¬è§„则的名称
     */
    private String revisionRuleName;

    /**
     * åˆ†éš”符
     */
    private String revisionSep;

    /**
     * æ˜¯å¦æ‰‹åŠ¨è¾“入版本
@@ -123,7 +120,7 @@
    /**
     * å¤‡ç”¨ç”Ÿå‘½å‘¨æœŸè‹±æ–‡åç§°
     */
    private String subLifeCycleId;
    private String lifeCycleIds;

    /**
     * å¤‡ç”¨ç”Ÿå‘½å‘¨æœŸä¸­æ–‡åç§°
@@ -268,14 +265,6 @@

    public void setRevisionRuleName(String revisionRuleName) {
        this.revisionRuleName = revisionRuleName;
    }

    public String getRevisionSep() {
        return revisionSep;
    }

    public void setRevisionSep(String revisionSep) {
        this.revisionSep = revisionSep;
    }

    public boolean isInputRevisionFlag() {
@@ -423,12 +412,12 @@
        this.lifeCycleName = lifeCycleName;
    }

    public String getSubLifeCycleId() {
        return subLifeCycleId;
    public String getLifeCycleIds() {
        return lifeCycleIds;
    }

    public void setSubLifeCycleId(String subLifeCycleId) {
        this.subLifeCycleId = subLifeCycleId;
    public void setLifeCycleIds(String lifeCycleIds) {
        this.lifeCycleIds = lifeCycleIds;
    }

    public String getSubLifeCycleName() {
@@ -481,7 +470,7 @@
                ", description='" + description + '\'' +
                ", revisionRuleId='" + revisionRuleId + '\'' +
                ", revisionRuleName='" + revisionRuleName + '\'' +
                ", revisionSep='" + revisionSep + '\'' +
                ", delimiter='" + delimiter + '\'' +
                ", inputRevisionFlag=" + inputRevisionFlag +
                ", revisionRuleVO=" + revisionRuleVO +
                ", abstractFlag=" + abstractFlag +
@@ -493,7 +482,7 @@
                ", lifeCycleId='" + lifeCycleId + '\'' +
                ", lifeCycleName='" + lifeCycleName + '\'' +
                ", versionRule='" + versionRule + '\'' +
                ", subLifeCycleId='" + subLifeCycleId + '\'' +
                ", lifeCycleIds='" + lifeCycleIds + '\'' +
                ", subLifeCycleName='" + subLifeCycleName + '\'' +
                ", viewFlag=" + viewFlag +
                ", viewCreateSql='" + viewCreateSql + '\'' +

 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);


    /**
     * é€šè¿‡ä¸Šçº§èŠ‚点获取下级的所有的菜单节点

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java

@@ -1,8 +1,14 @@
package com.vci.frameworkcore.compatibility.impl;

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;
@@ -13,14 +19,16 @@
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;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.RightControlUtil;
import com.vci.web.util.WebUtil;
@@ -51,9 +59,17 @@
    /**
     * èœå•çš„根节点主键，这个是平台定义的
     */
    private final String ROOT_MENU_Id  = "modelManagmentNode";
    private final String ROOT_MENU_ID  = "modelManagmentNode";

    /**
     * ç®¡ç†åŠŸèƒ½æ¨¡å—菜单根节点
     */
    private final String SYSTEMMANAGMENTNODE = "systemManagmentNode";

    /**
     * æ“ä½œç±»åž‹ç®¡ç†èœå•æ ¹èŠ‚点
     */
    private final String OPERATENODE = "operateNode";

    /**
     * ä½¿ç”¨ç”¨æˆ·æŸ¥è¯¢
@@ -81,6 +97,7 @@

    @Autowired
    RightControlUtil rightControlUtil;

    /**
     * æŸ¥è¯¢æ‰€æœ‰çš„功能
     *
@@ -216,20 +233,23 @@
    public List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
        SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
        String parentId;

        if (rightControlUtil.isAdminOrDeveloperOrRoot(sessionInfo.getUserId())) {
        boolean adminOrDeveloperOrRoot = rightControlUtil.isAdminOrDeveloperOrRoot(sessionInfo.getUserId());
        if (adminOrDeveloperOrRoot) {
            // ç³»ç»Ÿèœå•
            parentId = "systemManagmentNode" ;
            parentId = SYSTEMMANAGMENTNODE;
        } else if (rightControlUtil.isThreeAdminCurUser()) {
            parentId = "systemManagmentNode" ;
            //三员返回管理功能模块相关的菜单
            parentId = SYSTEMMANAGMENTNODE;
        } else {
            parentId = "modelManagmentNode" ;
            //普通用户只返回业务功能模块相关的菜单
            parentId = ROOT_MENU_ID;
        }
        RoleRightInfo[] userRoleRights = rightControlUtil.getRoleRightByUserName(sessionInfo.getUserId());
        Map<String, List<FunctionInfo>> map = rightControlUtil.getAllChildrenFunctionsByUserName(
                parentId, sessionInfo.getUserId(), userRoleRights);

        List<MenuVO> functionVOList = new ArrayList<>();
        if(CollectionUtils.isEmpty(map.get(parentId))){
        if(Func.isEmpty(map.get(parentId))) {
            return functionVOList;
        }
        for (FunctionInfo menu : map.get(parentId)) {
@@ -249,7 +269,14 @@
            functionVO.setName(menu.name);
            functionVO.getMeta().put("keepAlive",false);
            functionVO.setSort((int) menu.seq);
            try {
            functionVO.setChildren(findChildFunctionVO(menu.id, map));
            } catch (PLException e) {
                e.printStackTrace();
                String errorMsg = "菜单查询时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
                logger.error(errorMsg);
                throw new VciBaseException(errorMsg);
            }
            if(functionVO.getChildren().size() > 0){
                functionVO.setHasChildren(true);
            }else {
@@ -257,7 +284,156 @@
            }
            functionVOList.add(functionVO);
        }
        //如果是开发或者测试用户，需哟获取系统模块配置菜单
        if(adminOrDeveloperOrRoot){
            //获取首页系统模块配置菜单
            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转VO对象
     * @param funcInfo
     * @return
     */
    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 {
@@ -294,7 +470,6 @@
        return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
    }


    @Override
    public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
        SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
@@ -309,9 +484,6 @@
        }
        return null;
    }




    /**
     * èŽ·å–所有的功能菜单
@@ -341,7 +513,7 @@
            List<Tree> childList = new ArrayList<>();
            functionVOList.stream().forEach(s -> {
                Tree tree = DO2Tree(s);
                if (tree.getParentId() == null || tree.getParentId().equals(rootId) || ROOT_MENU_Id.equalsIgnoreCase(tree.getParentId())) {
                if (tree.getParentId() == null || tree.getParentId().equals(rootId) || ROOT_MENU_ID.equalsIgnoreCase(tree.getParentId())) {
                    rootList.add(tree);
                } else {
                    childList.add(tree);
@@ -605,6 +777,7 @@
        }
        return dataGrid(queryMap,pageHelper);
    }

    /**
     * æ‰¹é‡æ ¹æ®è§’色的主键获取关联的权限
     *
@@ -637,7 +810,6 @@
        }
        return gridFunctionByRoleOid(roleOidCollection.stream().collect(Collectors.joining(",")), queryMap,pageHelper,resourceControlTypeEnum,false);
    }


    /**
     * æ¸…除缓存

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLinkTypeController.java

@@ -272,8 +272,8 @@
     * @return
     */
    @PostMapping("/impData")
    @VciUnCheckRight
    public BaseResult impData(MultipartFile file){try {
    public BaseResult impData(MultipartFile file){
        try {
             return linkTypeService.impData(file);
        }catch (Throwable e) {
            throw new VciBaseException(VciBaseUtil.getExceptionMessage(e),new String[0],e);

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java

@@ -124,7 +124,7 @@

    /**
     * æŸ¥è¯¢æ¡ä»¶çš„查询按钮查询lis列表
     * @param dataMap ä¼ è¾“的数据对象：
     * @param qtInfoDTO ä¼ è¾“的数据对象：
     *                linkTypeName é“¾æŽ¥ç±»åž‹åç§°ã€
     *                rdPositive æ–¹å‘，true正向，false反向
     *                btmName ä¸šåŠ¡ç±»åž‹åç§°
@@ -134,10 +134,10 @@
     *                level å­èŠ‚点层数
     * @return æŸ¥è¯¢ç»“æžœ
     */
    @GetMapping("/getCriteria")
    public BaseResult getCriteria(@RequestBody HashMap<String,Object> dataMap){
    @PostMapping("/getCriteria")
    public BaseResult getCriteria(@RequestBody QTInfoDTO qtInfoDTO){
        try {
            return quereyTemplateServiceI.getCriteria(dataMap);
            return quereyTemplateServiceI.getCriteria(qtInfoDTO);
        } catch (PLException e) {
            BaseResult objectBaseResult = new BaseResult<>();
            objectBaseResult.setCode(Integer.parseInt(e.code));
@@ -202,4 +202,60 @@
            return objectBaseResult;
        }
    }

    /**
     * é“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿æ ‘查询，用于界面的导出功能
     * @return æŸ¥è¯¢ç»“æžœ
     */
    @GetMapping("/getLinkTree")
    public BaseResult getLinkTree(){
        try {
            return quereyTemplateServiceI.getLinkTree();
        } catch (PLException e) {
            BaseResult objectBaseResult = new BaseResult<>();
            objectBaseResult.setCode(Integer.parseInt(e.code));
            objectBaseResult.setMsg(Arrays.toString(e.messages));
            return objectBaseResult;
        }
    }
    /**
     * å¯¼å‡ºé“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿
     * names æŸ¥è¯¢æ¨¡æ¿å
     * @return
     */
    @PostMapping("/expLinkTemplate")
    public void expLinkTemplate(@RequestBody List<String> names,HttpServletResponse response) throws PLException, IOException {
        quereyTemplateServiceI.expLinkTemplate(names, response);
    }

    /**
     * å¯¼å…¥é“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿
     * @param file ä¸Šä¼ çš„文件
     * @return å¯¼å…¥ç»“æžœ
     */
    @PostMapping("/impLinkTemplate")
    public BaseResult impLinkTemplate(MultipartFile file){
        try {
            return quereyTemplateServiceI.impLinkTemplate(file);
        }catch (Throwable e) {
            throw new VciBaseException(VciBaseUtil.getExceptionMessage(e),new String[0],e);
        }
    }

    /**
     * æŸ¥è¯¢æ–¹æ¡ˆåˆ é™¤
     * @param templateNames æŸ¥è¯¢æ–¹æ¡ˆå
     * @return æ“ä½œç»“æžœ
     */
    @DeleteMapping("/deleteLinkTemplate")
    public BaseResult deleteLinkTemplate(@RequestBody List<String> templateNames){
        try {
            return quereyTemplateServiceI.deleteLinkTemplate(templateNames);
        } catch (PLException e) {
            BaseResult objectBaseResult = new BaseResult<>();
            objectBaseResult.setCode(Integer.parseInt(e.code));
            objectBaseResult.setMsg(Arrays.toString(e.messages));
            return objectBaseResult;
        }
    }
}

 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

 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);

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/LinkQTExportData.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.vci.web.other;

import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;

import com.vci.corba.omd.ltm.LinkType;
import com.vci.corba.omd.qtm.QTD;
import com.vci.corba.omd.qtm.QTInfo;
import com.vci.corba.common.PLException;
import com.vci.web.util.PlatformClientUtil;
import org.springframework.beans.factory.annotation.Autowired;

/**
 * æŸ¥è¯¢æ¨¡æ¿å¯¼å‡ºæ•°æ®ç±»ï¼šå¯åºåˆ—化为模板文件,同时也兼导出数据控制类
 * @Title        :QTExportData.java
 * @Description    : 
 * @Copyright    :宏博远达科技有限公司
 * @Author        :平台与规划部/ZhongGY/E-mail:zhonggy@vci-tech.com
 * @Date        :2015-6-8
 * @Version        :1
 * @Other        :产生注释:Alt+Shift+J
 */
public class LinkQTExportData implements Serializable{

    private static final long serialVersionUID = 1L;

	
    /**
     * éœ€è¦åºåˆ—化的模板数据
     */
    //
    private Map<String/*类型名称*/, LinkType/*类型对象*/> selectedBtmItems = new HashMap<String, LinkType>();
    private Map<String/*类型名称*/,String[]/*类型所属属性*/> selectedBtmAttrs = new HashMap<String, String[]>();
    private Map<String/*查询模板名称*/, QTInfo/*查询模板对象*/> allSelectedQTs = new HashMap<String, QTInfo>();
    private Map<String/*类型名称*/, QTD[]/*查询模板定义*/> allQTDs = new HashMap<String, QTD[]>();


    public Map<String, LinkType> getSelectedBtmItems() {
        return selectedBtmItems;
    }

    public void setSelectedBtmItems(Map<String, LinkType> selectedBtmItems) {
        this.selectedBtmItems = selectedBtmItems;
    }

    public Map<String, String[]> getSelectedBtmAttrs() {
        return selectedBtmAttrs;
    }

    public void setSelectedBtmAttrs(Map<String, String[]> selectedBtmAttrs) {
        this.selectedBtmAttrs = selectedBtmAttrs;
    }

    public Map<String, QTD[]> getAllQTDs() {
        return allQTDs;
    }

    public void setAllQTDs(Map<String, QTD[]> allQTDs) {
        this.allQTDs = allQTDs;
    }

    public Map<String, QTInfo> getAllQTs() {
        return allSelectedQTs;
    }

//    public void setAllQTs(Map<String, QTInfo> allQTs) {
//        this.allSelectedQTs = allQTs;
////        try {
////            BizType[] btmArray = BtmClient.getService().getAllBtmItem("");
////            for (int i = 0; i < btmArray.length; i++) {
////                allBtmItems.put(btmArray[i].name, btmArray[i]);
////            }
////        } catch (PLException e) {
////        }
//        for (Map.Entry<String, QTInfo> item : allQTs.entrySet()) {
////            BizType bizType = allBtmItems.get(item.getValue().btmName);
//            LinkType linkType;
//            try {
//                linkType = LinkTypeStart.getService().getLinkType(item.getValue().btmName);
//                if(linkType != null && !linkType.oid.equals("")){
//                    selectedBtmItems.put(linkType.name, linkType);
////                    selectedBtmAttrs.put(linkType.name, BtmProvider.getInstance().getAbNames(linkType.name));
//                    selectedBtmAttrs.put(linkType.name, linkType.attributes);
//                    allQTDs.put(linkType.name, .getQTDService().getLinkTypeQTDs(linkType.name));
//                }
//            } catch (PLException e1) {
//                // TODO Auto-generated catch block
//                e1.printStackTrace();
//            }
//        }
//        //selectedBtmAttrs?
//        //allQTDs?
//    }

}

 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;
    }

}

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsQuereyTemplateServiceI.java

@@ -53,7 +53,7 @@
    BaseResult deleteTemplate(String name) throws PLException;
    /**
     *
     * @param dataMap ä¼ è¾“的数据对象：
     * @param qtInfoDTO ä¼ è¾“的数据对象：
     *                linkTypeName é“¾æŽ¥ç±»åž‹ã€
     *                rdPositive æ–¹å‘，true正向，false反向
     *                btmName ä¸šåŠ¡ç±»åž‹åç§°
@@ -63,7 +63,7 @@
     *                level å­èŠ‚点层数
     * @return æŸ¥è¯¢ç»“æžœ
     */
    BaseResult getCriteria(HashMap<String,Object> dataMap) throws PLException;
    BaseResult getCriteria(QTInfoDTO qtInfoDTO) throws PLException;
    /**
     * æŸ¥è¯¢æ¨¡æ¿åˆ—表
     * @param btName ç±»åž‹åç§°
@@ -83,4 +83,27 @@
     * @return ä¿å­˜ç»“æžœ
     */
    BaseResult linkSave(QTInfoDTO qtInfoDTO) throws PLException;
    /**
     * é“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿æ ‘查询，用于界面的导出功能
     * @return æŸ¥è¯¢ç»“æžœ
     */
    BaseResult getLinkTree()  throws PLException ;
    /**
     * å¯¼å‡ºé“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿
     * names æŸ¥è¯¢æ¨¡æ¿å
     * @return
     */
    void expLinkTemplate(List<String> names, HttpServletResponse response) throws PLException, IOException ;
    /**
     * å¯¼å…¥é“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿
     * @param file ä¸Šä¼ çš„文件
     * @return å¯¼å…¥ç»“æžœ
     */
    BaseResult impLinkTemplate(MultipartFile file) throws IOException, ClassNotFoundException;
    /**
     * æŸ¥è¯¢æ–¹æ¡ˆåˆ é™¤
     * @param templateNames æŸ¥è¯¢æ–¹æ¡ˆå
     * @return æ“ä½œç»“æžœ
     */
    BaseResult deleteLinkTemplate(List<String> templateNames) throws PLException;
}

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java

@@ -202,7 +202,7 @@
                //vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat));
                vo.setCreateTime(Func.parse(btmItem.createTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
                vo.setLastModifyTime( Func.parse(btmItem.modifyTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
                vo.setTs(Func.parse(btmItem.ts, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
                vo.setTs(Func.parse(btmItem.ts, ConcurrentDateFormat.of(VciDateUtil.DateTimeMillFormat)));
            } catch (Exception e) {
                e.printStackTrace();
            }
@@ -219,11 +219,11 @@
            vo.setInputRevisionFlag(btmItem.revInput);
            vo.setDelimiter(btmItem.delimiter);
            vo.setfName(btmItem.fName);
            if(StringUtils.isNotBlank(vo.getRevisionRuleId()) || vo.isInputRevisionFlag()){
            vo.setVersionRule(String.valueOf(btmItem.verRuleName));
            if(StringUtils.isNotBlank(vo.getRevisionRuleName()) || vo.isInputRevisionFlag()){
                vo.setRevisionFlag(true);
            }
            vo.setVersionRule(String.valueOf(btmItem.verRuleName));
            vo.setSubLifeCycleId(Arrays.stream(btmItem.lifeCycles).collect(Collectors.joining(",")));
            vo.setLifeCycleIds(Arrays.stream(btmItem.lifeCycles).collect(Collectors.joining(",")));
            vo.setApNameArray(btmItem.apNameArray);
            List<OsAttributeVO> attributeVOS = attributeService.listAttrByIds(Arrays.stream(btmItem.apNameArray).collect(Collectors.toList()));
            List<OsBtmTypeAttributeVO> btmTypeAttributeVOS = new ArrayList<>();
@@ -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.getRevisionRuleName();
        bizType.revRuleName = dto.getRevisionRuleId();
        bizType.revInput = dto.isInputRevisionFlag();

        bizType.delimiter = (dto.getDelimiter() == null ? "" : dto.getDelimiter());

        bizType.verRuleName = Short.parseShort(dto.getRevisionRuleName());
        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;
    }

@@ -811,9 +812,11 @@
     * @return
     */
    private void checkVersionInfo(OsBtmTypeDTO dto) throws PLException {
        //需要手动输入版本时revisionRuleName不能为空
        if (dto.isInputRevisionFlag() && Func.isBlank(dto.getRevisionRuleName())) {
        //需要手动输入版本时revisionRuleId不能为空
        if (dto.getRevLevel() == 1 || dto.getRevLevel() == 2) {
            if (Func.isBlank(dto.getRevisionRuleId()) && !dto.isInputRevisionFlag()) {
            throw new PLException("500",new String[]{"版本号规则不能为空"});
            }
        }
    }

@@ -854,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());
        //过滤出需要移除的属性
@@ -1479,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());

 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()));

 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) {

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java

@@ -1,19 +1,33 @@
package com.vci.web.service.impl;

import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSONObject;
import com.vci.client.common.oq.OQTool;
import com.vci.common.qt.object.*;
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.omd.ltm.LinkType;
import com.vci.corba.omd.qtm.QTD;
import com.vci.corba.omd.qtm.QTInfo;
import com.vci.dto.QTInfoDTO;
import com.vci.omd.objects.OtherInfo;
import com.vci.po.OsLinkTypePO;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.constant.ExcelLangCodeConstant;
import com.vci.starter.poi.util.ExcelUtil;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.Tree;
import com.vci.starter.web.util.*;
import com.vci.web.other.LinkQTExportData;
import com.vci.web.service.*;
import com.vci.web.util.DateUtil;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -23,7 +37,13 @@
import org.dom4j.Element;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;

/**
 * æŸ¥è¯¢æ¨¡æ¿æœåŠ¡
@@ -142,8 +162,8 @@
     * @return æŸ¥è¯¢ç»“æžœ
     */
    @Override
    public BaseResult getCriteria(HashMap<String,Object> dataMap) throws PLException {
        QueryTemplate qt = getQT(dataMap);
    public BaseResult getCriteria(QTInfoDTO qtInfoDTO) throws PLException {
        QueryTemplate qt = getQT(qtInfoDTO);
        String checkInfo = OQTool.checkQT(qt);
        if(!checkInfo.equals("OK")){
            throw new PLException("500", new String[]{checkInfo});
@@ -279,6 +299,71 @@
        }
    }

    /**
     * é“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿æ ‘查询，用于界面的导出功能
     * @return æŸ¥è¯¢ç»“æžœ
     */
    @Override
    public BaseResult getLinkTree() throws PLException {
        LinkType[] linkTypes= null;
        QTInfo[] qts = null;
        HashMap<String,Object> tree = new HashMap();
        tree.put("text","业务类型");
        if (linkTypes == null) {
            List<LinkType> es = new ArrayList<LinkType>();
            linkTypes = platformClientUtil.getLinkTypeService().getLinkTypes();
            for (LinkType lt : linkTypes) {
                QTInfo[] qtWrappers = platformClientUtil.getQTDService().getObjTypeQTs(lt.name);
                if (qtWrappers.length!=0) {
                    es.add(lt);
                }
            }
            linkTypes = es.toArray(new LinkType[es.size()]);
            //TODO:需修正没有关联查询模板业务类型去掉
            qts = platformClientUtil.getQTDService().getAllQTs();//获取所有查询模板
        }
        List<HashMap<String,Object>> childList = new ArrayList<>();
        //添加业务类型根节点
        for (LinkType plAction : linkTypes) {
            HashMap<String,Object> childTree = new HashMap();
            childTree.put("text", plAction.tag + "/" +plAction.name);
            childTree.put("oid", plAction.oid);
//            tree.put("children", childTree);
            addExportTreeNode(plAction, qts, childTree);
            childList.add(childTree);
        }
        tree.put("children", childList);
        return BaseResult.success(tree);
    }

    /**
     * ç”Ÿæˆå¯¼å‡ºæ ‘选择以及导入树显示
     * @param linkType
     * @param qts
     * @param tree
     */
    private void addExportTreeNode(LinkType linkType/*业务类型*/,QTInfo[] qts/*查询模板对象*/,HashMap<String,Object> tree) {
        List<String> childList = new ArrayList<>();
        // æ·»åŠ æŸ¥è¯¢æ¨¡æ¿å¯¹è±¡å­èŠ‚点
        for (QTInfo qtItem : qts) {
            //处理导入时无法进行类型判断
            int splitLength = linkType.name.indexOf("【");
            if(splitLength == -1){
                splitLength = linkType.name.length();
            }
            if (qtItem.btmName.equals(linkType.name.substring(0,
                    splitLength))) {
                childList.add(qtItem.qtName);
            }
        }
        tree.put("children",childList);
    }

    /**
     * å°†é«˜çº§æ¡ä»¶æ•°æ®è½¬ä¸ºxml
     * @param qtInfoDTO æŸ¥è¯¢æ¨¡æ¿åˆ—表传输对象
     * @return xml数据
     */
    private String getSeniorXML(QTInfoDTO qtInfoDTO){
        HashMap<String, Object> tree = qtInfoDTO.getTree();
        if(tree.isEmpty()){
@@ -300,6 +385,12 @@
        return xmlStr.append("</root>").toString();

    }

    /**
     * å°†é«˜çº§æ¡ä»¶æ•°æ®è½¬ä¸ºxml
     * @param childs é«˜çº§æ¡ä»¶æ•°æ®
     * @return xml数据
     */
    private String getSeniorChildXML(JSONObject childs){

        StringBuilder xmlStr = new StringBuilder("<child>" + childs.get("connector"));
@@ -498,8 +589,6 @@
            //高级查询条件
        }else if(qtInfoDTO.getLevelFlag() == 1){
            ciMap = getCIMapForSeniorTree(qtInfoDTO);

//            OQTool.parseTreeToDoc(seniorTree);
        }
        return ciMap;
    }
@@ -797,34 +886,34 @@
        return qt;
    }

    /**
     * ç»„装查询模板
     * @return
     */
    public QueryTemplate getQT(HashMap<String,Object> dataMap){
        QueryTemplate qt = new QueryTemplate();
        qt.setType(QTConstants.TYPE_LINK);
        //TODO String qtId =
        qt.setLinkType((String) dataMap.get("linkTypeName"));
        qt.setDirection( (Boolean)dataMap.get("rdPositive") ? QTConstants.DIRECTION_POSITIVE : QTConstants.DIRECTION_OPPOSITE);
        qt.setBtmType((String) dataMap.get("btmName"));
        if("所有类型".equals(dataMap.get("combRelaType"))){
            qt.setBtmType("*");
        }
        qt.setVersion(getVersion((String) dataMap.get("versionValue")));
        qt.setQueryISLeaf((Boolean) dataMap.get("isQueryIsLeaf"));
        qt.setLevel(StringUtils.isBlank((CharSequence) dataMap.get("level")) ? 1 : Integer.valueOf(String.valueOf(dataMap.get("level"))));
        List<String> clauseList = new ArrayList<String>();
        //TODO æŸ¥è¯¢åˆ— æ˜¾ç¤ºåˆ—
        clauseList.add("*");
        qt.setClauseList(clauseList);
//    /**
//     * ç»„装查询模板
//     * @return
//     */
//    public QueryTemplate getQT(HashMap<String,Object> dataMap){
//        QueryTemplate qt = new QueryTemplate();
//        qt.setType(QTConstants.TYPE_LINK);
//        //TODO String qtId =
//        qt.setLinkType((String) dataMap.get("linkTypeName"));
//        qt.setDirection( (Boolean)dataMap.get("rdPositive") ? QTConstants.DIRECTION_POSITIVE : QTConstants.DIRECTION_OPPOSITE);
//        qt.setBtmType((String) dataMap.get("btmName"));
//        if("所有类型".equals(dataMap.get("combRelaType"))){
//            qt.setBtmType("*");
//        }
//        qt.setVersion(getVersion((String) dataMap.get("versionValue")));
//        qt.setQueryISLeaf((Boolean) dataMap.get("isQueryIsLeaf"));
//        qt.setLevel(StringUtils.isBlank((CharSequence) dataMap.get("level")) ? 1 : Integer.valueOf(String.valueOf(dataMap.get("level"))));
//        List<String> clauseList = new ArrayList<String>();
//        //TODO æŸ¥è¯¢åˆ— æ˜¾ç¤ºåˆ—
//        clauseList.add("*");
//        qt.setClauseList(clauseList);
//        Condition con = new Condition();
//        qt.setCondition(con);
//        HashMap<String, ConditionItem> ciMap = getCIMap();
//        con.setCIMap(ciMap);
//        con.setRootCIName(con.getRootCINameByCIMap(ciMap));
        return qt;
    }
//        return qt;
//    }


    /**
@@ -868,4 +957,284 @@
            throw new PLException("500", new String[]{"该模板定义名已经被使用, è¯·æ›´æ¢"});
        }
    }


    /**
     * å¯¼å‡ºé“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿
     * names æŸ¥è¯¢æ¨¡æ¿å
     * @return
     */
    @Override
    public void expLinkTemplate(List<String> names, HttpServletResponse response) throws PLException, IOException {
        String defaultTempFolder = LocalFileUtil.getDefaultTempFolder();
        String vciqtmfFileName = defaultTempFolder + File.separator + "LinkTemplateExp" + new Date().getTime() + ".vciqtf";
        LinkQTExportData exportData = new LinkQTExportData();
        for (String name : names) {
            QTInfo qt = platformClientUtil.getQTDService().getQT(name);
            exportData.getAllQTs().put(qt.qtName,qt);
            LinkType linkType = platformClientUtil.getLinkTypeService().getLinkType(qt.btmName);
            if(linkType != null && !linkType.oid.equals("")){
                exportData.getSelectedBtmItems().put(linkType.name, linkType);
                exportData.getSelectedBtmAttrs().put(linkType.name, linkType.attributes);
                exportData.getAllQTDs().put(linkType.name, platformClientUtil.getQTDService().getLinkTypeQTDs(linkType.name));
            }
        }
        ObjectOutputStream vciamfFileStream = null;
        try {
            File vciqtmfFile = new File(vciqtmfFileName);
            vciamfFileStream = new ObjectOutputStream(new FileOutputStream(vciqtmfFile));
            vciamfFileStream.writeObject(exportData);
        }finally {
            try {
                if (vciamfFileStream != null) {
                    vciamfFileStream.flush();
                    vciamfFileStream.close();
                }
            } catch (Exception e) {
                throw new PLException("500",new String[]{"导出流关闭异常！"});
            }
        }
        ControllerUtil.writeFileToResponse(response,vciqtmfFileName);
        FileUtil.del(defaultTempFolder + File.separator);
    }
    /**
     * å¯¼å…¥é“¾æŽ¥ç±»åž‹æŸ¥è¯¢æ¨¡æ¿
     * @param file ä¸Šä¼ çš„文件
     * @return å¯¼å…¥ç»“æžœ
     */
    @Override
    public BaseResult impLinkTemplate(MultipartFile file) throws IOException, ClassNotFoundException {

        if (file == null) {
            return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"无导入的文件"});
        }
        if (!file.getOriginalFilename().endsWith(".vciqtf")) {
            throw new VciBaseException("仅能上传.vciqtf格式文件，请重新上传！");
        }
        ObjectInputStream obj = new ObjectInputStream(
                file.getInputStream());
        LinkQTExportData qtExportData = (LinkQTExportData) obj.readObject();
        List<LinkType> ltsNew = new ArrayList<>();
        List<QTInfo> qTWrapperNew = new ArrayList<>();
        Map<String/* ç±»åž‹åç§° */, QTD[]/* æŸ¥è¯¢æ¨¡æ¿å®šä¹‰ */> norepQTDs = new HashMap<String, QTD[]>();
        addImportData(qtExportData, ltsNew, qTWrapperNew, norepQTDs);
        QTInfo[] qts = qTWrapperNew
                .toArray(new QTInfo[qTWrapperNew.size()]);
        //处理树的返回
        HashMap<String,Object> tree = new HashMap();
        tree.put("text","链接类型");
        List<HashMap<String,Object>> childList = new ArrayList<>();
        //添加业务类型根节点
        for (LinkType plAction : ltsNew) {
            HashMap<String,Object> childTree = new HashMap();
            childTree.put("text", plAction.tag + "/" +plAction.name);
            childTree.put("oid", plAction.oid);
            addExportTreeNode(plAction, qts, childTree);
            childList.add(childTree);
        }
        tree.put("children", childList);
        return BaseResult.success(tree);
    }

    // æ•°æ®è¿‡æ»¤
    private void addImportData(LinkQTExportData qtExportData, List<LinkType> ltsNew, List<QTInfo> qTWrapperNew,
                               Map<String/* ç±»åž‹åç§° */, QTD[]/* æŸ¥è¯¢æ¨¡æ¿å®šä¹‰ */> norepQTDs) {
        Map<String/* ç±»åž‹åç§° */, QTD[]/* æŸ¥è¯¢æ¨¡æ¿å®šä¹‰ */> allQTDs = qtExportData
                .getAllQTDs();
        Map<String/* ç±»åž‹åç§° */, LinkType/* ç±»åž‹å¯¹è±¡ */> selectedBtmItems = qtExportData
                .getSelectedBtmItems();
        Map<String/* ç±»åž‹åç§° */, String[]/* ç±»åž‹æ‰€å±žå±žæ€§ */> selectedBtmAttrs = qtExportData
                .getSelectedBtmAttrs();
        Map<String/* æŸ¥è¯¢æ¨¡æ¿åç§° */, QTInfo/* æŸ¥è¯¢æ¨¡æ¿å¯¹è±¡ */> allSelectedQTs = qtExportData
                .getAllQTs();
        if (allQTDs.size() == 0 || allQTDs == null
                || selectedBtmItems.size() == 0 || selectedBtmItems == null
                || selectedBtmAttrs.size() == 0 || selectedBtmAttrs == null
                || allSelectedQTs.size() == 0 || allSelectedQTs == null) {
            throw new VciBaseException("导入的模板数据有误!!!");
        }
        Set<Map.Entry<String, QTD[]>> pLActions = allQTDs.entrySet();
        Set<Map.Entry<String, QTInfo>> pLQts = allSelectedQTs.entrySet();
        Set<Map.Entry<String, LinkType>> LinkpLQts = selectedBtmItems.entrySet();
        for (Map.Entry<String, QTD[]> entry : pLActions) {
            String string = entry.getKey();
            QTD[] qtds = entry.getValue();
            getPLQtIsInDB(string, qtds, norepQTDs);
        }
        for (Map.Entry<String, LinkType> entry : LinkpLQts) {
            String string = entry.getKey();
            LinkType LinkType = entry.getValue();
            getPLQtBtmItem(string, LinkType, ltsNew);
        }
        Map<String/*类型名称*/, QTD[]/*查询模板定义*/> newNorepQTDs = getnewNorepQTDs(norepQTDs,allSelectedQTs);
        for (Map.Entry<String, QTInfo> entry : pLQts) {
            String string = entry.getKey();
            QTInfo qtWrapper = entry.getValue();
            getPLQtWrapper(string, qtWrapper, ltsNew, qTWrapperNew, newNorepQTDs);
        }

    }

    /**
     * æŸ¥è¯¢æ¨¡æ¿å®šä¹‰çš„处理
     * @param string
     * @param qtds
     */
    private void getPLQtIsInDB(String string, QTD[] qtds, Map<String/* ç±»åž‹åç§° */, QTD[]/* æŸ¥è¯¢æ¨¡æ¿å®šä¹‰ */> norepQTDs) {
        // TODO Auto-generated method stub
        try {
            QTD[] qtds2 = platformClientUtil.getQTDService().getBizTypeQTDs(string);
            QTD[] qtdsNewQtds = null;
            List<QTD> es = new ArrayList<>();
            for (QTD qtd : qtds) {
                boolean isleat = true;
                for (int i = 0; i < qtds2.length; i++) {
                    if (qtd.name.equals(qtds2[i].name)) {
                        isleat = false;
                        break;
                    }
                }
                if (isleat) {
                    es.add(qtd);
                }
            }
            if (es.size() != 0) {
                qtdsNewQtds = es.toArray(new QTD[es.size()]);
                norepQTDs.put(string, qtdsNewQtds);
            }
        } catch (PLException e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
        }
    }

    private void getPLQtBtmItem(String string, LinkType linkType, List<LinkType> ltsNew) {
        // TODO Auto-generated method stub
        try {
            LinkType queryLinkType = platformClientUtil.getLinkTypeService().getLinkType(string);
            LinkType[] btmArray = platformClientUtil.getLinkTypeService().getLinkTypes();
            String[] strings = queryLinkType.attributes;
            String[] stringsFrom = queryLinkType.btmItemsFrom;
            String[] stringsTo = queryLinkType.btmItemsTo;
            boolean b = true;
            for (int i = 0; i < btmArray.length; i++) {
                if (btmArray[i].name.equals(string)) {
                    b = false;
                    if (Arrays.equals(linkType.attributes, strings)
                            && Arrays
                            .equals(linkType.btmItemsFrom, stringsFrom)
                            && Arrays.equals(linkType.btmItemsTo, stringsTo)) {
                        btmArray[i].name += "【链接类型已存在】";
                        /* this.btmArray[i] = btmArray[i]; */
                        ltsNew.add(btmArray[i]);
                    } else {
                        btmArray[i].name += "【链接类型存在但属性不一致】";
                        ltsNew.add(btmArray[i]);
                    }
                }
            }
            if (b) {
                linkType.name += "【链接类型不存在】";
                ltsNew.add(linkType);
            }
        } catch (PLException e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
        }
    }

    private void getPLQtWrapper(String string, QTInfo qtWrapper, List<LinkType> ltsNew, List<QTInfo> qTWrapperNew, Map<String/*类型名称*/, QTD[]/*查询模板定义*/> newNorepQTDs) {
        try {
            QTInfo[] qtws = platformClientUtil.getQTDService().getAllQTs();
            boolean islaet = true;
            for (int i = 0; i < qtws.length; i++) {
                if (string.equals(qtws[i].qtName)) {
                    islaet = false;
                    for (LinkType lt : ltsNew) {
                        if (qtWrapper.btmName.equals(lt.name.substring(0,
                                lt.name.indexOf("【")))) {
                            if (lt.name.endsWith("【链接类型已存在】")) {
                                qtWrapper.qtName += "【查询模板已存在，不导入】";
                                qTWrapperNew.add(qtWrapper);
                            }else if(lt.name.endsWith("【链接类型存在但属性不一致】")){
                                qtWrapper.qtName += "【查询模板所属链接类型属性不一致，不导入】";
                                qTWrapperNew.add(qtWrapper);
                            }else{
                                qtWrapper.qtName += "【查询模板所属链接类型不存在，不导入】";
                                qTWrapperNew.add(qtWrapper);
                            }
                        }
                    }
                }
            }
            if (islaet) {
                for (LinkType btmItem : ltsNew) {
                    if (qtWrapper.btmName.equals(btmItem.name.substring(0,
                            btmItem.name.indexOf("【")))) {
                        if (btmItem.name.endsWith("【链接类型已存在】")) {
                            //判断查询模板定义是否存在，进行保存
                            QTD[] qtds = newNorepQTDs.get(qtWrapper.btmName);
                            if(qtds != null){
                                for (QTD qtd : qtds) {
                                    QTD qtdByName = platformClientUtil.getQTDService().getQTDByName(qtd.name);
                                    if(!(qtdByName != null && StringUtils.isNotBlank(qtdByName.name))){
                                        boolean b = platformClientUtil.getQTDService().addQTD(qtd);
                                        if(!b){
                                            qtWrapper.qtName += qtWrapper.qtName+"导入查询模板定义【" + qtdByName.name + "】失败！";
                                        }
                                    }
                                }
                                newNorepQTDs.remove(qtWrapper.btmName);
                            }
                            boolean success = platformClientUtil.getQTDService().saveQT(qtWrapper);
                            if(!success){
                                qtWrapper.qtName += qtWrapper.qtName+"导入失败！";
                            }else {
                                qtWrapper.qtName += "【查询模板导入成功！】";
                            }
                            qTWrapperNew.add(qtWrapper);
                        }else if(btmItem.name.endsWith("【链接类型存在但属性不一致】")){
                            qtWrapper.qtName += "【查询模板所属链接类型属性不一致，不导入】";
                            qTWrapperNew.add(qtWrapper);
                        }else{
                            qtWrapper.qtName += "【查询模板所属链接类型不存在，不导入】";
                            qTWrapperNew.add(qtWrapper);
                        }
                    }
                }
            }
        } catch (PLException e) {
            e.printStackTrace();
        }
    }

    //根据选择的查询模板过滤模板定义
    private Map<String, QTD[]> getnewNorepQTDs(Map<String, QTD[]> norepQTDs,
                                               Map<String, QTInfo> allQTs) {
        // TODO Auto-generated method stub
        Map<String, QTD[]> map = new HashMap<String, QTD[]>();
        Set<Map.Entry<String, QTInfo>> pLQts = allQTs.entrySet();
        Set<Map.Entry<String, QTD[]>> pLActions = norepQTDs.entrySet();
        for (Map.Entry<String, QTD[]> entrys : pLActions) {
            for (Map.Entry<String, QTInfo> entry : pLQts) {
                if(entry.getValue().btmName.equals(entrys.getKey())){
                    map.put(entrys.getKey(), entrys.getValue());
                }
            }
        }
        return map;
    }
    /**
     * æŸ¥è¯¢æ–¹æ¡ˆåˆ é™¤
     * @param templateNames æŸ¥è¯¢æ–¹æ¡ˆå
     * @return æ“ä½œç»“æžœ
     */
    @Override
    public BaseResult deleteLinkTemplate(List<String> templateNames) throws PLException {
        boolean b = platformClientUtil.getQTDService().deleteQTs(templateNames.toArray(new String[0]));
        if(!b){
            return BaseResult.fail("删除失败！！！");
        }
        return BaseResult.success();
    }
}

 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.getAttributesDTOList();
        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(",");
    }

    /**

 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.setAttributesDTOList(btmTypeLinkAttributesDTOList);
        btmTypeDTO.setApNameArray(btmTypeLinkAttributesDTOList.stream().map(OsBtmTypeLinkAttributesDTO::getId).collect(Collectors.joining(",")));
        btmTypeDTOMap.put(btmTypeDTO.getId().toLowerCase().trim(),btmTypeDTO);
    }


 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java

@@ -153,7 +153,6 @@
        return roleRightByUserName;
    }


    /**
     * èŽ·å–当前用户具有权限的所有模块
     * @param parentId, çˆ¶æ¨¡å—id
@@ -231,7 +230,6 @@


    public FunctionInfo[] getFunctionsByParentId(String parentId, String userName) {

        FunctionInfo[] funcObjs =  null;
        try {
            if(isDeveloper(userName)){

 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": ""
}