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

@@ -21,7 +21,8 @@
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.Lcm.Func;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
@@ -29,7 +30,6 @@
import com.vci.starter.word.util.WordUtil;
import com.vci.web.properties.OsDDLExportWordFieldProperties;
import com.vci.web.service.*;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -274,7 +274,7 @@
                lifeCyle = lifeCycleService.lifeCycleVO2DO(allLifeCycleLowMap.get(lifeCycleId));
                edit = true;
            }
            lifeCyle.tag = lifeCycleDTO.getName();
            lifeCyle.label = lifeCycleDTO.getName();
            lifeCyle.description = lifeCycleDTO.getDescription() == null?"":lifeCycleDTO.getDescription();
            lifeCyle.startState = lifeCycleDTO.getStartStatus() == null?"":lifeCycleDTO.getStartStatus();
            lifeCyle.modifier = userId;
@@ -762,7 +762,14 @@

                    attributes.stream().forEach( t -> {
                        int index = indexMap.get("index");
                        Map<String,Object> columnData = attributeToWordMap(t,index);
                        Map<String,Object> columnData = null;
                        try {
                            columnData = attributeToWordMap(t,index);
                        } catch (PLException e) {
                            e.printStackTrace();
                            String exceptionMessage = "将属性对象拷贝到word数据对象中时出现错误，原因："+VciBaseUtil.getExceptionMessage(e);
                            logger.error(exceptionMessage);
                        }
                        indexMap.put("index",index+1);
                        columnDataList.add(columnData);
                    });
@@ -794,7 +801,7 @@
                List<OsBtmTypeAttributeVO> attributes = new ArrayList<>();
                linkAttributes.stream().forEach(t -> {
                    OsBtmTypeAttributeVO attributeVO = new OsBtmTypeAttributeVO();
                    BeanUtil.convert(t,attributeVO);
                    BeanUtilForVCI.convert(t,attributeVO);
                    attributeVO.setPkBtmType(t.getPkLinkType());
                    attributes.add(attributeVO);
                });
@@ -804,7 +811,14 @@
                    indexMap.put("index",1);
                    attributes.stream().forEach( t -> {
                        int index = indexMap.get("index");
                        Map<String,Object> columnData = attributeToWordMap(t,index);
                        Map<String,Object> columnData = null;
                        try {
                            columnData = attributeToWordMap(t,index);
                        } catch (PLException e) {
                            e.printStackTrace();
                            String exceptionMessage = "将属性对象拷贝到word数据对象中时出现错误，原因："+VciBaseUtil.getExceptionMessage(e);
                            logger.error(exceptionMessage);
                        }
                        indexMap.put("index",index+1);
                        columnDataList.add(columnData);
                    });
@@ -920,7 +934,15 @@
        if(!CollectionUtils.isEmpty(linkTypeVOList)){
            linkTypeVOList.stream().forEach(linkTypeVO->{
                String linkTypeId = linkTypeVO.getId();
                List<OsLinkTypeAttributeVO> attributeVOS = linkTypeService.listAttributeByLinkId(linkTypeId);
                List<OsLinkTypeAttributeVO> attributeVOS = null;
                try {
                    attributeVOS = linkTypeService.listAttributeByLinkId(linkTypeId);
                } catch (PLException e) {
                    e.printStackTrace();
                    String errorLog = "查询链接类型时出现错误，原因："+VciBaseUtil.getExceptionMessage(e);
                    logger.error(errorLog);
                    throw new VciBaseException(errorLog);
                }
                //先是名称
                int rowIndex = index[0];
                WriteExcelData idED = new WriteExcelData(rowIndex, 0, linkTypeId);
@@ -1063,7 +1085,7 @@
     * @param index 索引
     * @return 数据映射,key 是word里的域字段，value是对应的值
     */
    private  Map<String,Object> attributeToWordMap(OsBtmTypeAttributeVO btmTypeAttributeVO,int index){
    private  Map<String,Object> attributeToWordMap(OsBtmTypeAttributeVO btmTypeAttributeVO,int index) throws PLException {
        Map<String,Object> columnData = new HashMap<>();
        if(StringUtils.isNotBlank(wordFieldProperties.getColumnIndex())) {
            columnData.put(wordFieldProperties.getColumnIndex(), index);
@@ -1121,7 +1143,6 @@
        return "";
    }


    /**
     * 添加属性到oracle
     * @param addedAbList 添加的属性
@@ -1165,10 +1186,6 @@
//            DDLToolClient.getService().batchExecuteUpdateOracle(new String[]{removeSql});
        }
    }





    /**
     * 封装业务类型
@@ -1238,7 +1255,7 @@
            linkType.modifyTime = now;
            linkType.id = "";
            linkType.name = linkId;
            linkType.tag = linkTypeDTO.getName();
            linkType.label = linkTypeDTO.getName();
            linkType.description = linkTypeDTO.getDescription() == null ?"":linkTypeDTO.getDescription();
            linkType.implClass = "";
            linkType.shape = "";