集成相关更改

 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreApplyForm.java

@@ -17,11 +17,13 @@
@ApiModel(value = "DockingPreApplyForm", description = "集团编码申请单记录对象")
@EqualsAndHashCode
public class DockingPreApplyForm extends BaseModel {

    /***
     * 集团编码
     */
    @ApiModelProperty(value = "集团编码")
    private String groupCode;

    /***
     * 错误标识码
     */
@@ -33,24 +35,29 @@
     */
    @ApiModelProperty(value = "内容")
    private String content;

    /***
     *主键oid
     */
    @ApiModelProperty(value = "数据主键")
    private String dataOid;

    /**
     * 业务对象
     */
    @ApiModelProperty(value = "业务对象")
    private String dataBtmName;

    /***
     * 消息
     */
    @ApiModelProperty(value = "消息")
    private String msg;

    /**
     * 申请单类型1:申请，2：更改
     */
    @ApiModelProperty(value = "消息")
    private  String operationType;

}

 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java

@@ -1,6 +1,7 @@
package com.vci.ubcs.code.applyjtcodeservice.feign;


import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingClassifyModelAttrVO;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingReturnStoreVO;

 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/MdmApplyGroupCodeProvider.java

@@ -30,6 +30,7 @@
     */
    @PostMapping("/externalMainData/receiveAddApply")
    DockingResultVO receiveAddApply(@NotNull @RequestBody DockingGroupDataVO dockingGroupDataVO)throws VciBaseException;

    /**
     * mdm向集团更新集团码接口
     * @param dockingGroupDataVO AO/TO的信息
@@ -53,6 +54,7 @@
     */
    @PostMapping("/externalMainData/queryClassModel")
    DockingQueryClassModelVO queryClassModel(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO);

    /***
     * 查询申请单状态
     * @param dockingModelQueryVO

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java

@@ -51,7 +51,6 @@
    @GetMapping(SELECT_BY_TYPE_OID)
    R<List<BaseModel>> selectByTypeAndOid(@RequestParam("btmType") String btmType, @RequestParam("oids") String oids);


    /**
     * 传入业务类型以及相关数据进行批量插入操作
     *
@@ -71,4 +70,5 @@
     */
    @PostMapping(UPDATE_BATCH_BY_TYPE)
    R<Integer>updateBatchBtypeDatas(@RequestParam("btmType")String btmType,@RequestBody List<BaseModel> baseModels);

}

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java

@@ -48,32 +48,26 @@
    /***
     * 属性枚举范围服务
     */

    private final IDockingPreAttrRangeService dockingPreAttrRangeService;

    /***
     * 分类属性枚举范围服务
     */

    private final IDockingPreClassifyService dockingPreClassifyService;

    /***
     * 属性枚举范围服务
     */

    private final IDockingPreApplyFormService dockingPreApplyFormService;

    /***
     * 属性枚举范围服务
     */

    private final IDockingPreViewModelService dockingPreViewModelService;


    /***
     * 属性枚举范围服务
     */

    private final ICodeClassifyClient codeClassifyClient;

    /**
@@ -132,7 +126,6 @@
        return R.data(dockingPreAttrRangeVOS);
    }


    /**
     * 参照树 集团分类（是否包含属性）
     * @param treeQueryObject 树形查询对象 conditionMap 存上 codeclsfid=主数据的分类oid
@@ -142,7 +135,6 @@
    public List<Tree> referTree(TreeQueryObject treeQueryObject)  {
        return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
    }


    /**
     * 参照树 主数据模板属性信息
@@ -174,7 +166,6 @@
        return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
    }


    /***
     * 申请集团编码
     * @return
@@ -183,13 +174,13 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "集团码申请", notes = "dockingPreAttrMappingVOList")
    public R applyGroupCode(String oids,String btmName){
        List<BaseModelVO> BaseModelVOS=new ArrayList<>();
        try {
            return groupMdmInterService.applyGroupCode(oids,btmName);
        }catch (Throwable e){
            return R.fail("集团码申请失败："+e.getMessage());
        }
    }

    /***
     * 更新集团编码数据
     * @return
@@ -222,11 +213,11 @@

    }

/***
 * 查询申请单状态
 * oids:业务数据oid
 * @return 返回执行结果信息
 */
    /***
     * 查询申请单状态
     * oids:业务数据oid
     * @return 返回执行结果信息
     */
    @GetMapping( "/queryApplyState")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "查看申请单状态", notes = "查看申请单状态")

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

