集成统一接口移植

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -881,21 +881,7 @@
        }
    }

    /**
     * 是否为修改忽略的属性
     * @param attrName 属性的名字
     * @return true 表示应该忽略
     */
    @Override
    public boolean checkUnAttrUnEdit(String attrName){
        return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
            ||"ts".equalsIgnoreCase(attrName)
            || "lastmodifier".equalsIgnoreCase(attrName)
            || "lastmodifytime".equalsIgnoreCase(attrName)
            || "createtime".equalsIgnoreCase(attrName)
            || "checkintime".equalsIgnoreCase(attrName)
            ||"checkouttime".equalsIgnoreCase(attrName));
    }


    /**
     * 保存可输可选的信息

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java

@@ -21,6 +21,7 @@
import com.vci.ubcs.code.vo.webserviceModel.attrmap.RowDatas;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.feign.IWebSecretClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -59,6 +60,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.io.File;
@@ -154,6 +156,11 @@
     */
    @Autowired
    private IBtmTypeClient btmTypeClient;
    /***
     * 密级服务
     */
    @Resource
    private IWebSecretClient secretService;
    /**
     * 批量申请：选取选中分类下的所有模板关键属性，相似属性，必填属性，写入execl中
     *
@@ -1859,6 +1866,7 @@
     * @param dataObjectVO 数据信息
     * @param resultDataObjectDetailDOs 错误信息
     */
    @Transactional(rollbackFor = VciBaseException.class)
    @Override
    public void batchSyncEditDatas(CodeClassifyVO codeClassifyVO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs) {
        String errorid="";
@@ -2283,10 +2291,10 @@

            }
            int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
            /*if (secret == 0 || !secretService.checkDataSecret(secret)) {
            if (secret == 0 || !secretService.checkDataSecret(secret).getData()) {
                Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                cbo.setAttributeValue(SECRET_FIELD, String.valueOf((userSecret == null || userSecret == 0) ? UserSecretEnum.NONE.getValue() : userSecret));
            }*/
            }
        } catch (Throwable e) {
            log.error("设置默认的属性的值错误", e);
        }
