代码上传

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

@@ -153,7 +153,7 @@
    public List<OsBtmTypeVO> selectAllBtm() {
        try {
            return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getBizTypes("")).collect(Collectors.toList()));
        }  catch (PLException e) {
        } catch (PLException e) {
            throw new RuntimeException(e);
        }
    }
@@ -166,7 +166,7 @@
    @Override
    @VciUnLog
    public Map<String, OsBtmTypeVO> selectAllBtmMap() {
        return Optional.ofNullable(self.selectAllBtm()).orElseGet(()->new ArrayList<OsBtmTypeVO>()).stream().collect(Collectors.toMap(s->s.getId().toLowerCase(), t->t,(o1,o2)->o1));
        return Optional.ofNullable(self.selectAllBtm()).orElseGet(() -> new ArrayList<OsBtmTypeVO>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(), t -> t, (o1, o2) -> o1));
    }

    /**
@@ -178,7 +178,7 @@
    @Override
    public List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems) {
        List<OsBtmTypeVO> VOS = new ArrayList<>();
        Optional.ofNullable(btmItems).orElseGet(()->new ArrayList<>()).stream().forEach(btmItem -> {
        Optional.ofNullable(btmItems).orElseGet(() -> new ArrayList<>()).stream().forEach(btmItem -> {
            OsBtmTypeVO vo = btmDO2VO(btmItem);
            VOS.add(vo);
        });
@@ -194,7 +194,7 @@
    @Override
    public OsBtmTypeVO btmDO2VO(BizType btmItem) {
        OsBtmTypeVO vo = new OsBtmTypeVO();
        if(btmItem !=null){
        if (btmItem != null) {
            vo.setOid(btmItem.oid);
            vo.setCreator(btmItem.creator);
            vo.setLastModifier(btmItem.modifier);
@@ -202,7 +202,7 @@
                // btmItem.createTime拿到的是时间戳，但是这儿要的是例如2017-12-27 09:32:20.034这样的格式，所以不调用这个方法，改调用其他方法
                //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.setLastModifyTime(Func.parse(btmItem.modifyTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
                vo.setTs(Func.parse(btmItem.ts, ConcurrentDateFormat.of(VciDateUtil.DateTimeMillFormat)));
            } catch (Exception e) {
                e.printStackTrace();
@@ -221,29 +221,29 @@
            vo.setDelimiter(btmItem.delimiter);
            vo.setfName(btmItem.fName);
            vo.setVersionRule(String.valueOf(btmItem.verRuleName));
            if(StringUtils.isNotBlank(vo.getRevisionRuleName()) || vo.isInputRevisionFlag()){
            if (StringUtils.isNotBlank(vo.getRevisionRuleName()) || vo.isInputRevisionFlag()) {
                vo.setRevisionFlag(true);
            }
            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<>();
            Optional.ofNullable(attributeVOS).orElseGet(()->new ArrayList<>()).stream().forEach(attributeVO->{
            Optional.ofNullable(attributeVOS).orElseGet(() -> new ArrayList<>()).stream().forEach(attributeVO -> {
                OsBtmTypeAttributeVO btmTypeAttributeVO = new OsBtmTypeAttributeVO();
                BeanUtil.convert(attributeVO,btmTypeAttributeVO);
                BeanUtil.convert(attributeVO, btmTypeAttributeVO);
                btmTypeAttributeVO.setPkBtmType(vo.getOid());
                btmTypeAttributeVO.setBtmTypeId(vo.getId());
                btmTypeAttributeVO.setAttributeDataType(attributeVO.getAttributeDataType());
                btmTypeAttributeVO.setAttributeLength(attributeVO.getAttrLength());
                btmTypeAttributeVO.setDefaultValue(attributeVO.getDefaultValue());
                if("secretgrade".equalsIgnoreCase(attributeVO.getId())){
                if ("secretgrade".equalsIgnoreCase(attributeVO.getId())) {
                    vo.setSecretFlag(true);
                }
                if(StringUtils.isNotBlank(attributeVO.getBtmTypeId())){
                if (StringUtils.isNotBlank(attributeVO.getBtmTypeId())) {
                    btmTypeAttributeVO.setReferFlag(true);
                    btmTypeAttributeVO.setReferBtmTypeId(attributeVO.getBtmTypeId());
                }
                if(StringUtils.isNotBlank(attributeVO.getEnumId())){
                if (StringUtils.isNotBlank(attributeVO.getEnumId())) {
                    btmTypeAttributeVO.setEnumFlag(true);
                    btmTypeAttributeVO.setEnumItemMap(enumService.getEnumValueMap(btmTypeAttributeVO.getEnumId()));
                }
@@ -262,13 +262,13 @@
     */
    @Override
    public List<OsBtmTypeVO> listBtmByIds(Collection<String> btmIds) {
        if(CollectionUtils.isEmpty(btmIds)){
        if (CollectionUtils.isEmpty(btmIds)) {
            return null;
        }
        Map<String, OsBtmTypeVO> btmTypeVOMap = self.selectAllBtmMap();
        List<OsBtmTypeVO> btmTypeVOS = new ArrayList<>();
        btmIds.stream().forEach(id->{
            if(btmTypeVOMap.containsKey(id.toLowerCase())){
        btmIds.stream().forEach(id -> {
            if (btmTypeVOMap.containsKey(id.toLowerCase())) {
                btmTypeVOS.add(btmTypeVOMap.get(id.toLowerCase()));
            }
        });
@@ -283,10 +283,10 @@
     */
    @Override
    public OsBtmTypeVO getBtmById(String id) {
        if(StringUtils.isBlank(id)){
        if (StringUtils.isBlank(id)) {
            return null;
        }
        return self.selectAllBtmMap().getOrDefault(id.toLowerCase(),null);
        return self.selectAllBtmMap().getOrDefault(id.toLowerCase(), null);
    }

    /**
@@ -297,33 +297,33 @@
     */
    @Override
    public List<OsUsedAttributeVO> listBtmUsedInfo(String btmName) {
        return listBtmUsedInfo(btmName,false);
        return listBtmUsedInfo(btmName, false);
    }

    /**
     * 获取业务类型的在哪个属性中使用
     *
     * @param btmId 业务类型
     * @param btmId   业务类型
     * @param hasLink 是否包含链接类型中
     * @return 引用的信息
     */
    @Override
    public List<OsUsedAttributeVO> listBtmUsedInfo(String btmId, boolean hasLink){
        VciBaseUtil.alertNotNull(btmId,"业务类型的名称");
        List<OsAttributeVO> allReferThisBtmAttributes = Optional.ofNullable(attributeService.selectAllAttribute()).orElseGet(()->new ArrayList<>()).stream().filter(s->btmId.equalsIgnoreCase(s.getBtmTypeId())).collect(Collectors.toList());
        if(CollectionUtils.isEmpty(allReferThisBtmAttributes)){
    public List<OsUsedAttributeVO> listBtmUsedInfo(String btmId, boolean hasLink) {
        VciBaseUtil.alertNotNull(btmId, "业务类型的名称");
        List<OsAttributeVO> allReferThisBtmAttributes = Optional.ofNullable(attributeService.selectAllAttribute()).orElseGet(() -> new ArrayList<>()).stream().filter(s -> btmId.equalsIgnoreCase(s.getBtmTypeId())).collect(Collectors.toList());
        if (CollectionUtils.isEmpty(allReferThisBtmAttributes)) {
            return null;
        }
        //根据这些属性，找它使用的业务类型
        List<OsUsedAttributeVO> usedInfos= new ArrayList<>();
        List<OsUsedAttributeVO> usedInfos = new ArrayList<>();
        List<OsBtmTypeVO> btmTypeVOMap = self.selectAllBtmMap().values().stream().collect(Collectors.toList());
        List<OsLinkTypeVO> linkTypeVOS = linkTypeService.selectAllLinkMap().values().stream().collect(Collectors.toList());
        allReferThisBtmAttributes.stream().forEach(attribute->{
        allReferThisBtmAttributes.stream().forEach(attribute -> {
            //其他的业务类型包含了这个属性的
            List<OsBtmTypeVO> usedBtms = btmTypeVOMap.stream().filter(btmTypeVO -> !CollectionUtils.isEmpty(btmTypeVO.getAttributes()) && btmTypeVO.getAttributes().stream().anyMatch(s -> attribute.getId().equalsIgnoreCase(s.getId()))).collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(usedBtms)){
                usedBtms.stream().forEach(btm->{
                    btm.getAttributes().stream().filter(s->attribute.getId().equalsIgnoreCase(s.getId())).forEach(attrInBtm->{
            if (!CollectionUtils.isEmpty(usedBtms)) {
                usedBtms.stream().forEach(btm -> {
                    btm.getAttributes().stream().filter(s -> attribute.getId().equalsIgnoreCase(s.getId())).forEach(attrInBtm -> {
                        OsUsedAttributeVO usedAttributeVO = new OsUsedAttributeVO();
                        usedAttributeVO.setId(attrInBtm.getId());
                        usedAttributeVO.setName(attrInBtm.getName());
@@ -333,11 +333,11 @@
                    });
                });
            }
            if(hasLink){
                List<OsLinkTypeVO> usedLinks = linkTypeVOS.stream().filter(linkTypeVO -> !CollectionUtils.isEmpty(linkTypeVO.getAttributes()) &&linkTypeVO.getAttributes().stream().anyMatch(s->attribute.getId().equalsIgnoreCase(s.getId())) ).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(usedLinks)){
                    usedLinks.stream().forEach(link->{
                        link.getAttributes().stream().filter(s->attribute.getId().equalsIgnoreCase(s.getId())).forEach(attrInBtm->{
            if (hasLink) {
                List<OsLinkTypeVO> usedLinks = linkTypeVOS.stream().filter(linkTypeVO -> !CollectionUtils.isEmpty(linkTypeVO.getAttributes()) && linkTypeVO.getAttributes().stream().anyMatch(s -> attribute.getId().equalsIgnoreCase(s.getId()))).collect(Collectors.toList());
                if (!CollectionUtils.isEmpty(usedLinks)) {
                    usedLinks.stream().forEach(link -> {
                        link.getAttributes().stream().filter(s -> attribute.getId().equalsIgnoreCase(s.getId())).forEach(attrInBtm -> {
                            OsUsedAttributeVO usedAttributeVO = new OsUsedAttributeVO();
                            usedAttributeVO.setId(attrInBtm.getId());
                            usedAttributeVO.setName(attrInBtm.getName());
@@ -360,15 +360,15 @@
     */
    @Override
    public List<OsBtmTypeAttributeVO> listAttributeByBtmId(String btmId) throws PLException {
        VciBaseUtil.alertNotNull(btmId,"业务类型的编号");
        VciBaseUtil.alertNotNull(btmId, "业务类型的编号");
        BizType[] bizTypes = platformClientUtil.getBtmService().getBizTypes(btmId);
        if(Func.isEmpty(bizTypes)){
        if (Func.isEmpty(bizTypes)) {
            return new ArrayList<>();
        }
        BizType bizType = bizTypes[0];
        OsBtmTypeVO btmTypeVO = btmDO2VO(bizType);
        List<OsBtmTypeAttributeVO> attributes = btmTypeVO.getAttributes();
        if(attributes == null){
        if (attributes == null) {
            attributes = new ArrayList<>();
        }
        return attributes.stream().sorted(((o1, o2) -> o1.getId().toLowerCase(Locale.ROOT).compareTo(o2.getId().toLowerCase(Locale.ROOT)))).collect(Collectors.toList());
@@ -383,12 +383,12 @@
    @Override
    public List<OsBtmTypeAttributeVO> listAttributeByBtmIdHasDefault(String btmId) throws PLException {
        List<OsBtmTypeAttributeVO> attrVOs = listAttributeByBtmId(btmId);
        if(attrVOs == null){
        if (attrVOs == null) {
            attrVOs = new ArrayList<>();
        }
        if(!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())) {
        if (!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())) {
            List<OsBtmTypeAttributeVO> finalAttrVOs = attrVOs;
            attributeService.getDefaultAttributeVOs().stream().forEach(attr->{
            attributeService.getDefaultAttributeVOs().stream().forEach(attr -> {
                OsBtmTypeAttributeVO attributeVO = new OsBtmTypeAttributeVO();
                BeanUtil.convert(attr, attributeVO);
                attributeVO.setAttributeDataType(attr.getAttributeDataType());
@@ -412,6 +412,7 @@

    /**
     * 修改业务类型中对应属性名的属性
     *
     * @param apName
     * @return
     * @throws PLException
@@ -426,7 +427,7 @@
        } catch (PLException e1) {
            e1.printStackTrace();
        }
        if(abItem == null || abItem.equals("")){
        if (abItem == null || abItem.equals("")) {
            return true;
        }
        try {
@@ -434,21 +435,21 @@
        } catch (PLException e) {
            e.printStackTrace();
        }
        if(btmNames == null || btmNames.length <= 0){
        if (btmNames == null || btmNames.length <= 0) {
            return true;
        }

        btmNameList = Arrays.asList(btmNames);
        for(Iterator<String> i = btmNameList.iterator(); i.hasNext();){
        for (Iterator<String> i = btmNameList.iterator(); i.hasNext(); ) {
            String btmName = i.next();
            try {
                platformClientUtil.getBtmService().modifyBTAttribute(btmName, apName);
            } catch (PLException e) {
                // TODO Auto-generated catch block
                e.printStackTrace();
                String erreMsg = "调整业务类型中【"+apName+"】属性时出现错误，原因："+e.getMessage();
                String erreMsg = "调整业务类型中【" + apName + "】属性时出现错误，原因：" + e.getMessage();
                logger.error(erreMsg);
                throw new PLException("500",new String[]{erreMsg});
                throw new PLException("500", new String[]{erreMsg});
            }
        }
        return false;
@@ -456,6 +457,7 @@

    /**
     * 判断该属性是否已经在业务类型中产生了数据
     *
     * @param abName
     * @return
     * @throws PLException
@@ -463,14 +465,14 @@
    @Override
    public boolean hasInstance(String abName) throws PLException {
        String[] btmNames = platformClientUtil.getBtmService().getBTNamesByAPName(abName);
        if(btmNames == null || btmNames.length == 0){
        if (btmNames == null || btmNames.length == 0) {
            return false;
        }
        for(int i = 0; i < btmNames.length; i++){
        for (int i = 0; i < btmNames.length; i++) {
            String btmName = btmNames[i];
            boolean flag;
            flag = platformClientUtil.getBtmService().hasData(btmName);
            if(flag){
            if (flag) {
                return flag;
            }
        }
@@ -480,13 +482,14 @@
    /**
     * 获取名字以filter开始的业务类型(for 查询)，主要用于属性池的业务类型选择对话框
     * 获取全部业务类型，传参filter为""
     *
     * @param btmName
     * @return
     * @throws PLException
     */
    @Override
    public BizType[] getBizTypes(String btmName) throws PLException {
        if(null == btmName){
        if (null == btmName) {
            btmName = "";
        }
        return platformClientUtil.getBtmService().getBizTypes(btmName);
@@ -494,18 +497,19 @@

    /**
     * 业务类型列表查询，非树结构：用于UI定义左侧业务类型查询，只返回name和lable
     *
     * @param btmName
     * @return
     * @throws PLException
     */
    @Override
    public Tree getBizTree(String btmName) throws PLException {
        if(null == btmName){
        if (null == btmName) {
            btmName = "";
        }
        Tree returnTree = new Tree();
        BizType[] bizTypes = platformClientUtil.getBtmService().getBizTypes(btmName);
        if(Func.isEmpty(bizTypes)){
        if (Func.isEmpty(bizTypes)) {
            return returnTree;
        }
        returnTree.setOid("");
@@ -514,13 +518,13 @@
        List<Tree> trees = new ArrayList<>();
        Arrays.stream(bizTypes).forEach(bizType -> {
            Tree tree = new Tree();
            tree.setText(bizType.name + " " +bizType.label);
            tree.setText(bizType.name + " " + bizType.label);
            tree.setOid(bizType.oid);
            tree.setLeaf(true);
            tree.setParentName(bizType.fName);
            Map<String, String> atrrMap = new HashMap<>();
            atrrMap.put("name",bizType.name);
            atrrMap.put("lable",bizType.label);
            atrrMap.put("name", bizType.name);
            atrrMap.put("lable", bizType.label);
            tree.setAttributes(atrrMap);
            trees.add(tree);
        });
@@ -537,7 +541,7 @@
     */
    @Override
    public DataGrid<OsBtmTypeVO> referDataGrid(Map<String, String> conditionMap, PageHelper pageHelper) {
        DataGrid<OsBtmTypeVO> dataGrid = queryObjectServiceInfoBySql(conditionMap, pageHelper, "plbtmtype",OsBtmTypeVO.class,((data, obj) -> {
        DataGrid<OsBtmTypeVO> dataGrid = queryObjectServiceInfoBySql(conditionMap, pageHelper, "plbtmtype", OsBtmTypeVO.class, ((data, obj) -> {
            obj.setTableName(VciBaseUtil.getTableName(obj.getId()));
        }));
        return dataGrid;
@@ -552,7 +556,7 @@
    @Override
    public OsBtmTypeVO selectByOid(String oid) {
        List<OsBtmTypeVO> btmTypeVOS = self.selectAllBtmMap().values().stream().collect(Collectors.toList());
        return Optional.ofNullable(btmTypeVOS).orElseGet(()->new ArrayList<>()).stream().filter(s->s.getOid().equalsIgnoreCase(oid)).findFirst().orElseGet(()->null);
        return Optional.ofNullable(btmTypeVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(oid)).findFirst().orElseGet(() -> null);
    }

    /**
@@ -564,8 +568,8 @@
    @Override
    public String getNameById(String id) {
        OsBtmTypeVO btmTypeVO = getBtmById(id);
        if(btmTypeVO == null){
            throw new VciBaseException("业务类型[{0}]在系统里不存在",new String[]{id});
        if (btmTypeVO == null) {
            throw new VciBaseException("业务类型[{0}]在系统里不存在", new String[]{id});
        }
        return btmTypeVO.getName();
    }
@@ -582,7 +586,7 @@
        List<OsERNodeVO> nodeVOList = new ArrayList<>();
        List<OsERRelationVO> relationVOList = new ArrayList<>();
        //看当前这个业务类型，参照了其他的哪些业务类型 .我们不显示引用当前业务类型的业务类型
        splicingBtmType2Json(nodeVOList, relationVOList, btmTypeVO,true);
        splicingBtmType2Json(nodeVOList, relationVOList, btmTypeVO, true);
        loadAllLinkTypeByBtmType(nodeVOList, relationVOList, btmTypeVO);
        OsERVO osERVO = new OsERVO();
        osERVO.setTabViewList(nodeVOList);
@@ -604,25 +608,25 @@
        List<OsUsedAttributeVO> usedAttributeVOS = listBtmUsedInfo(btmTypeVO.getId());
        List<OsERNodeVO> nodeVOList = new ArrayList<>();
        List<OsERRelationVO> relationVOList = new ArrayList<>();
        splicingBtmType2Json(nodeVOList, relationVOList, btmTypeVO,false);
        if(!CollectionUtils.isEmpty(usedAttributeVOS)){
            usedAttributeVOS.stream().forEach(usedAttr->{
        splicingBtmType2Json(nodeVOList, relationVOList, btmTypeVO, false);
        if (!CollectionUtils.isEmpty(usedAttributeVOS)) {
            usedAttributeVOS.stream().forEach(usedAttr -> {
                //业务类型和链接类型都有可能
                if(BooleanEnum.TRUE.getValue().equalsIgnoreCase(usedAttr.getBusinessType())){
                if (BooleanEnum.TRUE.getValue().equalsIgnoreCase(usedAttr.getBusinessType())) {
                    //业务类型
                    OsBtmTypeVO linkBtmVO = self.selectAllBtmMap().get(usedAttr.getPkBtmType().toLowerCase(Locale.ROOT));
                    splicingBtmType2Json(nodeVOList, relationVOList, linkBtmVO,false);
                    splicingBtmType2Json(nodeVOList, relationVOList, linkBtmVO, false);
                    OsERRelationVO relationVO = new OsERRelationVO();
                    relationVO.setTo(btmTypeVO.getId() + " " + btmTypeVO.getName());
                    relationVO.setFrom(linkBtmVO.getId() + " " + linkBtmVO.getName());
                    relationVO.setToText("引用");
                    relationVOList.add(relationVO);
                }else{
                } else {
                    //是链接类型
                    OsLinkTypeVO linkTypeVO = linkTypeService.selectAllLinkMap().get(usedAttr.getPkBtmType().toLowerCase(Locale.ROOT));
                    List<OsLinkTypeVO> linkTypeVOList = new ArrayList<>();
                    linkTypeVOList.add(linkTypeVO);
                    splicingLinkType2Json(nodeVOList, relationVOList,linkTypeVOList,btmTypeVO,true);
                    splicingLinkType2Json(nodeVOList, relationVOList, linkTypeVOList, btmTypeVO, true);
                }
            });
        }
@@ -634,6 +638,7 @@

    /**
     * 获取所有业务类型（树形结构）
     *
     * @return 查询结果
     */
    @Override
@@ -642,10 +647,10 @@
        BizType[] bizTypes = getBizTypes("");
        OsBtmTypeVO osBtmTypeVO = null;
        List<OsBtmTypeVO> osBtmTypeVOS = btmDO2VOs(Arrays.asList(bizTypes));
        for(int i = 0; i < osBtmTypeVOS.size(); i++){
        for (int i = 0; i < osBtmTypeVOS.size(); i++) {
            osBtmTypeVO = osBtmTypeVOS.get(i);

            if(osBtmTypeVO.getfName().equals("")){
            if (osBtmTypeVO.getfName().equals("")) {
                Tree tree = new Tree();
                tree.setOid(osBtmTypeVO.getOid());
                tree.setParentName(null);
@@ -653,7 +658,7 @@
                tree.setLeaf(true);
                tree.setText(osBtmTypeVO.getDescription());
                tree.setAttributes(WebUtil.objectToMapString(osBtmTypeVO));
                tree.setChildren(getChildren(osBtmTypeVOS,osBtmTypeVO));
                tree.setChildren(getChildren(osBtmTypeVOS, osBtmTypeVO));
                rootTreeList.add(tree);
            }
        }
@@ -663,12 +668,13 @@

    /**
     * 获取所有业务类型名称集合
     *
     * @return
     */
    @Override
    public List<String> getAllBtmName() throws PLException {
        BizType[] bizTypes = platformClientUtil.getBtmService().getBizTypes("");
        if(null != bizTypes && bizTypes.length > 0){
        if (null != bizTypes && bizTypes.length > 0) {
            return Arrays.stream(bizTypes).map(bizType -> bizType.name).collect(Collectors.toList());
        }
        return null;
@@ -676,6 +682,7 @@

    /**
     * 获取业务全部属性类型
     *
     * @param btmName 业务类型名称
     * @return 属性的信息
     */
@@ -723,7 +730,7 @@
            vo.setOwner(attribute.creator);
            vo.setLastModifyTime(new Date(attribute.modifyTime));
            String maxLength = AttributeConstants.getOtherValueByType(attribute.other, AttributeConstants.LENGTH);
            if(StringUtils.isNotBlank(maxLength)){
            if (StringUtils.isNotBlank(maxLength)) {
                vo.setAttributeLength(Integer.valueOf(maxLength));
            }
            osBtms.add(vo);
@@ -733,12 +740,13 @@

    /**
     * dto转do对象
     *
     * @return
     */
    private BizType dto2BizType(OsBtmTypeDTO dto){
    private BizType dto2BizType(OsBtmTypeDTO dto) {
        BizType bizType = new BizType();
        bizType.oid = dto.getOid();
        bizType.name =dto.getId();
        bizType.name = dto.getId();
        bizType.isAbstract = dto.isAbstractFlag();
        bizType.label = dto.getName();
        bizType.fName = dto.getfName();
@@ -758,7 +766,7 @@

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

        bizType.verRuleName = Func.isBlank(dto.getVersionRule()) ? 0: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());
@@ -766,22 +774,23 @@
        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.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();
        bizType.ts = Func.isEmpty(dto.getTs()) ? timeMillis : dto.getTs().getTime();
        return bizType;
    }

    /**
     * 创建新的业务类型
     *
     * @return
     * @throws PLException
     */
    @Override
    public boolean addBtmType(OsBtmTypeDTO btmTypeDTO) throws PLException {
        VciBaseUtil.alertNotNull(btmTypeDTO,"创建的业务类型对象");
        VciBaseUtil.alertNotNull(btmTypeDTO, "创建的业务类型对象");
        //业务类型名称检查
        checkName(btmTypeDTO.getId());
        //生命周期检查
@@ -815,26 +824,27 @@

    /**
     * 检查业务类型名称是否合规
     *
     * @param btmName
     * @throws PLException
     */
    private void checkName(String btmName) throws PLException {
        if (Func.isBlank(btmName)) {
            throw new PLException("500",new String[]{"业务类型名不能为空!"});
            throw new PLException("500", new String[]{"业务类型名不能为空!"});
        }

        if (!btmName.matches("[a-z A-Z]*")) {
            throw new PLException("500",new String[]{"业务类型名只能为英文字母!"});
            throw new PLException("500", new String[]{"业务类型名只能为英文字母!"});
        }

        int maxLength = platformClientUtil.getBtmService().getBTNameMaxLength();

        if (btmName.length() > maxLength) {
            throw new PLException("500",new String[]{"业务类型名长度不能超过" + maxLength});
            throw new PLException("500", new String[]{"业务类型名长度不能超过" + maxLength});
        }

        if (platformClientUtil.getBtmService().checkRowIsExists(btmName)) {
            throw new PLException("500",new String[]{"业务类型名已经存在"});
            throw new PLException("500", new String[]{"业务类型名已经存在"});
        }
    }

@@ -845,19 +855,20 @@
     */
    private void checkLifeCycle(OsBtmTypeDTO btmTypeDTO) throws PLException {
        if (Func.isBlank(btmTypeDTO.getLifeCycleId())) {
            throw new PLException("500",new String[]{"生命周期不能为空"});
            throw new PLException("500", new String[]{"生命周期不能为空"});
        }
    }

    /**
     * 选择一级版本：必须选择或手工输入版本号规则; 选择二级版本：必须选择或手工输入版本号规则, (版次号已经默认选择).
     *
     * @return
     */
    private void checkVersionInfo(OsBtmTypeDTO dto) throws PLException {
        //需要手动输入版本时revisionRuleId不能为空
        if (dto.getRevLevel() == 1 || dto.getRevLevel() == 2) {
            if (Func.isBlank(dto.getRevisionRuleId()) && !dto.isInputRevisionFlag()) {
                throw new PLException("500",new String[]{"版本号规则不能为空"});
                throw new PLException("500", new String[]{"版本号规则不能为空"});
            }
        }
    }
@@ -865,38 +876,40 @@
    /**
     * 版本机制修改: 仅允许类型从"不可修订"变更至"一级版本管理机制","二级版本管理机制进行调整"; "一级版本管理机制"变更至"二级版本管理机制";
     * 两种方式.
     *
     * @param dbBizType 当前修改前的业务类型（库中存储的）
     * @param dto 当前修改业务类型
     * @param dto       当前修改业务类型
     * @throws PLException
     */
    private void checkRevLevel(BizType dbBizType,OsBtmTypeDTO dto) throws PLException {
        if (dbBizType.revLevel == 1 && dto.getRevLevel()==0) {
            throw new PLException("500",new String[]{"版本变更错误：不能从一级变为不可修订"});
    private void checkRevLevel(BizType dbBizType, OsBtmTypeDTO dto) throws PLException {
        if (dbBizType.revLevel == 1 && dto.getRevLevel() == 0) {
            throw new PLException("500", new String[]{"版本变更错误：不能从一级变为不可修订"});
        }
        if (dbBizType.revLevel == 2 && (dto.getRevLevel() == 1 || dto.getRevLevel() == 0)) {
            throw new PLException("500",new String[]{"版本变更错误：不能从二级变为一级或不可修订"});
            throw new PLException("500", new String[]{"版本变更错误：不能从二级变为一级或不可修订"});
        }
    }

    /**
     * 修改业务类型
     *
     * @param btmTypeDTO
     * @return
     * @throws PLException
     */
    @Override
    public boolean updateBtmType(OsBtmTypeDTO btmTypeDTO) throws PLException {
        VciBaseUtil.alertNotNull(btmTypeDTO,"修改的业务类型对象");
        VciBaseUtil.alertNotNull(btmTypeDTO, "修改的业务类型对象");
        //检查生命周期是否合规
        checkLifeCycle(btmTypeDTO);
        //查询数据库中的业务类型
        String id = btmTypeDTO.getId();
        BizType dbBizType = platformClientUtil.getBtmService().getBizTypeByName(id);
        if(Func.isEmpty(dbBizType) || Func.isBlank(dbBizType.oid)){
            throw new PLException("500",new String[]{"当前修改的业务类型不存在！"});
        if (Func.isEmpty(dbBizType) || Func.isBlank(dbBizType.oid)) {
            throw new PLException("500", new String[]{"当前修改的业务类型不存在！"});
        }
        //检查版本规则修改是否合规
        checkRevLevel(dbBizType,btmTypeDTO);
        checkRevLevel(dbBizType, btmTypeDTO);
        checkVersionInfo(btmTypeDTO);
        //处理业务类型下的属性
        List<String> lastAttrList = new ArrayList<>(Arrays.asList(btmTypeDTO.getApNameArray().split(",")));
@@ -939,28 +952,29 @@

    /**
     * 删除业务类型
     *
     * @param btmTypeDTO
     * @return
     * @throws PLException
     */
    @Override
    public boolean deleteBtmType(OsBtmTypeDTO btmTypeDTO) throws PLException {
        VciBaseUtil.alertNotNull(btmTypeDTO,"删除的业务类型");
        VciBaseUtil.alertNotNull(btmTypeDTO, "删除的业务类型");
        String btmName = btmTypeDTO.getId();
        //只能删除叶子节点
        if(Func.isNotBlank(btmTypeDTO.getfName())){
            throw new PLException("500",new String[]{"只能删除叶子节点"});
        if (Func.isNotBlank(btmTypeDTO.getfName())) {
            throw new PLException("500", new String[]{"只能删除叶子节点"});
        }
        // 业务类型被链接类型使用, 不能删除
        List<String> usedNameList = linkTypeService.getUsedBtmLinkList(btmName);
        if (usedNameList != null && usedNameList.size() > 0) {
            throw new PLException("500",new String[]{"该类型已被链接类型使用，禁止删除"});
            throw new PLException("500", new String[]{"该类型已被链接类型使用，禁止删除"});
        }
        // 业务类型已经生成了业务对象, 不能删除
        if (hasInstanceByBtmName(btmName)) {
            throw new PLException("500",new String[]{"该类型已有实例，禁止删除"});
            throw new PLException("500", new String[]{"该类型已有实例，禁止删除"});
        }
        

        BizType bizType = new BizType();
        bizType.ts = btmTypeDTO.getTs().getTime();
        bizType.oid = btmTypeDTO.getOid();
@@ -970,6 +984,7 @@

    /**
     * 一致性检查
     *
     * @return
     * @throws PLException
     */
@@ -977,9 +992,9 @@
    public BaseResult checkBtmConsistency() throws PLException {
        String[] result = platformClientUtil.getBtmService().btmConsistencyCheck();
        Map<String, String> dbCheckMap = new HashMap<String, String>();
        for(int i = 0; i < result.length; i++){
        for (int i = 0; i < result.length; i++) {
            String info = result[i];
            if(info.equals("")){
            if (info.equals("")) {
                continue;
            }
            String[] infos = info.split("/DML");
@@ -987,9 +1002,9 @@
            String dml = infos[1];
            dbCheckMap.put(typeName, dml);
        }
        if(dbCheckMap.size() < 1){
        if (dbCheckMap.size() < 1) {
            return BaseResult.successMsg("数据库中的表结构与类型一致,无需修复!!");
        }else{
        } else {
            //需要修复时就需要界面唤起对话框进行处理
            List<Map> list = new ArrayList<>();
            list.add(dbCheckMap);
@@ -1001,26 +1016,29 @@

    /**
     * 一致性检查修复功能
     *
     * @param repairData
     * @return
     */
    @Override
    public BaseResult executeRepair(String repairData) throws Exception {
        Map<String, String> dbCheckMap = new ObjectMapper().readValue(repairData, new TypeReference<Map<String,String>>(){});
        Map<String, String> dbCheckMap = new ObjectMapper().readValue(repairData, new TypeReference<Map<String, String>>() {
        });
        List<String> list = this.getRepairDML(dbCheckMap);
        if(list.size() < 1){
        if (list.size() < 1) {
            return BaseResult.success();
        }
        try {
            String[] result = platformClientUtil.getBtmService().executeRepair(list.toArray(new String[0]));
            return BaseResult.success(result);
        }catch (PLException e){
            return BaseResult.fail("业务类型修复失败，原因："+VciBaseUtil.getExceptionMessage(e));
        } catch (PLException e) {
            return BaseResult.fail("业务类型修复失败，原因：" + VciBaseUtil.getExceptionMessage(e));
        }
    }

    /**
     * 创建视图
     *
     * @return
     * @throws PLException
     */
@@ -1031,6 +1049,7 @@

    /**
     * 删除数据界面的查询
     *
     * @return 业务类型，链接类型
     */
    @Override
@@ -1039,11 +1058,11 @@
        List<String> allBtmName = this.getAllBtmName();
        //获取链接类型名称集合
        List<String> allLinkType = linkTypeService.getAllLtName();
        Map<String,List> map = new HashMap<>();
        map.put("btmType",allBtmName);
        map.put("linkType",allLinkType);
        map.put("table",tableList);
        map.put("workFlow",workFlowTableList);
        Map<String, List> map = new HashMap<>();
        map.put("btmType", allBtmName);
        map.put("linkType", allLinkType);
        map.put("table", tableList);
        map.put("workFlow", workFlowTableList);
        List<Map> list = new ArrayList<>();
        list.add(map);
        return BaseResult.dataList(list);
@@ -1051,24 +1070,25 @@

    /**
     * 删除数据
     * @param btmNames 业务类型名
     *
     * @param btmNames  业务类型名
     * @param linkNames 链接类型名
     * @return
     * @throws PLException
     */
    @Override
    public List<Map> truncateTable(String[] btmNames,String[] linkNames) throws PLException {
    public List<Map> truncateTable(String[] btmNames, String[] linkNames) throws PLException {
        List<Map> returnMapList = new ArrayList<>();
        Map<String, List<String>> map = new HashMap<>();
        map.put("btmSuccess",new ArrayList<>());
        map.put("btmFail",new ArrayList<>());
        map.put("linkSuccess",new ArrayList<>());
        map.put("linkFail",new ArrayList<>());
        if(Func.isNotEmpty(btmNames)){
            for(int i = 0; i < btmNames.length; i++){
        map.put("btmSuccess", new ArrayList<>());
        map.put("btmFail", new ArrayList<>());
        map.put("linkSuccess", new ArrayList<>());
        map.put("linkFail", new ArrayList<>());
        if (Func.isNotEmpty(btmNames)) {
            for (int i = 0; i < btmNames.length; i++) {
                String btName = btmNames[i];
                try {
                    if(platformClientUtil.getBtmService().truncateTable(btName)){
                    if (platformClientUtil.getBtmService().truncateTable(btName)) {
                        //修改成功记录下成功的业务类型名
                        map.get("btmSuccess").add(btName);
                    }
@@ -1080,12 +1100,12 @@
                }
            }
        }
        if(Func.isNotEmpty(linkNames)){
        if (Func.isNotEmpty(linkNames)) {
            //truncate链接类型数据
            for(int i = 0; i < linkNames.length; i++){
            for (int i = 0; i < linkNames.length; i++) {
                String ltName = linkNames[i];
                try {
                    if(platformClientUtil.getLinkTypeService().truncateTable(ltName)){
                    if (platformClientUtil.getLinkTypeService().truncateTable(ltName)) {
                        map.get("linkSuccess").add(ltName);
                    }
                } catch (PLException e1) {
@@ -1101,6 +1121,7 @@

    /**
     * 删除全部类型
     *
     * @return
     * @throws PLException
     */
@@ -1108,7 +1129,7 @@
    public BaseResult deleteAllType() throws PLException {
        DeleteType deleteType = new DeleteType();
        //获取待删除的业务类型
        List<BizType> delBtList =  deleteType.getDelBtList();
        List<BizType> delBtList = deleteType.getDelBtList();
        //获取待删除的链接类型
        List<LinkType> ltNames = deleteType.getDelLtList();
        //获取待删除的属性
@@ -1125,7 +1146,7 @@
            platformClientUtil.getBtmService().deleteBtsAndTables(delBtList.toArray(new BizType[0]));
        } catch (PLException e) {
            e.printStackTrace();
            String exceptionMessage = "清除业务类型和对应表格时出现异常，原因："+VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "清除业务类型和对应表格时出现异常，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -1133,7 +1154,7 @@
            ClientServiceProvider.getOMDService().getLinkTypeService().deleteLtsAndTables(ltNames.toArray(new LinkType[0]));
        } catch (PLException e) {
            e.printStackTrace();
            String exceptionMessage = "清除链接类型时出现异常，原因："+VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "清除链接类型时出现异常，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -1142,7 +1163,7 @@
            platformClientUtil.getAttributeService().deleteAttributeDefs(abs);
        } catch (PLException e) {
            e.printStackTrace();
            String exceptionMessage = "清除属性池属性时出现异常，原因："+VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "清除属性池属性时出现异常，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -1150,7 +1171,7 @@
            platformClientUtil.getEnumService().deleteEnumTypes(delEnumList.toArray(new EnumType[0]));
        } catch (PLException e) {
            e.printStackTrace();
            String exceptionMessage = "清除枚举类型时出现异常，原因："+VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "清除枚举类型时出现异常，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -1158,7 +1179,7 @@
            platformClientUtil.getLifeCycleService().deleteLifeCycles(delLCList.toArray(new LifeCycle[0]));
        } catch (PLException e) {
            e.printStackTrace();
            String exceptionMessage = "清除生命周期时出现异常，原因："+VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "清除生命周期时出现异常，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -1166,7 +1187,7 @@
            platformClientUtil.getStatePoolService().deleteStatePools(delStateList.toArray(new StatePool[0]));
        } catch (PLException e) {
            e.printStackTrace();
            String exceptionMessage = "清除状态池状态时出现异常，原因："+VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "清除状态池状态时出现异常，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -1174,7 +1195,7 @@
            platformClientUtil.getVersionService().deleteVersionRules(delVRList.toArray(new VersionRule[0]));
        } catch (PLException e) {
            e.printStackTrace();
            String exceptionMessage = "清除版本规则时出现异常，原因："+VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "清除版本规则时出现异常，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
@@ -1183,12 +1204,13 @@

    /**
     * 根据业务类型名称和其下的属性名称获取已有的索引
     *
     * @param conditionMap 根据查询条件传参: typename:业务类型名;
     * @return
     */
    @Override
    public List<IndexObject> getIndexByCondition(Map<String,String> conditionMap) throws PLException {
        if(Func.isEmpty(conditionMap)){
    public List<IndexObject> getIndexByCondition(Map<String, String> conditionMap) throws PLException {
        if (Func.isEmpty(conditionMap)) {
            return new ArrayList<>();
        }
        List<String> indexNameList = new ArrayList<String>();
@@ -1205,15 +1227,15 @@
        //HashMap<String, String> indexmap = new HashMap<String, String>();
        BusinessObject findBTMObjects[] = platformClientUtil.getQueryService().findBTMObjects(qtl.getId(), OQTool.qtTOXMl(qtl).asXML());
        List<IndexObject> indexObjects = new ArrayList<>();
        for(int i = 0; i < findBTMObjects.length; i++) {
        for (int i = 0; i < findBTMObjects.length; i++) {
            BusinessObject findBTMObject = findBTMObjects[i];
            IndexObject indexObject = new IndexObject();
            indexObject.setOid(findBTMObject.oid);
            indexObject.setDescription(findBTMObject.description);
            indexObject.setCreateTime(Func.format(new Date(findBTMObject.createTime),DateUtil.PATTERN_DATE));
            indexObject.setIndexName(ObjectTool.getBOAttributeValue(findBTMObject,"indexname"));
            indexObject.setTypeName(ObjectTool.getBOAttributeValue(findBTMObject,"typename"));
            indexObject.setAttrNames(ObjectTool.getBOAttributeValue(findBTMObject,"attrname"));
            indexObject.setCreateTime(Func.format(new Date(findBTMObject.createTime), DateUtil.PATTERN_DATE));
            indexObject.setIndexName(ObjectTool.getBOAttributeValue(findBTMObject, "indexname"));
            indexObject.setTypeName(ObjectTool.getBOAttributeValue(findBTMObject, "typename"));
            indexObject.setAttrNames(ObjectTool.getBOAttributeValue(findBTMObject, "attrname"));
            indexObjects.add(indexObject);
        }
        return indexObjects;
@@ -1221,18 +1243,19 @@

    /**
     * 根据业务类型名称和其下的属性名称删除索引
     *
     * @param btmName
     * @param indexName
     * @return
     */
    @Override
    public boolean delIndex(String btmName, String indexName) throws PLException {
        VciBaseUtil.alertNotNull(btmName,"业务类型名",indexName,"索引名");
        VciBaseUtil.alertNotNull(btmName, "业务类型名", indexName, "索引名");
        Map<String, String> conditionMap = new HashMap<>();
        conditionMap.put("typename",btmName);
        conditionMap.put("indexname",indexName);
        conditionMap.put("typename", btmName);
        conditionMap.put("indexname", indexName);
        List<IndexObject> bo2 = getIndexByCondition(conditionMap);
        if(bo2!=null && bo2.size()>0) {
        if (bo2 != null && bo2.size() > 0) {
            String[] indexAttr = {indexName};

            boolean alterFlag = platformClientUtil.getBtmService().dropIndex(btmName, indexAttr);
@@ -1243,7 +1266,7 @@
            for (int i = 0; i < bo2.size(); i++) {
                String oid = bo2.get(i).getOid();
                BusinessObject bo = platformClientUtil.getBOFactoryService().readBusinessObject(oid, "indexobject");
                platformClientUtil.getBOFactoryService().deleteBusinessObject(bo,1);
                platformClientUtil.getBOFactoryService().deleteBusinessObject(bo, 1);
            }
        }
        return true;
@@ -1251,12 +1274,13 @@

    /**
     * 给业务类型下的指定属性新增索引
     *
     * @param indexObjectList
     * @return
     */
    @Override
    public boolean addIndex(List<IndexObject> indexObjectList) throws PLException {
        VciBaseUtil.alertNotNull(indexObjectList,"新增的索引信息");
        VciBaseUtil.alertNotNull(indexObjectList, "新增的索引信息");
        String btmName = indexObjectList.get(0).getTypeName();
        String indexNames = indexObjectList.stream().map(IndexObject::getIndexName).collect(Collectors.joining(","));
        String[] oldindexAttr = {indexNames};
@@ -1264,23 +1288,23 @@
        List<BusinessObject> boList = new ArrayList<>();
        //先查询当前添加索引是否已经存在，如果存在就先删除再新增实现替换操作
        Map<String, String> conditionMap = new HashMap<>();
        conditionMap.put("typename",btmName);
        conditionMap.put("typename", btmName);
        //先这样处理，前端现在只做了单次保存，所以不用in
        conditionMap.put("indexname", indexNames);
        List<IndexObject> indexObjects = getIndexByCondition(conditionMap);
        if(indexObjects!=null && indexObjects.size()>0){
        if (indexObjects != null && indexObjects.size() > 0) {
            //索引不存在时删除就会报错索引不存在，所以这里有索引才去删除
            boolean b = platformClientUtil.getBtmService().dropIndex(btmName, oldindexAttr);
            if(b){
                for(int i = 0; i < indexObjects.size(); i ++){
            if (b) {
                for (int i = 0; i < indexObjects.size(); i++) {
                    String oid = (String) indexObjects.get(i).getOid();
                    bo = platformClientUtil.getBOFactoryService().readBusinessObject(oid,"indexobject");
                    platformClientUtil.getBOFactoryService().deleteBusinessObject(bo,1);
                    bo = platformClientUtil.getBOFactoryService().readBusinessObject(oid, "indexobject");
                    platformClientUtil.getBOFactoryService().deleteBusinessObject(bo, 1);
                }
            }
        }

        for(int i = 0; i < indexObjectList.size(); i ++){
        for (int i = 0; i < indexObjectList.size(); i++) {
            IndexObject indexObject = indexObjectList.get(i);
            //bo = platformClientUtil.getBOFService().initBusinessObject("indexobject");
            bo = boService.createCBOByBtmName("indexobject");
@@ -1290,11 +1314,11 @@
            attributeValues.add(new AttributeValue("attrname", indexObject.getAttrNames()));
            bo.newAttrValList = attributeValues.toArray(new AttributeValue[attributeValues.size()]);
            bo.description = indexObject.getDescription();
            String[] indexAttr = {indexObject.getIndexName(),indexObject.getAttrNames()};
            String[] indexAttr = {indexObject.getIndexName(), indexObject.getAttrNames()};
            //给指定业务类型的指定属性创建索引
            boolean alterFlag = platformClientUtil.getBtmService().addIndex(btmName, indexAttr);
            //索引创建成功之后，需要存储成功索引到索引表中
            if(!alterFlag){
            if (!alterFlag) {
                return false;
            }
            boList.add(bo);
@@ -1302,13 +1326,14 @@
            //platformClientUtil.getBOFactoryService().createBusinessObject(bo,false,false);
        }
        //添加索引信息到索引的业务表中
        platformClientUtil.getBOFactoryService().batchCreateBusinessObject(boList.toArray(new BusinessObject[boList.size()]),false,false);
        platformClientUtil.getBOFactoryService().batchCreateBusinessObject(boList.toArray(new BusinessObject[boList.size()]), false, false);
        return true;
    }

    /**
     * 导出业务类型
     * oid 业务类型名称
     *
     * @return 创建结果
     */
    @Override
@@ -1319,7 +1344,7 @@
        //设置列名
        List<String> columns = new ArrayList<>(
                Arrays.asList("类型名称", "标签", "继承自", "实现类", "描述", "版本规则", "版本号规则",
                        "是否手工输入","分隔符", "版次号规则","生命周期", "备选生命周期列表","属性列表")
                        "是否手工输入", "分隔符", "版次号规则", "生命周期", "备选生命周期列表", "属性列表")
        );
        try {
            new File(excelPath).createNewFile();
@@ -1327,25 +1352,25 @@
            List<WriteExcelData> excelDataList = new ArrayList<>();
            //设置列头
            for (int index = 0; index < columns.size(); index++) {
                excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
                excelDataList.add(new WriteExcelData(0, index, columns.get(index)));
            }
            HashSet<String> attributes = new HashSet<>();
            int i = 0;
            for (String name : names.split(",")) {
                BizType bizType = platformClientUtil.getBtmService().getBizTypeByName(name);
                excelDataList.add(new WriteExcelData(i+1,0, bizType.name));
                excelDataList.add(new WriteExcelData(i+1,1, bizType.label));
                excelDataList.add(new WriteExcelData(i+1,2, bizType.fName));
                excelDataList.add(new WriteExcelData(i+1,3, bizType.implClass));
                excelDataList.add(new WriteExcelData(i+1,4, bizType.description));
                excelDataList.add(new WriteExcelData(i+1,5, bizType.revLevel));
                excelDataList.add(new WriteExcelData(i+1,6, bizType.revRuleName));
                excelDataList.add(new WriteExcelData(i+1,7, bizType.revInput));
                excelDataList.add(new WriteExcelData(i+1,8, bizType.delimiter));
                excelDataList.add(new WriteExcelData(i+1,9, bizType.verRuleName));
                excelDataList.add(new WriteExcelData(i+1,10, bizType.lifeCycle));
                excelDataList.add(new WriteExcelData(i+1,11, String.join(",",bizType.lifeCycles)));
                excelDataList.add(new WriteExcelData(i+1,12, String.join(",",bizType.apNameArray)));
                excelDataList.add(new WriteExcelData(i + 1, 0, bizType.name));
                excelDataList.add(new WriteExcelData(i + 1, 1, bizType.label));
                excelDataList.add(new WriteExcelData(i + 1, 2, bizType.fName));
                excelDataList.add(new WriteExcelData(i + 1, 3, bizType.implClass));
                excelDataList.add(new WriteExcelData(i + 1, 4, bizType.description));
                excelDataList.add(new WriteExcelData(i + 1, 5, bizType.revLevel));
                excelDataList.add(new WriteExcelData(i + 1, 6, bizType.revRuleName));
                excelDataList.add(new WriteExcelData(i + 1, 7, bizType.revInput));
                excelDataList.add(new WriteExcelData(i + 1, 8, bizType.delimiter));
                excelDataList.add(new WriteExcelData(i + 1, 9, bizType.verRuleName));
                excelDataList.add(new WriteExcelData(i + 1, 10, bizType.lifeCycle));
                excelDataList.add(new WriteExcelData(i + 1, 11, String.join(",", bizType.lifeCycles)));
                excelDataList.add(new WriteExcelData(i + 1, 12, String.join(",", bizType.apNameArray)));
                attributes.addAll(Arrays.asList(bizType.apNameArray));
                i++;
            }
@@ -1353,20 +1378,21 @@
            ExcelUtil.writeDataToFile(excelPath, excelOption);
            //导出属性
            String attrPath = attributeService.exportAttributes("btmattr",
                    attributes.stream().collect(Collectors.joining(",")),true);
                    attributes.stream().collect(Collectors.joining(",")), true);
            //移动属性到链接类型文件夹里面去
            FileUtil.move(new File(attrPath), new File(defaultTempFolder),true);
            FileUtil.del(attrPath.substring(0,attrPath.lastIndexOf("\\")));
        }catch (IOException e) {
            FileUtil.move(new File(attrPath), new File(defaultTempFolder), true);
            FileUtil.del(attrPath.substring(0, attrPath.lastIndexOf("\\")));
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        File zip = ZipUtil.zip(defaultTempFolder);
        FileUtil.del(defaultTempFolder + File.separator);
        ControllerUtil.writeFileToResponse(response,zip.getAbsoluteFile());
        ControllerUtil.writeFileToResponse(response, zip.getAbsoluteFile());
    }

    /**
     * 导入业务类型
     *
     * @param file 上传的文件
     * @return
     */
@@ -1392,8 +1418,8 @@
            }
        }
        //TODO：导入属性，但是这个逻辑实际上存在一些问题，导入的属性只是业务类型的属性不应该去给属性池导入，可能是想的属性不存在的就新增一次
        BaseResult baseResult = attributeService.importAttributes(attrExcel,true);
        if(!baseResult.isSuccess()){
        BaseResult baseResult = attributeService.importAttributes(attrExcel, true);
        if (!baseResult.isSuccess()) {
            //删除上传的文件夹
            FileUtil.del(defaultTempFolder + File.separator);
            return baseResult;
@@ -1408,13 +1434,14 @@
                return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"没有导入的链接文件。导入终止！"});
            }
        }
        try{
        try {
            //1、读取excel中的数据，组成对象
            ReadExcelOption excelOption = new ReadExcelOption();
            List<OsBtmTypePO> poList = ExcelUtil.readDataObjectFromExcel(btmExcel, OsBtmTypePO.class,excelOption,(value, po, fieldName)->{});
            List<OsBtmTypePO> poList = ExcelUtil.readDataObjectFromExcel(btmExcel, OsBtmTypePO.class, excelOption, (value, po, fieldName) -> {
            });
            //去除都是空的情况
            if(CollectionUtils.isEmpty(poList)){
                return BaseResult.fail(ExcelLangCodeConstant.IMPORT_CONTENT_NULL,new String[]{});
            if (CollectionUtils.isEmpty(poList)) {
                return BaseResult.fail(ExcelLangCodeConstant.IMPORT_CONTENT_NULL, new String[]{});
            }
            //当前excel中是否重复用的判重Map:（key：判重属性，value：行号）
            Map<String, String> excelReapeat = new HashMap<>();
@@ -1422,25 +1449,25 @@

            //判断必填属性是否为空，用户是否已存在，以及部门是否填错等校验逻辑
            poList.stream().forEach(osBtmTypePO -> {
                if(Func.isBlank(osBtmTypePO.getName())){//属性名判空
                    throw new VciBaseException("第【"+osBtmTypePO.getRowIndex()+"】行，name");
                }else if(osBtmTypePO.getName().length() > maxLength){
                    throw new VciBaseException("第【"+osBtmTypePO.getRowIndex()+"】行，业务类型名长度不能超过" + maxLength);
                }else if(!osBtmTypePO.getName().matches("^[A-Za-z]+$")){
                    throw new VciBaseException("第【"+osBtmTypePO.getRowIndex()+"】行，业务类型名称只能为英文字母");
                }else if (osBtmTypePO.getName().length() > maxLength) {
                    throw new VciBaseException("第【"+osBtmTypePO.getRowIndex()+"】行，业务类型名长度不能超过" + maxLength);
                }else if(excelReapeat.containsKey(osBtmTypePO.getName())){//业务类型名在表格中判重
                    throw new VciBaseException("第【"+excelReapeat.get(osBtmTypePO.getName())+"】行和第【"+osBtmTypePO.getRowIndex()+"】行数据，业务类型名重复");
                }else if (Func.isBlank(osBtmTypePO.getLifeCycle())) {
                    throw new VciBaseException("第【"+osBtmTypePO.getRowIndex()+"】行，生命周期不能为空");
                }else if ("true".equalsIgnoreCase(osBtmTypePO.getRevInput()) && Func.isBlank(osBtmTypePO.getRevRuleName())) {
                    throw new VciBaseException("第【"+osBtmTypePO.getRowIndex()+"】行，版本号规则不能为空");
                if (Func.isBlank(osBtmTypePO.getName())) {//属性名判空
                    throw new VciBaseException("第【" + osBtmTypePO.getRowIndex() + "】行，name");
                } else if (osBtmTypePO.getName().length() > maxLength) {
                    throw new VciBaseException("第【" + osBtmTypePO.getRowIndex() + "】行，业务类型名长度不能超过" + maxLength);
                } else if (!osBtmTypePO.getName().matches("^[A-Za-z]+$")) {
                    throw new VciBaseException("第【" + osBtmTypePO.getRowIndex() + "】行，业务类型名称只能为英文字母");
                } else if (osBtmTypePO.getName().length() > maxLength) {
                    throw new VciBaseException("第【" + osBtmTypePO.getRowIndex() + "】行，业务类型名长度不能超过" + maxLength);
                } else if (excelReapeat.containsKey(osBtmTypePO.getName())) {//业务类型名在表格中判重
                    throw new VciBaseException("第【" + excelReapeat.get(osBtmTypePO.getName()) + "】行和第【" + osBtmTypePO.getRowIndex() + "】行数据，业务类型名重复");
                } else if (Func.isBlank(osBtmTypePO.getLifeCycle())) {
                    throw new VciBaseException("第【" + osBtmTypePO.getRowIndex() + "】行，生命周期不能为空");
                } else if ("true".equalsIgnoreCase(osBtmTypePO.getRevInput()) && Func.isBlank(osBtmTypePO.getRevRuleName())) {
                    throw new VciBaseException("第【" + osBtmTypePO.getRowIndex() + "】行，版本号规则不能为空");
                }
                try {
                    BizType historyBtm = platformClientUtil.getBtmService().getBizTypeByName(osBtmTypePO.getName());
                    //已有此数据进行删除覆盖
                    if(historyBtm != null && !historyBtm.name.equals("")){
                    if (historyBtm != null && !historyBtm.name.equals("")) {
                        platformClientUtil.getBtmService().deleteBizType(historyBtm);
                    }
                } catch (PLException e) {
@@ -1448,7 +1475,7 @@
                }

                //属性名excel中判重处理
                excelReapeat.put(osBtmTypePO.getName(),osBtmTypePO.getRowIndex());
                excelReapeat.put(osBtmTypePO.getName(), osBtmTypePO.getRowIndex());
                BizType bizType = new BizType();
                bizType.name = osBtmTypePO.getName();
                bizType.label = osBtmTypePO.getLable();
@@ -1472,12 +1499,12 @@
                    throw new RuntimeException(e);
                }
            });
        }catch (Exception e){
            if(logger.isErrorEnabled()){
                logger.error("读取excel内容时或保存业务类型信息时出现了错误，具体原因：",VciBaseUtil.getExceptionMessage(e));
        } catch (Exception e) {
            if (logger.isErrorEnabled()) {
                logger.error("读取excel内容时或保存业务类型信息时出现了错误，具体原因：", VciBaseUtil.getExceptionMessage(e));
            }
            e.printStackTrace();
            return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);
            return BaseResult.fail(VciBaseUtil.getExceptionMessage(e), new String[]{}, e);
        }
        //删除上传的文件夹
        FileUtil.del(defaultTempFolder + File.separator);
@@ -1486,12 +1513,13 @@

    /**
     * 获取需要修复的伪sql
     *
     * @param dbCheckMap
     * @return
     */
    private List<String> getRepairDML(Map<String, String> dbCheckMap) {
        List<String> list = new ArrayList<String>();
        for(Iterator<String> ite = dbCheckMap.keySet().iterator(); ite.hasNext();){
        for (Iterator<String> ite = dbCheckMap.keySet().iterator(); ite.hasNext(); ) {
            String type = ite.next();
            String dml = dbCheckMap.get(type);
            list.add(type + "/DML" + dml);
@@ -1515,18 +1543,18 @@
            e.printStackTrace();
            String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            throw new PLException("500",new String[]{exceptionMessage});
            throw new PLException("500", new String[]{exceptionMessage});
        }
        return flag;
    }

    private List<Tree> getChildren(List<OsBtmTypeVO> osBtmTypeVOS,OsBtmTypeVO parentBIzType){
        List<Tree> trees= new ArrayList<>();
    private List<Tree> getChildren(List<OsBtmTypeVO> osBtmTypeVOS, OsBtmTypeVO parentBIzType) {
        List<Tree> trees = new ArrayList<>();
        for (OsBtmTypeVO bizType : osBtmTypeVOS) {
            if(StringUtils.isBlank(bizType.getfName())){
            if (StringUtils.isBlank(bizType.getfName())) {
                continue;
            }
            if(bizType.getfName().equals(parentBIzType.getId())){
            if (bizType.getfName().equals(parentBIzType.getId())) {
                Tree tree = new Tree();
                tree.setOid(bizType.getOid());
                tree.setParentName(parentBIzType.getfName());
@@ -1534,7 +1562,7 @@
                tree.setLeaf(true);
                tree.setText(bizType.getDescription());
                tree.setAttributes(WebUtil.objectToMapString(bizType));
                tree.setChildren(getChildren(osBtmTypeVOS,bizType));
                tree.setChildren(getChildren(osBtmTypeVOS, bizType));
                trees.add(tree);
            }
        }
@@ -1544,12 +1572,12 @@
    /**
     * 将业务类型拼接json
     *
     * @param nodeVOList  对象节点的信息
     * @param relationVOList  关系的信息
     * @param btmTypeVO 业务类型显示对象
     * @param hasRefer 包含参照
     * @param nodeVOList     对象节点的信息
     * @param relationVOList 关系的信息
     * @param btmTypeVO      业务类型显示对象
     * @param hasRefer       包含参照
     */
    private void splicingBtmType2Json(List<OsERNodeVO> nodeVOList, List<OsERRelationVO> relationVOList, OsBtmTypeVO btmTypeVO,boolean hasRefer) {
    private void splicingBtmType2Json(List<OsERNodeVO> nodeVOList, List<OsERRelationVO> relationVOList, OsBtmTypeVO btmTypeVO, boolean hasRefer) {
        OsERNodeVO nodeVO = new OsERNodeVO();
        nodeVO.setKey(btmTypeVO.getId() + " " + btmTypeVO.getName());
        List<OsERNodePropertyVO> itemList = new ArrayList<>();
@@ -1557,15 +1585,15 @@
            OsERNodePropertyVO nodePropertyVO = new OsERNodePropertyVO();
            nodePropertyVO.setName(attribute.getId() + " " + attribute.getName());
            nodePropertyVO.setKey("oid".equals(attribute.getId().toLowerCase()));
            if(StringUtils.isNotBlank(attribute.getReferBtmTypeId())){
            if (StringUtils.isNotBlank(attribute.getReferBtmTypeId())) {
                //参照的属性，设置为黄色
                nodePropertyVO.setColor("#FEDD32FF");
            }else{
            } else {
                nodePropertyVO.setColor("#000");
            }
            itemList.add(nodePropertyVO);
            //判断参照
            if(hasRefer) {
            if (hasRefer) {
                selectReferenceBtmType(attribute, btmTypeVO, nodeVOList, relationVOList);
            }
        });
@@ -1576,9 +1604,9 @@
    /**
     * 判断业务类型的属性是不是参照类型，并将参照添加到ER图中
     *
     * @param attribute     业务类型属性
     * @param nodeVOList  节点信息
     * @param btmTypeVO 业务类型
     * @param attribute      业务类型属性
     * @param nodeVOList     节点信息
     * @param btmTypeVO      业务类型
     * @param relationVOList 关系信息
     */
    private void selectReferenceBtmType(OsBtmTypeAttributeVO attribute, OsBtmTypeVO btmTypeVO,
@@ -1592,14 +1620,14 @@
            nodeVO.setKey(referenceBtmType.getId() + " " + referenceBtmType.getName());

            List<OsERNodePropertyVO> items = new ArrayList<>();
            if(referenceBtmType.getId().equalsIgnoreCase(btmTypeVO.getId())){
            if (referenceBtmType.getId().equalsIgnoreCase(btmTypeVO.getId())) {
                //参照自己的内容
                OsERRelationVO relationVO = new OsERRelationVO();
                relationVO.setTo(referenceBtmType.getId() + " " + referenceBtmType.getName());
                relationVO.setFrom(btmTypeVO.getId() + " " + btmTypeVO.getName());
                relationVO.setToText("自参照");
                relationVOList.add(relationVO);
            }else {
            } else {
                referenceBtmAttributes.forEach(attr -> {
                    OsERNodePropertyVO nodePropertyVO = new OsERNodePropertyVO();
                    nodePropertyVO.setName(attr.getId() + " " + attr.getName());
@@ -1622,23 +1650,23 @@
    /**
     * 加载业务类型所关联的链接类型
     *
     * @param nodeVOList  节点信息
     * @param nodeVOList     节点信息
     * @param relationVOList 关系的信息
     * @param btmTypeVO    业务类型
     * @param btmTypeVO      业务类型
     */
    private void loadAllLinkTypeByBtmType(List<OsERNodeVO> nodeVOList, List<OsERRelationVO> relationVOList, OsBtmTypeVO btmTypeVO) {
        Map<String, OsLinkTypeVO> linkTypeVOMap = linkTypeService.selectAllLinkMap();
        Collection<OsLinkTypeVO> linkTypeVOS = linkTypeVOMap.values();
        Set<OsLinkTypeVO> fromLinkTypeVOList = linkTypeVOS.stream().filter(link ->
            Arrays.stream(link.getFromBtmType().split(",")).anyMatch(s->s.equalsIgnoreCase(btmTypeVO.getId()))
                Arrays.stream(link.getFromBtmType().split(",")).anyMatch(s -> s.equalsIgnoreCase(btmTypeVO.getId()))
        ).collect(Collectors.toSet());
        Set<OsLinkTypeVO> toLinkTypeList = linkTypeVOS.stream().filter(link ->
                Arrays.stream(link.getToBtmType().split(",")).anyMatch(s->s.equalsIgnoreCase(btmTypeVO.getId()))).collect(Collectors.toSet());
                Arrays.stream(link.getToBtmType().split(",")).anyMatch(s -> s.equalsIgnoreCase(btmTypeVO.getId()))).collect(Collectors.toSet());
        List<OsLinkTypeVO> linkTypeVOList = new ArrayList<>();
        linkTypeVOList.addAll(fromLinkTypeVOList);
        linkTypeVOList.addAll(toLinkTypeList);
        if (!CollectionUtils.isEmpty(linkTypeVOList)) {
            splicingLinkType2Json(nodeVOList, relationVOList,linkTypeVOList,btmTypeVO,false);
            splicingLinkType2Json(nodeVOList, relationVOList, linkTypeVOList, btmTypeVO, false);
        }

    }
@@ -1646,31 +1674,31 @@
    /**
     * 将链接类型拼接成json
     *
     * @param nodeVOList  节点信息
     * @param relationVOList  关系信息
     * @param linkTypeVOs 链接类型
     * @param btmTypeVO 业务类型的显示对象
     * @param used 是否为被使用
     * @param nodeVOList     节点信息
     * @param relationVOList 关系信息
     * @param linkTypeVOs    链接类型
     * @param btmTypeVO      业务类型的显示对象
     * @param used           是否为被使用
     */
    private void splicingLinkType2Json(List<OsERNodeVO> nodeVOList, List<OsERRelationVO> relationVOList,
                                       List<OsLinkTypeVO> linkTypeVOs,OsBtmTypeVO btmTypeVO,boolean used) {
                                       List<OsLinkTypeVO> linkTypeVOs, OsBtmTypeVO btmTypeVO, boolean used) {
        linkTypeVOs.forEach(link -> {
            List<OsLinkTypeAttributeVO> attributeList = link.getAttributes();
            OsERNodeVO nodeVO= new OsERNodeVO();
            OsERNodeVO nodeVO = new OsERNodeVO();
            nodeVO.setKey(link.getId() + " " + link.getName());
            List<OsERNodePropertyVO> items = new ArrayList<>();
            attributeList.forEach(attr -> {
                OsERNodePropertyVO nodePropertyVO = new OsERNodePropertyVO();
                nodePropertyVO.setName(attr.getId() + " " + attr.getName());
                nodePropertyVO.setKey("oid".equals(attr.getId().toLowerCase()));
                if(StringUtils.isNotBlank(attr.getReferBtmTypeId())) {
                if (StringUtils.isNotBlank(attr.getReferBtmTypeId())) {
                    nodePropertyVO.setColor("#FEDD32FF");
                }else {
                } else {
                    nodePropertyVO.setColor("#1c446f");
                }
                items.add(nodePropertyVO);
                //判断参照
                if(!used) {
                if (!used) {
                    selectReferenceLinkType(attr, link, nodeVOList, relationVOList);
                }
            });
@@ -1682,26 +1710,26 @@

            nodeVOList.add(nodeVO);

            if(used){
            if (used) {
                relationVO.setText("被引用");
            }
            //如果当前的from端，那么就显示to端的
            //如果当前的是to端的，那么就显示from端的内容
            if(Arrays.stream(link.getFromBtmType().split(",")).anyMatch(s->s.equalsIgnoreCase(btmTypeVO.getId()))){
            if (Arrays.stream(link.getFromBtmType().split(",")).anyMatch(s -> s.equalsIgnoreCase(btmTypeVO.getId()))) {
                //这个是from端
               if(!used) {
                   relationVO.setToText("from端");
               }
                if (!used) {
                    relationVO.setToText("from端");
                }
                //找这个链接类型的to端的业务类型
               link.getToBtmTypeVOS().stream().forEach(toBtm->{
                    splicingBtmType2JsonForLink(nodeVOList,relationVOList,link,toBtm,true);
               });
            }else{
                if(!used) {
                link.getToBtmTypeVOS().stream().forEach(toBtm -> {
                    splicingBtmType2JsonForLink(nodeVOList, relationVOList, link, toBtm, true);
                });
            } else {
                if (!used) {
                    relationVO.setToText("to端");
                }
                link.getFromBtmTypeVOS().stream().forEach(fromBtm->{
                    splicingBtmType2JsonForLink(nodeVOList,relationVOList,link,fromBtm,false);
                link.getFromBtmTypeVOS().stream().forEach(fromBtm -> {
                    splicingBtmType2JsonForLink(nodeVOList, relationVOList, link, fromBtm, false);
                });
            }
            relationVOList.add(relationVO);
@@ -1710,11 +1738,12 @@

    /**
     * 链接类型关键的业务类型
     * @param nodeVOList 对象列表
     *
     * @param nodeVOList     对象列表
     * @param relationVOList 关联关系列表
     * @param link 链接类型
     * @param btmTypeVO 业务类型
     * @param to 是否为to端
     * @param link           链接类型
     * @param btmTypeVO      业务类型
     * @param to             是否为to端
     */
    private void splicingBtmType2JsonForLink(List<OsERNodeVO> nodeVOList, List<OsERRelationVO> relationVOList, OsLinkTypeVO link, OsBtmTypeVO btmTypeVO, boolean to) {
        OsERNodeVO nodeVO = new OsERNodeVO();
@@ -1732,7 +1761,7 @@
        OsERRelationVO relationVO = new OsERRelationVO();
        relationVO.setFrom(link.getId() + " " + link.getName());
        relationVO.setTo(btmTypeVO.getId() + " " + btmTypeVO.getName());
        relationVO.setToText(to?"to端":"from端");
        relationVO.setToText(to ? "to端" : "from端");
        relationVOList.add(relationVO);
        nodeVOList.add(nodeVO);
    }
@@ -1740,12 +1769,12 @@
    /**
     * 判断链接类型的属性是不是参照类型，并将参照添加到ER图中
     *
     * @param attr          链接类型的属性
     * @param linkTypeVO 链接类型的内容
     * @param nodeVOList 节点对象
     * @param attr           链接类型的属性
     * @param linkTypeVO     链接类型的内容
     * @param nodeVOList     节点对象
     * @param relationVOList 关系对象
     */
    private void selectReferenceLinkType(OsLinkTypeAttributeVO attr, OsLinkTypeVO linkTypeVO,List<OsERNodeVO> nodeVOList, List<OsERRelationVO> relationVOList) {
    private void selectReferenceLinkType(OsLinkTypeAttributeVO attr, OsLinkTypeVO linkTypeVO, List<OsERNodeVO> nodeVOList, List<OsERRelationVO> relationVOList) {
        if (StringUtils.isNotBlank(attr.getReferBtmTypeId())) {
            //是参照类型的
            OsBtmTypeVO referenceBtmType = getBtmById(attr.getReferBtmTypeId());
@@ -1775,7 +1804,7 @@
    /**
     * 封装删除全部类型相关的查询方法的内部类
     */
    private class DeleteType{
    private class DeleteType {

        private List<String> exceptBts, exceptAbs, exceptEnums, exceptRev, exceptLCs, exceptStates;

@@ -1786,20 +1815,21 @@

        /**
         * 获取需要删除的业务类型
         *
         * @return
         */
        public List<BizType> getDelBtList() throws PLException {
            List<BizType> list = new ArrayList<>();
            BizType[] bts = platformClientUtil.getBtmService().getBizTypes("");
            for(BizType bt : bts){
            for (BizType bt : bts) {
                boolean exceptFlag = false;
                for(String except : exceptBts){
                    if(except.equalsIgnoreCase(bt.name)){
                for (String except : exceptBts) {
                    if (except.equalsIgnoreCase(bt.name)) {
                        exceptFlag = true;
                        break;
                    }
                }
                if(!exceptFlag){
                if (!exceptFlag) {
                    list.add(bt);
                }
            }
@@ -1808,6 +1838,7 @@

        /**
         * 获取需要删除的链接类型
         *
         * @return
         */
        public List<LinkType> getDelLtList() throws PLException {
@@ -1817,6 +1848,7 @@

        /**
         * 获取待删除的属性
         *
         * @return
         */
        public List<String> getDelAbList() {
@@ -1829,26 +1861,26 @@
            }
            //依据保留的类型构造保留的属性
            exceptAbs = new ArrayList<String>();
            for(String except : exceptBts){
            for (String except : exceptBts) {
                String[] btmApNameArray = null;
                try {
                    btmApNameArray = platformClientUtil.getBtmService().getAttributeNames(except);
                } catch (PLException e) {
                    e.printStackTrace();
                }
                if(btmApNameArray != null){
                    for(String abName : btmApNameArray){
                        if(!exceptAbs.contains(abName)){
                if (btmApNameArray != null) {
                    for (String abName : btmApNameArray) {
                        if (!exceptAbs.contains(abName)) {
                            exceptAbs.add(abName);
                        }
                    }
                }
            }
            //构造可删除的属性
            if(attribItems != null){
                for(AttributeDef ab : attribItems){
            if (attribItems != null) {
                for (AttributeDef ab : attribItems) {
                    String abName = ab.name;
                    if(!exceptAbs.contains(abName)){
                    if (!exceptAbs.contains(abName)) {
                        list.add(abName);
                    }
                }
@@ -1858,6 +1890,7 @@

        /**
         * 获取待删除的枚举类型
         *
         * @return
         */
        public List<EnumType> getDelEnumList() {
@@ -1867,15 +1900,15 @@
                exceptEnums = new ArrayList<String>();
                EnumType[] emItems = ClientServiceProvider.getOMDService().getEnumService().getEnumTypes("", 0, 0);
                AttributeDef[] abs = platformClientUtil.getAttributeService().getAttributeDefsByNames(exceptAbs.toArray(new String[0]));
                for(AttributeDef ab : abs){
                for (AttributeDef ab : abs) {
                    OtherInfo otherInfo = OtherInfo.getOtherInfoByText(ab.other);
                    String enumName = otherInfo.getEnumName();
                    if(enumName != null && !enumName.equals("") && !exceptEnums.contains(enumName)){
                    if (enumName != null && !enumName.equals("") && !exceptEnums.contains(enumName)) {
                        exceptEnums.add(enumName);
                    }
                }
                for(EnumType em : emItems){
                    if(!exceptEnums.contains(em.name)){
                for (EnumType em : emItems) {
                    if (!exceptEnums.contains(em.name)) {
                        list.add(em);
                    }
                }
@@ -1887,17 +1920,18 @@

        /**
         * 获取待删除的生命周期
         *
         * @return
         */
        public List<LifeCycle> getDelLCList(){
        public List<LifeCycle> getDelLCList() {
            List<LifeCycle> list = new ArrayList<LifeCycle>();
            exceptLCs = new ArrayList<String>();
            exceptStates = new ArrayList<String>();
            for(String btName : exceptBts){
            for (String btName : exceptBts) {
                try {
                    BizType bt = platformClientUtil.getBtmService().getBizTypeByName(btName);
                    String lcName = bt.lifeCycle;
                    if(lcName != null && !lcName.equals("") && !exceptLCs.contains(lcName)){
                    if (lcName != null && !lcName.equals("") && !exceptLCs.contains(lcName)) {
                        exceptLCs.add(lcName);
                    }
                } catch (PLException e) {
@@ -1911,15 +1945,15 @@
            } catch (PLException e) {
                e.printStackTrace();
            }
            if(lcs != null){
                for(LifeCycle lc : lcs){
            if (lcs != null) {
                for (LifeCycle lc : lcs) {
                    String name = lc.name;
                    if(name != null && !name.equals("") && !exceptLCs.contains(name)){
                    if (name != null && !name.equals("") && !exceptLCs.contains(name)) {
                        list.add(lc);
                    }else{
                    } else {
                        //保留的状态池
                        Bound[] bounds = lc.bounds;
                        for(Bound bound : bounds){
                        for (Bound bound : bounds) {
                            String sName = bound.name;
                            exceptStates.add(sName);
                        }
@@ -1931,9 +1965,10 @@

        /**
         * 获取待删除的状态
         *
         * @return
         */
        public List<StatePool> getDelSPList(){
        public List<StatePool> getDelSPList() {
            List<StatePool> list = new ArrayList<StatePool>();
            StatePool[] states = null;
            try {
@@ -1941,10 +1976,10 @@
            } catch (PLException e) {
                e.printStackTrace();
            }
            if(states != null){
                for(StatePool state : states){
            if (states != null) {
                for (StatePool state : states) {
                    String name = state.name;
                    if(name != null && !name.equals("") && !exceptStates.contains(name)){
                    if (name != null && !name.equals("") && !exceptStates.contains(name)) {
                        list.add(state);
                    }
                }
@@ -1954,16 +1989,17 @@

        /**
         * 获取待删除的版本规则
         *
         * @return
         */
        public List<VersionRule> getDelVRList(){
        public List<VersionRule> getDelVRList() {
            List<VersionRule> list = new ArrayList<VersionRule>();
            exceptRev = new ArrayList<String>();
            for(String btName : exceptBts){
            for (String btName : exceptBts) {
                try {
                    BizType bt = platformClientUtil.getBtmService().getBizTypeByName(btName);
                    String revName = bt.revRuleName;
                    if(revName != null && !revName.equals("") && !exceptRev.contains(revName)){
                    if (revName != null && !revName.equals("") && !exceptRev.contains(revName)) {
                        exceptRev.add(revName);
                    }
                } catch (PLException e) {
@@ -1976,10 +2012,10 @@
            } catch (PLException e) {
                e.printStackTrace();
            }
            if(revs != null){
                for(VersionRule rev : revs){
            if (revs != null) {
                for (VersionRule rev : revs) {
                    String name = rev.name;
                    if(name != null && !name.equals("") && !exceptRev.contains(name)){
                    if (name != null && !name.equals("") && !exceptRev.contains(name)) {
                        list.add(rev);
                    }
                }

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

@@ -2118,7 +2118,6 @@
        return roleRightVOS;
    }


    /**
     * UI角色对象转换
     * @param infos