1.读取集成配置文件日志信息输出添加
2.集团接口加上开关控制

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java

@@ -16,6 +16,7 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RestController;
@@ -33,6 +34,8 @@
@AllArgsConstructor
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {
    @Value("${docking.apply.partCoe:10}")
    public String partCoe;
    /**
     * 集团申请单服务
     */
@@ -89,9 +92,6 @@
            return R.fail("集团码数据修改失败："+e.getMessage());
        }
    }



    /*
     * 主数据业务服务
     */
@@ -165,10 +165,10 @@
                String jdataid = dockingPreApplyForm.getDataOid();
                String jdatabtmname = dockingPreApplyForm.getDataBtmName();
                if (res) {

                    //此处需要查询业务数据，去更改
                    BaseModel baseModel = new BaseModel();
                    baseModel.setId(customCoding);
                    baseModel.setId("10" + customCoding);
                    baseModel.getData().put("groupcode",customCoding);
                    log.info("申请单:"+applyId+",集团码："+customCoding+"编码："+baseModel.getId());
                    editObjectList.add(baseModel);
                }

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

@@ -41,8 +41,10 @@
    private String code="";

    private String msg="";


    @Value("${docking.apply.partCoe:10}")
    public String partCoe;
    @Value("${docking.apply.userFlag:false}")
    public boolean usedFlag;
    @Value("${docking.apply.unitCode:41000}")
    public String dockingApplyUnitCode;

@@ -101,6 +103,7 @@
    @Transactional(rollbackFor = VciBaseException.class)
    @Override
    public R applyGroupCode(String oids, String btmName) throws VciBaseException {
        if(usedFlag) {
        try {
            List<BaseModel> updateCbos = new ArrayList<BaseModel>();
            List<DockingPreApplyForm> dockingPreAttrMappings = new ArrayList<>();
@@ -165,6 +168,7 @@
                        if (isEditDatas) {
                            if (baseModelMap.containsKey(applyId)) {
                                BaseModel baseModel = baseModelMap.get(applyId);
                                    baseModel.getData().getOrDefault("codeclassid","");
                                BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
                                DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
                                DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
@@ -204,6 +208,9 @@
        }catch (VciBaseException e){
            return R.fail("申请接口调用失败"+e);
        }
        }else{
            return R.fail("申请接口开关已关闭，不申请集团码");
        }
    }

    /***
@@ -216,6 +223,10 @@
    @Transactional(rollbackFor = VciBaseException.class)
    @Override
    public R receiveEditApply(String oids, String btmName) throws VciBaseException {
        if(usedFlag) {
            log.info("更新接口功能已关闭！->"+usedFlag);
            R.success("更新接口功能已关闭！");
        }
        List<BaseModel> updateCbos=new ArrayList<BaseModel>();
        List<DockingPreApplyForm> dockingPreAttrMappings=new ArrayList<>();
        VciBaseUtil.alertNotNull(oids,"选择的数据");
@@ -283,7 +294,7 @@
                                //BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
                                DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
                            //    baseModel.setId(customCoding);
                                baseModel.getData().getOrDefault("groupCode",customCoding);
                                baseModel.getData().put("groupCode", customCoding);
                                updateCbos.add(baseModel);//更新数据集团code
                            }
                        }
@@ -314,9 +325,9 @@
                dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
                mdmEngineClient.updateBatchByType(btmName,updateCbos);//保存数据
            }
            return R.success("申请接口调用成功");
            return R.success("更新接口调用成功");
        }catch (VciBaseException e){
            return R.fail("申请接口调用失败"+e.getMessage());
            return R.fail("更新接口调用失败" + e.getMessage());
        }
    }

@@ -330,6 +341,10 @@
    public R queryClassModel(String groupClassifyId) throws Throwable {
        log.info("获取集团模型详细信息执行保存start");
        String message="执行成功！";
        if(usedFlag){
            log.info("获取集团模型详细信息执行保存功能已关闭！->"+usedFlag);
            return R.fail("获取集团模型详细信息接口已关闭!");
        }
        try {
            if (StringUtils.isBlank(groupClassifyId)) {
                message = "参数：集团分类主键，为空!";
@@ -361,12 +376,12 @@
            }
            return R.success(message);
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            log.error("获取数据模型详细信息失败"+e);
            R.fail(message);
        }
            return R.fail(message);
        }finally {
        log.info("获取集团模型详细信息执行保存end");
        return R.success(message);
        }
    }

    /***
@@ -378,6 +393,10 @@
    public R queryMdmModel() throws Throwable {
        String message="执行成功！";
        log.info("从集团获取主模型信息执行保存接口statr");
        if(usedFlag){
            log.info("从集团获取主模型信息执行保存接口功能已关闭！->"+usedFlag);
            return R.fail("查询模型视图接口已关闭!");
        }
        try {
            if (StringUtils.isBlank(dockingApplySysName)) {
                message = "获取系统标识" + dockingApplySysName + "为空，请查看配置！";
@@ -461,7 +480,10 @@
     */
    @Override
    public R queryApplyState(String dataOids) throws VciBaseException {

        if(usedFlag){
            log.info("查询申请单状态接口开关已关闭");
            return R.fail("查询申请单状态接口开关已关闭");
        }
        String message="执行成功！";
        log.info("查询申请单状态接口statr");
        try {
@@ -524,6 +546,10 @@
     */
    @Override
    public R syncClassifyModel(String classifyId, String operationType) throws VciBaseException {
        if(usedFlag){
            log.info("同步集团模型信息开关已关闭");
            return R.fail("同步集团模型信息开关已关闭");
        }
        VciBaseUtil.alertNotNull(operationType,"集成操作类型");
        try {
            if(operationType.equals("all")){

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java

@@ -6,10 +6,12 @@
import com.vci.ubcs.code.vo.webserviceModel.attrmap.LibraryDO;
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.starter.util.LocalFileUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

import java.util.Map;

@Slf4j
public class gennerAttrMapUtil {
    @Autowired(required = false)
    private AttributeMapConfig attributeMapConfig;
@@ -27,17 +29,22 @@
     * @param systemId
     */
    public LibraryDO gennerAttrMapBySystem(String systemId, Map<String, String> system_attrmap) throws Throwable{
        log.info("系统标识->"+systemId);
        if(StringUtils.isBlank(systemId)){
            throw new Throwable("系统标识为空");
        }
        LibraryDO rootDataVO=new LibraryDO();
        if(system_attrmap.containsKey(systemId)){
           String path=system_attrmap.get(systemId);
           log.info("系统标识->"+systemId+"；文件属性配置文件路径->"+path);
           String attributeMapData=  LocalFileUtil.readContentForFile(path);
           log.info("读取后的属性映射内容"+attributeMapData);
           XStream xStream = new XStream(new DomDriver());
           xStream.processAnnotations(LibraryDO.class);
           xStream.autodetectAnnotations(true);
            log.info("转换成对象start");
            rootDataVO = (LibraryDO) xStream.fromXML(attributeMapData);
            log.info("转换成对象end");

        }
        return rootDataVO;