@@ -2535,11 +2543,11 @@
                    cbo.setAttributeValue(CODE_CLASSIFY_OID_FIELD,classifyFullInfo.getCurrentClassifyVO().getOid());
                    cbo.setAttributeValue(CODE_FULL_PATH_FILED,fullPath);
                    int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    /*if(secret == 0 || !secretService.checkDataSecret(secret) ){
                    if(secret == 0 || !secretService.checkDataSecret(secret).getData() ){
                        Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                        String secretValue= String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret);
                        cbo.setAttributeValue(SECRET_FIELD,secretValue);
                    }*/
                    }
                    if(rowData.getStatus().equals(CodeDefaultLC.DISABLE.getValue())){//停用
                        cbo.setLcStatus(CodeDefaultLC.DISABLE.getValue());
                    }else if(rowData.getStatus().equals(CodeDefaultLC.EDITING.getValue())){//编辑
@@ -2633,11 +2641,11 @@
                    cbo.setAttributeValue(CODE_CLASSIFY_OID_FIELD,classifyFullInfo.getCurrentClassifyVO().getOid());
                    cbo.setAttributeValue(CODE_FULL_PATH_FILED,fullPath);
                    //cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
                    /*int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    if(secret == 0 || !secretService.checkDataSecret(secret) ){
                    int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    if(secret == 0 || !secretService.checkDataSecret(secret).getData() ){
                        Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                        cbo.setAttributeValue(SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
                    }*/
                    }
                }else{
                    //此时还没有转换路径
                    //cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));
@@ -2690,10 +2698,10 @@
                    cbo.setAttributeValue(CODE_FULL_PATH_FILED,fullPath);
                    //cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
                    int secret = VciBaseUtil.getInt(cbo.getAttributeValue(SECRET_FIELD));
                    /*if(secret == 0 || !secretService.checkDataSecret(secret) ){
                    if(secret == 0 || !secretService.checkDataSecret(secret).getData() ){
                        Integer userSecret = VciBaseUtil.getCurrentUserSecret();
                        cbo.setAttributeValue(SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
                    }*/
                    }
                }else{
                    //此时还没有转换路径
                    //cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java

@@ -10,31 +10,43 @@
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.util.ClientBusinessObject;
import com.vci.ubcs.code.util.gennerAttrMapUtil;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.vo.webserviceModel.apply.*;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.*;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.DataObjectVO;
import com.vci.ubcs.code.vo.webserviceModel.classify.*;
import com.vci.ubcs.code.vo.webserviceModel.data.*;
import com.vci.ubcs.code.vo.webserviceModel.result.json.*;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultClassfyVO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultSystemVO;
import com.vci.ubcs.code.webService.annotation.VciWebservice;
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;

import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC;

/***
 * 统一接口
@@ -56,6 +68,19 @@
     */
    @Autowired(required = false)
    private ICodeClassifyService classifyService;

    /**
     * 业务类型的服务
     */
    @Autowired
    private IBtmTypeClient btmTypeClient;

    /**
     * 通用查询
     */
    @Resource
    private CommonsMapper commonsMapper;

    /**
     * 主数据引擎的服务
     */
@@ -68,6 +93,9 @@

    @Resource
    private MdmIOService mdmIOService;

    @Autowired
    private ICodeClassifyValueService codeClassifyValueService;
    /***
     * 集成接口日志服务的配置
     */
@@ -88,154 +116,160 @@
     */
    @Override
    public String applyCode(String data, String dataType) throws Throwable {
        {
            String resultStr = "";
            String errorid="0";
            msg="成功";
            objerrorCode="0";
            objerrorMsg="成功";
            log.info("申请编码的数据参数:->"+data);
            log.info("申请编码的数据类型:->"+dataType);
            String systemId="";
            List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
            try {
                if(StringUtils.isBlank(data)) {
                    errorid="101";
                    throw new Throwable("接口参数：传递为空");
                }
                InterParameterVO interParameterVO  =new InterParameterVO();
                //如果dataType是xml则，通过xml序列化成对象形式，如果是json则通过json转换成对象格式
                try {
                    if ("xml".equals(dataType)) {
                        XStream xStream = new XStream(new DomDriver());
                        xStream.processAnnotations(RootDataVO.class);
                        xStream.autodetectAnnotations(true);
                        RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
                        interParameterVO.setData(rootDataVO);
                    } else {
                        interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
                    }
                }catch (Throwable e){
                    errorid="101";
                    throw new Throwable("接口参数：传入数据参数解析失败");
                }
                ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
                systemId = interParameterVO.getData().getSystemId();
                UserVO userVo = interParameterVO.getData().getUser();
                List<ClassfyVO> classVOList = classfysVO.getClassify();
                InterParameterVO finalInterParameterVO = interParameterVO;

                //这是账号信息
                SessionInfo sessionInfo = new SessionInfo();
                sessionInfo.setUserId(userVo.getUserName());
                sessionInfo.setUserName(userVo.getTrueName());
                sessionInfo.setIp(userVo.getIp());
                VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);

                String finalSystemId = systemId;
                classVOList.stream().forEach(classVO -> {
                    log.info("参数：分类COde:" + classVO.getClassCode());
                    LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                    //获取分类信息
                    try {
                        String libray = classVO.getLibrary();
                        CodeClassifyVO codeClassifyVO = getClassfy(classVO);
                        log.info("end：分类查询完毕");
                        //获取分类模板信息
                        if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                            objerrorCode="100";
                            throw  new  Throwable ("根据传输的分类，未获取到分类信息");
                        }
                        CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                        if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                            objerrorCode="1";
                            throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                        }
                        log.info("end：模板查询完毕");
                        ApplyDatasVO applyDatasVO = classVO.getObjects();
                        DataObjectVO dataObjectVO = new DataObjectVO();
                        List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
                        ).collect(Collectors.toList());
                        this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
                        log.info("end：数据组织完毕");
                        //规则的主键需要去获取
                        CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
                        if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
                            objerrorCode="1";
                            log.info("classifyFullInfo:"+"根据传输的分类，未获取分类相关信息");
                            throw  new  Throwable ("根据传输的分类，未获取分类相关信息");
                        }
                        CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
                        if(ruleVO==null|| StringUtils.isBlank(ruleVO.getOid())){
                            objerrorCode="102";
                            throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应规则");
                        }
                        log.info("end：规则获取完毕");
                        List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(classVO.getSections().getSection(), ruleVO);
                        log.info("end：码段获取完毕");
                        CodeOrderDTO orderDTO = new CodeOrderDTO();
                        orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键
                        orderDTO.setSecDTOList(codeOrderSecDTOList);//分类码段
                        mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs);
                        log.info("end：申请获取完毕");
                    } catch (Throwable e) {
                        XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
                        xmlResultDataObjectDetailDO.setCode("");
                        xmlResultDataObjectDetailDO.setId("");
                        xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
                        xmlResultDataObjectDetailDO.setMsg("编码申请失败:"+e.getMessage());
                        resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
                        e.printStackTrace();
                    }finally {
                        XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
                        resultClassfyVO.setClassCode(classVO.getClassCode());
                        resultClassfyVO.setLibrary(classVO.getLibrary());
                        resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
                        resultClassfyVO.setObjects(resultDataObjectDetailDOs);
                        resultClassfyVOList.add(resultClassfyVO);
                    }
                });
                XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
                xmlResultSystemVO.setClassifys(resultClassfyVOList);
                xmlResultSystemVO.setMsg(msg);
                xmlResultSystemVO.setErrorid(errorid);
                resultStr= transferResultXMl(xmlResultSystemVO,dataType);
            }catch (Throwable e){
                e.printStackTrace();;
                msg="申请编码失败:"+e.getMessage();
            }finally {
                XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
                xmlResultSystemVO.setClassifys(resultClassfyVOList);
                xmlResultSystemVO.setMsg(msg);
                xmlResultSystemVO.setErrorid(errorid);
                resultStr= transferResultXMl(xmlResultSystemVO,dataType);
                final boolean[] issucess = {true};
                if(!errorid.equals("0")) {
                    issucess[0] = false;
                }else {
                    if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
                        resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
                            xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
                                if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
                                    issucess[0] = false;
                                    msg=objec.getMsg();
                                }
                            });
                        });
                    }

                }
                try {
                    //记录日志
                    this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
                }catch (Throwable e){
                    e.printStackTrace();
                }
        String resultStr = "";
        String errorid="0";
        msg="成功";
        objerrorCode="0";
        objerrorMsg="成功";
        log.info("申请编码的数据参数:->"+data);
        log.info("申请编码的数据类型:->"+dataType);
        String systemId="";
        List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
        try {
            if(StringUtils.isBlank(data)) {
                errorid="101";
                throw new Throwable("接口参数：传递为空");
            }
            log.info("返回参数:"+resultStr);
            InterParameterVO interParameterVO  =new InterParameterVO();
            //如果dataType是xml则，通过xml序列化成对象形式，如果是json则通过json转换成对象格式
            try {
                if ("xml".equals(dataType)) {
                    XStream xStream = new XStream(new DomDriver());
                    xStream.processAnnotations(RootDataVO.class);
                    xStream.autodetectAnnotations(true);
                    RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
                    interParameterVO.setData(rootDataVO);
                } else {
                    interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
                }
            }catch (Throwable e){
                errorid="101";
                throw new Throwable("接口参数：传入数据参数解析失败");
            }
            ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
            systemId = interParameterVO.getData().getSystemId();
            UserVO userVo = interParameterVO.getData().getUser();
            List<ClassfyVO> classVOList = classfysVO.getClassify();
            InterParameterVO finalInterParameterVO = interParameterVO;

            return resultStr;
            //这是账号信息
            SessionInfo sessionInfo = new SessionInfo();
            sessionInfo.setUserId(userVo.getUserName());
            sessionInfo.setUserName(userVo.getTrueName());
            sessionInfo.setIp(userVo.getIp());
            VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);

            String finalSystemId = systemId;
            classVOList.stream().forEach(classVO -> {
                log.info("参数：分类COde:" + classVO.getClassCode());
                LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                //获取分类信息
                try {
                    String libray = classVO.getLibrary();
                    CodeClassifyVO codeClassifyVO = getClassfy(classVO);
                    log.info("end：分类查询完毕");
                    //获取分类模板信息
                    if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                        objerrorCode="100";
                        throw  new  Throwable ("根据传输的分类，未获取到分类信息");
                    }
                    CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                    if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                        objerrorCode="1";
                        throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                    }
                    log.info("end：模板查询完毕");
                    ApplyDatasVO applyDatasVO = classVO.getObjects();
                    DataObjectVO dataObjectVO = new DataObjectVO();
                    List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
                    ).collect(Collectors.toList());
                    this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
                    log.info("end：数据组织完毕");
                    //规则的主键需要去获取
                    CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
                    if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
                        objerrorCode="1";
                        log.info("classifyFullInfo:"+"根据传输的分类，未获取分类相关信息");
                        throw  new  Throwable ("根据传输的分类，未获取分类相关信息");
                    }
                    CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
                    if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
                        objerrorCode="102";
                        throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应规则");
                    }
                    log.info("end：规则获取完毕");
                    List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(classVO.getSections().getSection(), ruleVO,classifyFullInfo);
                    log.info("end：码段获取完毕");
                    CodeOrderDTO orderDTO = new CodeOrderDTO();
                    orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键
                    orderDTO.setSecDTOList(codeOrderSecDTOList);//分类码段
                    mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs);
                    log.info("end：申请获取完毕");
                } catch (Throwable e) {
                    XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
                    xmlResultDataObjectDetailDO.setCode("");
                    xmlResultDataObjectDetailDO.setId("");
                    xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
                    xmlResultDataObjectDetailDO.setMsg("编码申请失败:"+e.getMessage());
                    resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
                    e.printStackTrace();
                }finally {
                    XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
                    resultClassfyVO.setClassCode(classVO.getClassCode());
                    resultClassfyVO.setLibrary(classVO.getLibrary());
                    resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
                    resultClassfyVO.setObjects(resultDataObjectDetailDOs);
                    resultClassfyVOList.add(resultClassfyVO);
                }
            });
            XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
            xmlResultSystemVO.setClassifys(resultClassfyVOList);
            xmlResultSystemVO.setMsg(msg);
            xmlResultSystemVO.setErrorid(errorid);
            resultStr= transferResultXMl(xmlResultSystemVO,dataType);
        }catch (Throwable e){
            e.printStackTrace();;
            msg="申请编码失败:"+e.getMessage();
          /*  XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
            XMLResultSystemVO.setErrorid(errorid);
            XMLResultSystemVO.setMsg("申请编码失败：->"+e.getMessage());
            XMLResultSystemVO.setClassifys(resultClassfyVOList);
            resultStr=transferResultXMl(XMLResultSystemVO,dataType);

            log.error("申请编码失败：->"+e);
            return resultStr;*/
        }finally {
            XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
            xmlResultSystemVO.setClassifys(resultClassfyVOList);
            xmlResultSystemVO.setMsg(msg);
            xmlResultSystemVO.setErrorid(errorid);
            resultStr= transferResultXMl(xmlResultSystemVO,dataType);
            final boolean[] issucess = {true};
            if(!errorid.equals("0")) {
                issucess[0] = false;
            }else {
                if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
                    resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
                        xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
                            if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
                                issucess[0] = false;
                                msg=objec.getMsg();
                            }
                        });
                    });
                }

            }
            try {
                //记录日志
                this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
            }catch (Throwable e){
                e.printStackTrace();
            }
        }
        log.info("返回参数:"+resultStr);

        return resultStr;
    }

    /***
@@ -248,7 +282,139 @@
    @Override
    public String syncEditData(String data, String dataType) throws Throwable {

        return null;
        String resultStr = "";
        String errorid="0";
        msg="成功";
        String systemId="";
        objerrorCode="0";
        objerrorMsg="成功";
        log.info("更改编码的数据参数:->"+data);
        log.info("更改编码的数据类型:->"+dataType);
        List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
        try {
            if (StringUtils.isBlank(data)) {
                errorid = "101";
                throw new Throwable("接口参数：传递为空");
            }
            InterParameterVO interParameterVO = new InterParameterVO();
            //如果dataType是xml则，通过xml序列化成对象形式，如果是json则通过json转换成对象格式
            try {
                if ("xml".equals(dataType)) {
                    XStream xStream = new XStream(new DomDriver());
                    xStream.processAnnotations(RootDataVO.class);
                    xStream.autodetectAnnotations(true);
                    RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
                    interParameterVO.setData(rootDataVO);
                } else {
                    interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
                }
            } catch (Throwable e) {
                errorid = "101";
                throw new Throwable("接口参数：传入数据参数解析失败");

            }
            ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
            systemId = interParameterVO.getData().getSystemId();
            UserVO userVo = interParameterVO.getData().getUser();
            List<ClassfyVO> classVOList = classfysVO.getClassify();
            InterParameterVO finalInterParameterVO = interParameterVO;
            //这是账号信息
            SessionInfo sessionInfo = new SessionInfo();
            sessionInfo.setUserId(userVo.getUserName());
            sessionInfo.setUserName(userVo.getTrueName());
            sessionInfo.setIp(userVo.getIp());
            VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
            String finalSystemId = systemId;
            classVOList.stream().forEach(classVO->{
                log.info("参数：分类COde:" + classVO.getClassCode());
                LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                //获取分类信息
                try {
                    String libray = classVO.getLibrary();
                    CodeClassifyVO codeClassifyVO = getClassfy(classVO);
                    if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                        objerrorCode="100";
                        throw  new  Throwable ("根据传输的分类，未获取到分类信息");
                    }
                    log.info("end：分类查询完毕");
                    //获取分类模板信息
                    CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                    if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                        objerrorCode="102";
                        throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                    }
                    log.info("end：模板查询完毕");
                    ApplyDatasVO applyDatasVO = classVO.getObjects();
                    DataObjectVO dataObjectVO = new DataObjectVO();
                    //将默认的属性全部替换掉
                    List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
                    ).collect(Collectors.toList());
                    this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
                    log.info("end：数据构建完毕");
                    log.info("start：修改数据执行完毕");
                    mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs);
                    log.info("end：修改数据执行完毕");
                } catch (Throwable e) {
                    XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
                    xmlResultDataObjectDetailDO.setCode("");
                    xmlResultDataObjectDetailDO.setId("");
                    xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
                    xmlResultDataObjectDetailDO.setMsg("编码更改/状态更改/删除:"+e.getMessage());
                    resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
                    e.printStackTrace();
                }finally {
                    XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
                    resultClassfyVO.setClassCode(classVO.getClassCode());
                    resultClassfyVO.setLibrary(classVO.getLibrary());
                    resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
                    resultClassfyVO.setObjects(resultDataObjectDetailDOs);
                    resultClassfyVOList.add(resultClassfyVO);
                }

            });
        }catch (Throwable e){
            e.printStackTrace();;
            msg="编码更改/状态更改/删除:"+e.getMessage();
          /*  XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
            XMLResultSystemVO.setErrorid(errorid);
            XMLResultSystemVO.setMsg("申请编码失败：->"+e.getMessage());
            XMLResultSystemVO.setClassifys(resultClassfyVOList);
            resultStr=transferResultXMl(XMLResultSystemVO,dataType);

            log.error("申请编码失败：->"+e);
            return resultStr;*/
        }finally {
            XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
            xmlResultSystemVO.setClassifys(resultClassfyVOList);
            xmlResultSystemVO.setMsg(msg);
            xmlResultSystemVO.setErrorid(errorid);
            resultStr= transferResultXMl(xmlResultSystemVO,dataType);
            final boolean[] issucess = {true};
            if(!errorid.equals("0")) {
                issucess[0] = false;
            }else {
                if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
                    resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
                        xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
                            if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
                                issucess[0] = false;
                                msg=objec.getMsg();
                            }
                        });
                    });
                }

            }
            try {
                //记录日志
                this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "syncEditData");
            }catch (Throwable e){
                e.printStackTrace();
            }
        }
        log.info("返回参数:"+resultStr);
        //存储日志
        return resultStr;
    }

    /***
@@ -386,7 +552,142 @@
     */
    @Override
    public String queryData(String data, String dataType) throws Throwable {
        return null;
        boolean issucess=false;
        String resultStr = "";
        String errorid="0";
        msg="成功";
        String systemId="";
        log.info("查询分类的数据参数:->"+data);
        log.info("查询分类的数据类型:->"+dataType);
        DataCondtionsVO dataCondtionsVO=new DataCondtionsVO();
        ResultDataVO resultDataVO=new ResultDataVO();
        try {
            try {
                if ("xml".equals(dataType)) {
                    XStream xStream = new XStream(new DomDriver());
                    xStream.processAnnotations(CondtionsVO.class);
                    xStream.autodetectAnnotations(true);
                    CondtionsVO condtionsVO = (CondtionsVO) xStream.fromXML(data);
                    dataCondtionsVO.setCondtions(condtionsVO);
                } else {
                    dataCondtionsVO = JSONObject.toJavaObject(JSONObject.parseObject(data), DataCondtionsVO.class);
                }
            } catch (Throwable e) {
                errorid = "101";
                msg = "接口参数：传入数据参数解析失败";
                e.printStackTrace();
                throw new Throwable("接口参数：传入数据参数解析失败");
            }
            CondtionsVO condtionsVO=dataCondtionsVO.getCondtions();
            systemId=condtionsVO.getSystemId();
            UserVO userVo=condtionsVO.getUser();
            CondtionVO condtionVO= condtionsVO.getCondtion();
            SessionInfo sessionInfo = new SessionInfo();
            sessionInfo.setUserId(userVo.getUserName());
            sessionInfo.setUserName(userVo.getTrueName());
            sessionInfo.setIp(userVo.getIp());
            VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);

            String classCode=condtionVO.getClassCode();
            String library= condtionVO.getLibrary();
            String queryFileds= condtionVO.getQueryFileds();

            List<CodeClassifyVO> codeClassifyVOS =new ArrayList<>();
            //先简称是否有关联模板，有模板要先删除
            List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId,VciBaseUtil.toInSql(classCode)));
            if(!CollectionUtils.isEmpty(libIdDos)){
                CodeClassify currentCodeClassify=libIdDos.get(0);
                String oid=currentCodeClassify.getOid();
                TreeQueryObject treeQueryObject=new TreeQueryObject();
                treeQueryObject.setParentOid(oid);
                treeQueryObject.setQueryAllLevel(true);
                codeClassifyVOS=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
                codeClassifyVOS.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify));
                Map<String, CodeClassifyVO> oidCodeclassifyDOMap = codeClassifyVOS.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));

                List<PropertyVO>  propertyVOS=condtionVO.getPro();
                Map<String,String> condtionMap=new HashMap<>();
                propertyVOS.stream().forEach(propertyVO -> {
                    condtionMap.put(propertyVO.getFiledName(),propertyVO.getFiledValue());
                });
                condtionMap.put("codeclsfid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) + ")");

                R<BtmTypeVO> r= btmTypeClient.getDetail(library);
                BtmTypeVO btmTypeVO =r.getData();
                String tableName=btmTypeVO.getTableName();

                StringBuffer sb=new StringBuffer();
                sb.append(" select * from ");
                sb.append(tableName);
                sb.append(" where 1=1 ");
                sb.append(" id in (");
                sb.append( VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) );
                sb.append(")");

                List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap( sb.toString());
                List<ClientBusinessObject> clientBusinessObjects=ChangeMapTOClientBusinessObjects(dataMapList);
                List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
                if(!CollectionUtils.isEmpty(clientBusinessObjects)){
                    CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(currentCodeClassify.getOid());
                    Map<String, CodeClassifyTemplateAttrVO> filedAttributeMap = templateVO.getAttributes().stream().filter(attribute -> attribute != null && StringUtils.isNotBlank(attribute.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));

                    clientBusinessObjects.stream().forEach(cbo -> {
                        com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO dataObjectVO=new com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO();
                        dataObjectVO.setCode(cbo.getId());
                        dataObjectVO.setStatus(cbo.getLcStatus());
                        String codeclsfid=cbo.getAttributeValue("codeclsfid");
                        if(oidCodeclassifyDOMap.containsKey(codeclsfid)){
                            CodeClassifyVO classifyVO=  oidCodeclassifyDOMap.get(codeclsfid);
                            dataObjectVO.setClassCode(classifyVO.getId());
                        }
                        dataObjectVO.setLibrary(library);
                        String [] newQueryFileds=queryFileds.split(",");
                        List<PropertyVO> propertyVOList=new ArrayList<>();
                        for(String filed:newQueryFileds){
                            String value=cbo.getAttributeValue(filed);
                            if(filedAttributeMap.containsKey(filed)){
                                CodeClassifyTemplateAttrVO attrVO=  filedAttributeMap.get(filed);
                                PropertyVO propertyVO=new PropertyVO();
                                propertyVO.setFiledName(filed);
                                propertyVO.setFiledValue(value);
                                propertyVO.setOutname(attrVO.getName());
                                propertyVOList.add(propertyVO);
                            }
                        }
                        dataObjectVO.setPro(propertyVOList);
                        dataObjectVOS.add(dataObjectVO);
                    });
                    resultDataVO.setObject(dataObjectVOS);
                }
            }
            errorid = "0";
            msg = "数据查询成功";
        }catch (Throwable e){
            e.printStackTrace();;
            msg="查询数据失败:"+e.getMessage();
        }finally {
            resultDataVO.setErrorid(errorid);
            resultDataVO.setMsg(msg);
        }
        ResultVO resultVO=new ResultVO();
        resultVO.setData(resultDataVO);
        if(dataType.equals("xml")){
            //组织返回接口信息
            XStream xStream = new XStream(new DomDriver());
            xStream.processAnnotations(XMLResultSystemVO.class);
            xStream.autodetectAnnotations(true);
            resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultDataVO);
        }else{
            Object object = JSONObject.toJSON(resultVO);
            resultStr = object.toString();
        }
        try {    //记录日志
            this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
        }catch (Throwable e){
            e.printStackTrace();
        }
        log.info("返回参数:"+resultStr);
        return resultStr;
    }

    @Override