@@ -2,6 +2,7 @@

import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.applyjtcodeservice.entity.*;
import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
@@ -36,8 +37,10 @@
@Data
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {

    @Value("${docking.apply.partCoe:10}")
    public String partCoe;

    /**
     * 集团申请单服务
     */
@@ -57,10 +60,12 @@
     * 集团分类申请单服务
     */
    private final IDockingPreClassifyService dockingPreClassifyService;

    /***
     * 属性映射服务
     */
    private final IDockingPreAttrMappingService dockingPreAttrMappingService;

    /**
     * 集团取值范围申请单服务
     */
@@ -73,6 +78,7 @@

    @Autowired(required = false)
    private IMdmEngineClient mdmEngineClient;

    /***
     * 申请集团编码
     * @return
@@ -112,6 +118,7 @@
            return R.fail("集团码数据修改失败："+e.getMessage());
        }
    }

    /*
     * 主数据业务服务
     */
@@ -185,7 +192,7 @@
                String jdatabtmname = dockingPreApplyForm.getDataBtmName();
                if (res) {
                    //此处需要查询业务数据，去更改
                    R<List<BaseModel>>  R=mdmEngineClient.selectByTypeAndOid(jdatabtmname,jdataid);
                    R<List<BaseModel>> R = mdmEngineClient.selectByTypeAndOid(jdatabtmname,jdataid);
                    if(R.isSuccess()){
                        List<BaseModel> oldDatalist=new ArrayList<>();
                        List<BaseModel> newDatalist=R.getData();
@@ -210,10 +217,12 @@
                    mdmEngineClient.updateBatchBtypeDatas(btmName, modeList);
                });
            }
            dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
            if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
                dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
            }
        }catch (Throwable e){
            e.printStackTrace();
            return R.fail("集团码集成赋值失败"+e);
             return R.fail("集团码集成赋值失败，原因："+e.getMessage());
        }
        log.info("获取集团集团码，赋值到主数据 end");
        return R.success("集团码赋值成功");
@@ -291,6 +300,7 @@
            throw new Throwable("存储视图模型出现问题");
        }
    }

    /***
     * 获取分类视图
     *
@@ -346,7 +356,6 @@
            throw new Throwable("组织分类" + nodeLinkName + "模型视图存储出现问题");
        }
    }


    /***
     * 获取模型视图属性

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

@@ -9,6 +9,7 @@
 * @author xiejun
 */
public interface IGroupMdmInterService {

    /***
     * 主数据像集团申请编码
     * @param oids
@@ -25,7 +26,6 @@
     * @return 返回结果信息
     * @throws Throwable
     */

    public R receiveEditApply(String oids, String btmName)throws Throwable;

    /***
@@ -36,13 +36,13 @@
     */
    public R queryClassModel(String jtclsfId)throws Throwable;


    /***
     * 查询分类详细模型视图
     * @return 返回结果信息
     * @throws Throwable
     */
    public R queryMdmModel()throws Throwable;

    /***
     *同步集团模型视图
     * @param classifyId
@@ -58,4 +58,5 @@
     * @throws VciBaseException
     */
    R queryApplyState(String oids)throws VciBaseException;

}

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

@@ -48,10 +48,13 @@
    private String code="";

    private String msg="";

    @Value("${docking.apply.partCode:101}")
    public String partCoe;

    @Value("${docking.apply.usedFlag:false}")
    public boolean usedFlag;

    @Value("${docking.apply.unitCode:4100}")
    public String dockingApplyUnitCode;

@@ -60,6 +63,7 @@

    @Autowired(required = false)
    private MdmApplyGroupCodeProvider mdmApplyGroupCodeProvider;

    /***
     * 集团分类服务
     */
@@ -72,13 +76,11 @@
    @Autowired(required = false)
    private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreApplyFormService dockingPreApplyFormService;


    /***
     * 模型视图单服务
     */
    @Autowired(required = false)
    private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreViewModelService dockingPreViewModelService;


    /***
     * 集团分类属性属性映射配置服务
@@ -91,7 +93,6 @@
    @Autowired(required = false)
    private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;


    /***
     * 集团属性服务
     */