@@ -521,18 +822,32 @@
        }
        return classifyVO;
    }

    private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
        List<ClientBusinessObject> clientBusinessObjectList=new CopyOnWriteArrayList<>();
        oldDataMap.parallelStream().forEach(dataMap->{
            ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
            DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
            dataMap.forEach((key,value)->{
                clientBusinessObject.setAttributeValue(key,value);
            });
        });
        return clientBusinessObjectList;
    }
    /***
     * 根据穿入的参数信息校验码段规则
     */
    private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList,CodeRuleVO ruleVO) throws Throwable{
    private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList,CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo) throws Throwable{
        List<CodeBasicSecVO>  codeBasicSecVOS= ruleVO.getSecVOList();
        Map<String,String> sectionVOMap=new HashMap<>();
        SectionVOList.stream().forEach(SectionVO->{
            sectionVOMap.put(SectionVO.getName(),SectionVO.getValue());
        });
        Map<String,CodeClassifyVO> codeClassifyVOMap= classifyFullInfo.getParentClassifyVOs().stream().collect(Collectors.toMap(s -> s.getId(), t -> t,(o1, o2)->o2));
        List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
        for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
            String sectype = codeBasicSecVO.getSecType();
            String classifySecOid= codeBasicSecVO.getOid();
            if (!sectype.equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())) {
                String name = codeBasicSecVO.getName();
                String sectypeText = codeBasicSecVO.getSecTypeText();
@@ -543,6 +858,22 @@
                    CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
                    String sectypeValue = sectionVOMap.get(name);
                    log.info("码段值:"+sectypeValue);
                    CodeSecTypeEnum secType = CodeSecTypeEnum.forValue(sectype);
                    if(CODE_CLASSIFY_SEC.equals(secType)) {//如果是分类的话，则需要匹配传过来的分类代号与
                        //先简称是否有关联模板，有模板要先删除
                        List<CodeClassifyValue> codeClassifyValueDOList = codeClassifyValueService.list(Wrappers.<CodeClassifyValue>query().lambda().eq(CodeClassifyValue::getCodeClassifySecOid,classifySecOid));

                        if (!CollectionUtils.isEmpty(codeClassifyValueDOList)) {
                            Map<String, CodeClassifyValue> codeClassifyValueDOMap = codeClassifyValueDOList.stream().collect(Collectors.toMap(s -> s.getId(), t -> t, (o1, o2) -> o2));
                            if(codeClassifyValueDOMap.containsKey(sectypeValue)){
                                CodeClassifyValue codeClassifyValue=   codeClassifyValueDOMap.get(sectypeValue);
                                sectypeValue=codeClassifyValue.getOid();
                            }else {
                                objerrorCode = "101";
                                throw new Throwable("传入的分类码段：【" + name + " 值：" + sectypeValue + "】，不符合当前分类层级代号");
                            }
                        }
                    }
                    CodeOrderSecDTO.setSecValue(sectypeValue);
                    codeOrderSecDTOList.add(CodeOrderSecDTO);
                } else {
@@ -563,17 +894,24 @@
        Map<String, String> attrMapConfigMap=new HashMap<>();
        Map<String, String> propMaps=new HashMap<>();
        try {
            log.info("开始读取系统配置文件 start");
            Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
            log.info("集成系统属性映射配置文件条目数-》"+stringStringMap.size());
            //stringStringMap.put("RLM","D:\\RLM.xml");
            LibraryDO libraryDO= gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId,stringStringMap);
            LibraryDO libraryDO=gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId,stringStringMap);
            List<LibraryClsfDO> libraryClsfDOList=libraryDO.getClsf();
            Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
            log.info("根据参数：libray：-》"+libray+"从配置文件中找对应属性映射配置");
            if(libPropMaps.containsKey(libray)){
                log.info("根据参数：libray：-》"+libray+"匹配到相应的属性映射信息");
                List<ClsfAttrMappingDO> clsfAttrMappingDOList=libPropMaps.get(libray);
                propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
                log.info("根据参数：libray：-》"+libray+"匹配到相应的属性映射信息,属性映射条目数+"+clsfAttrMappingDOList.size());
            }
            log.info("根据参数：libray：-》"+libray+"从配置文件中找对应属性映射配置 end ");
        }catch (Throwable e){
            objerrorCode="1";
            e.printStackTrace();
            throw new Throwable("MDM集成属性配置文件读取失败");
        }
        LinkedList<String> rowNameList=new LinkedList<>();