@@ -100,8 +101,9 @@

    @Autowired(required = false)
    private IMdmEngineClient mdmEngineClient;

    /***
     * 主数据像集团申请编码
     * 主数据向集团申请编码
     * @param oids 需要申请的数据主键数组
     * @param btmName 业务类型
     * @return 返回结果信息
@@ -137,8 +139,8 @@
                    Object object = JSONObject.toJSON(dockingGroupDataVO);
                    String resultStr = object.toString();
                    log.info("申请集团码数据格式:->"+resultStr);
                    DockingResultVO resultDataObject =new DockingResultVO();
                    resultDataObject=    mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
                    DockingResultVO resultDataObject = new DockingResultVO();
                    resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
                    code = resultDataObject.getCode();
                    msg = resultDataObject.getMsg();
                    boolean res=false;
@@ -253,6 +255,7 @@
            return R.fail("申请接口开关已关闭，不申请集团码");
        }
    }

    /***
     * 主数据像集团更改编码
     * @param oids 需要修改的数据主键数组
@@ -526,8 +529,6 @@
        return R.success(message);
    }



    /***
     * 查询申请单状态
     * @param dataOids
@@ -540,7 +541,7 @@
            return R.fail("查询申请单状态接口开关已关闭");
        }
        String message="执行成功！";
        log.info("查询申请单状态接口statr");
        log.info("查询申请单状态接口start");
        try {
            VciBaseUtil.alertNotNull(dataOids,"所查申请单数据主键");
            VciBaseUtil.alertNotNull(dockingApplySysName,"系统标识配置：docking.apply.unitCode");
@@ -555,7 +556,7 @@
            DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO();
            dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{})));
            dockingModelQueryVO.setSysName(dockingApplySysName);
            DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
            DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO = mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);

            int code=dockingApplyFormQueryStatusVO.getCode();
            String mesg=dockingApplyFormQueryStatusVO.getMsg();
@@ -573,7 +574,7 @@
                            applyFormObject.setMsg(jmsg);
                        }
                    }
                    boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
                    boolean res =  this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
                }else{
                    throw new Throwable("没有获取到相关数据信息");
                }
@@ -736,7 +737,6 @@
            throw new Throwable("组织分类" + nodeLinkName + "模型视图存储出现问题");
        }
    }


    /***
     * 获取模型视图属性
@@ -1028,6 +1028,7 @@
     * 获取属性枚举映射配置
     */
    Map<String,Map<String, DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>();

    private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{

        String jmetalistoid = jmetaatter.getOid();
@@ -1045,6 +1046,7 @@
        attrRangeMap.put(jmetalistoid, rangeMap);

    }

    /****
     * 值类型转换
     * @param jmetaatter
@@ -1130,4 +1132,5 @@
        }
        return msg;
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java

@@ -163,8 +163,8 @@
     * @throws Throwable
     */
    @PostMapping("/syncDataForPerson")
    public ResultOrgData syncDataForPerson(@RequestBody PersonData personData){

    public ResultOrgData syncDataForPerson(@RequestBody PersonData personData,HttpServletRequest request){
        this.setHttpToThreadLocal(request);
        ResultOrgData result = new ResultOrgData();
        try {
            result= universalInterfaceI.syncDataForPerson(personData);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java

@@ -44,7 +44,9 @@
@RestController
@AllArgsConstructor
public class MdmEngineClient implements IMdmEngineClient {

    private final MdmEngineService mdmEngineService;

    /**
     * 传入业务类型以及相oid集合查询数据进行返回
     *
@@ -78,6 +80,7 @@
            throw new RuntimeException(e);
        }
    }

    /**
     * 更新业务数据同时对码值表数据操作接口
     *

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

@@ -258,8 +258,9 @@
     */
    @Autowired
    private ICodeRuleService ruleService;

    /**
     * 编码规则的服务
     * 码值的服务
     */
    @Autowired
    private ICodeAllCodeService codeAllCodeService;

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

@@ -578,7 +578,7 @@
                ApplyDatasVO applyDatasVO=new ApplyDatasVO();
                ApplyDatasVO editDatasVO=new ApplyDatasVO();
                if(!CollectionUtils.isEmpty(cboList)){
                Map<String,ClientBusinessObject> oldpplyDataVOMap=    cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
                Map<String,ClientBusinessObject> oldpplyDataVOMap =    cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
                    //数据库不存在的
                    List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
                        String code =cbo.getCode();