内网开发环境代码合并

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java

@@ -55,7 +55,7 @@
    /***
     * 排序号
     */
    private  String sort_order;
    private String sort_order;

    /**
     *启用状态 1=未启用，2=已启用，3e已停用
@@ -75,7 +75,7 @@
    /***
     * 部门状态,有效、作度
     */
    private  String department_status;
    private String department_status;

    /***
     * 部门显示状态,显示、不显示
@@ -488,7 +488,7 @@
            ", mdm_datastatus='" + mdm_datastatus + '\'' +
            ", mdm_cleanstatus='" + mdm_cleanstatus + '\'' +
            ", link_fieldvalue='" + link_fieldvalue + '\'' +
            ", floy_middatastatus='" + flow_middatastatus + '\'' +
            ", flow_middatastatus='" + flow_middatastatus + '\'' +
            ", original_code='" + original_code + '\'' +
            ", pk_mdm='" + pk_mdm + '\'' +
            ", mdm_duplicate='" + mdm_duplicate + '\'' +

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java

@@ -1,6 +1,7 @@
package com.vci.ubcs.code.vo.webserviceModel.person;

public class PersonMasterData {

    /***
     * 数据在此系统中唯一标识
     */
@@ -54,7 +55,7 @@
    /***
     * 籍贯
     */
    private String citiizenship;
    private String citizenship;

    /**
     * 国家/地区
@@ -112,7 +113,7 @@
    private String mobile_phone;

    /***
     * 名族
     * 民族
     */
    private String nationality;

@@ -156,7 +157,7 @@
     */
    private String worker_category;

    /***
    /**
     * 人员类别编码
     */
    private String worker_category_code;
@@ -197,7 +198,7 @@
    private String business_level_code;

    /**
     * 商密等级编码
     * 商密等级名称
     */
    private String business_level_name;

@@ -348,12 +349,36 @@
        this.birthplace = birthplace;
    }

    public String getCitiizenship() {
        return citiizenship;
    public String getCitizenship() {
        return citizenship;
    }

    public void setCitiizenship(String citiizenship) {
        this.citiizenship = citiizenship;
    public void setCitizenship(String citizenship) {
        this.citizenship = citizenship;
    }

    public String getWorker_category_code() {
        return worker_category_code;
    }

    public String getWorker_level_code() {
        return worker_level_code;
    }

    public String getCountry_level_code() {
        return country_level_code;
    }

    public String getCountry_level_name() {
        return country_level_name;
    }

    public String getBusiness_level_code() {
        return business_level_code;
    }

    public String getBusiness_level_name() {
        return business_level_name;
    }

    public String getCountry() {
@@ -362,6 +387,30 @@

    public void setCountry(String country) {
        this.country = country;
    }

    public void setWorker_category_code(String worker_category_code) {
        this.worker_category_code = worker_category_code;
    }

    public void setWorker_level_code(String worker_level_code) {
        this.worker_level_code = worker_level_code;
    }

    public void setCountry_level_code(String country_level_code) {
        this.country_level_code = country_level_code;
    }

    public void setCountry_level_name(String country_level_name) {
        this.country_level_name = country_level_name;
    }

    public void setBusiness_level_code(String business_level_code) {
        this.business_level_code = business_level_code;
    }

    public void setBusiness_level_name(String business_level_name) {
        this.business_level_name = business_level_name;
    }

    public String getDept_type() {
@@ -534,54 +583,6 @@

    public String getWorker_level() {
        return worker_level;
    }

    public String getWorker_category_code() {
        return worker_category_code;
    }

    public String getWorker_level_code() {
        return worker_level_code;
    }

    public String getCountry_level_code() {
        return country_level_code;
    }

    public String getCountry_level_name() {
        return country_level_name;
    }

    public String getBusiness_level_code() {
        return business_level_code;
    }

    public String getBusiness_level_name() {
        return business_level_name;
    }

    public void setWorker_category_code(String worker_category_code) {
        this.worker_category_code = worker_category_code;
    }

    public void setWorker_level_code(String worker_level_code) {
        this.worker_level_code = worker_level_code;
    }

    public void setCountry_level_code(String country_level_code) {
        this.country_level_code = country_level_code;
    }

    public void setCountry_level_name(String country_level_name) {
        this.country_level_name = country_level_name;
    }

    public void setBusiness_level_code(String business_level_code) {
        this.business_level_code = business_level_code;
    }

    public void setBusiness_level_name(String business_level_name) {
        this.business_level_name = business_level_name;
    }

    public void setWorker_level(String worker_level) {
@@ -785,7 +786,7 @@
            ", admin_division_code='" + admin_division_code + '\'' +
            ", birthday='" + birthday + '\'' +
            ", birthplace='" + birthplace + '\'' +
            ", citiizenship='" + citiizenship + '\'' +
            ", citizenship='" + citizenship + '\'' +
            ", country='" + country + '\'' +
            ", dept_type='" + dept_type + '\'' +
            ", dept_name='" + dept_name + '\'' +

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

@@ -28,7 +28,6 @@
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;

@@ -136,7 +135,6 @@
        log.info("获取集团集团码，赋值到主数据 start");
        try {
            Map<String,List<BaseModel>> editObjectMap = new HashMap<>();

            List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
            //String classId = javaObject.getClassId();
            //String sysName = javaObject.getSysName();
@@ -173,6 +171,7 @@
                } else if ("9".equals(formState)) {
                    msg = "审核中";
                }
                // 如果返回了审查意见就用返回的
                msg = Func.isNotBlank(mainData.getExamineOpinion()) ? msg+"，意见："+mainData.getExamineOpinion():msg;
                jcontent.put("applyId", applyId);
                jcontent.put("formState", formState);
@@ -225,7 +224,7 @@
            if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
                dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
            }
            saveLogUtil.operateLog("申请单结果返回",false,JSON.toJSONString(dockingReturnStoreVO.getMainData()));
            saveLogUtil.operateLog("申请单结果返回",false, JSON.toJSONString(dockingReturnStoreVO.getMainData()));
        }catch (Throwable e){
            e.printStackTrace();
            saveLogUtil.operateLog("申请单结果返回",true,"错误信息："+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));

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

@@ -146,7 +146,6 @@
     * 系列流水
     */
    @Value("${bzApply.seriesFlow:seriesFlow}")

    private String seriesFlow;

    /***

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

@@ -68,7 +68,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.xml.bind.ValidationEvent;
import java.beans.BeanInfo;
import java.beans.Introspector;

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

@@ -360,7 +360,7 @@
            List<CodeBasicSecVO> attrSecVOList = new ArrayList<>();
            for (int i = 0; i < secVOList.size(); i++) {
                CodeBasicSecVO secVO = secVOList.get(i);
                try {
                try{
                    switchSecValue(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
                }catch (Exception e){
                    throw new ServiceException("码值转换时出现错误，原因："+e.getMessage());

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

@@ -69,8 +69,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ForkJoinPool;
@@ -308,7 +306,7 @@
            //List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
            String finalSystemId = systemId;
            classVOList.stream().forEach(classVO -> {
                log.info("参数：分类COde:" + classVO.getClassCode());
                log.info("参数：分类Code:" + classVO.getClassCode());
                boolean isCodeOrGroupCode=false;
                LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                String libray ="";
@@ -490,7 +488,7 @@
                ClassfyVO classfyVO = new ClassfyVO();
                classfyVO.setLibrary(personLibrary);
                classfyVO.setClassCode(personClassCode);
                CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
                CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
                log.info("end：分类查询完毕");
                //获取分类模板信息
                if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -508,8 +506,7 @@
                ).collect(Collectors.toList());

                List<PersonMasterData> personMasterDataList= personData.getMasterData();
                List<Map> dataList=new ArrayList<>();

                //List<Map> dataList=new ArrayList<>();
                List<String> codeList=new ArrayList<>();

                List<ApplyDataVO> applyDataVOList=new ArrayList<>();
@@ -528,7 +525,7 @@
                     */
                    fields.stream().forEach(field->{
                        if(dataMap.containsKey(field)){
                            String enumFiled= dataMap.get(field);
                            String enumFiled = dataMap.get(field);
                            EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class);
                            String enumCode=enumerableData.getCode();
                            //String enumCodeValue=enumerableData.getName();
@@ -548,11 +545,11 @@

                    object.setProp(proppertyVOList);
                    if(personMasterData.getDr()==1){
                        object.setOperate("delete");//操作类型
                        //操作类型
                        object.setOperate("delete");
                        deleteDataVOList.add(object);
                    }else{
                        String worker_category=personMasterData.getWorker_category();

                        //String worker_category=personMasterData.getWorker_category();
                        object.setOperate("create");
                        applyDataVOList.add(object);
                    }
@@ -580,7 +577,7 @@
                sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
                sb.append(")");
                List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());

                DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
                List<ClientBusinessObject> cboList=    ChangeMapTOClientBusinessObjects(dataMapList);
                ApplyDatasVO applyDatasVO=new ApplyDatasVO();
                ApplyDatasVO editDatasVO=new ApplyDatasVO();
@@ -724,7 +721,7 @@
                resultOrgData.setMessage(message);
                resultOrgData.setSuccess(success.get());
                resultOrgData.setMdMappings(resultMdMappingList);
                Object object = JSONObject.toJSON(resultOrgData);
                //Object object = JSONObject.toJSON(resultOrgData);
            }
            String resultStr = JSONObject.toJSONString(resultOrgData);
            String data = JSONObject.toJSONString(personData);
@@ -749,13 +746,13 @@
    public ResultOrgData syncDataForOrg(OrgData orgData) {
        boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
        ResultOrgData resultOrgData=new ResultOrgData();
        //boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
        // boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
        List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
        AtomicBoolean success= new AtomicBoolean(true);
        String message="";
        String systemCode="";
        if(isUsedFlag){
            List<OrgMasterData> orgMasterDataList=new ArrayList<>();
            List<OrgMasterData> orgMasterDataList = new ArrayList<>();
            List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields());
            try {
                if(orgData==null){
@@ -778,7 +775,7 @@
                ClassfyVO classfyVO = new ClassfyVO();
                classfyVO.setLibrary(deptLibrary);
                classfyVO.setClassCode(deptClassCode);
                CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,deptLibrary);
                CodeClassifyVO codeClassifyVO = this.getClassfy(classfyVO,deptLibrary);
                log.info("end：分类查询完毕");
                //获取分类模板信息
                if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -802,10 +799,10 @@
                    object.setCode(orgMasterData.getMdm_code());//编码
                    object.setCreator(orgMasterData.getCreator());//创建者
                    object.setEditor(orgMasterData.getModifier());//修改者
                    object.setId(orgMasterData.getPk_mdm());//主键
                    object.setId(orgMasterData.getDepartment_code());//主键
                    object.setStatus(CodeDefaultLC.RELEASED.getValue());//状态则需要判断
                    Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
                    List<ProppertyVO> proppertyVOList=new ArrayList<>();
                    List<ProppertyVO> proppertyVOList = new ArrayList<>();
                    /***
                     * 根据配置文件获取枚举值
                     */
@@ -834,7 +831,6 @@
                        object.setOperate("delete");//操作类型
                        deleteDataVOList.add(object);
                    }else{

                        object.setOperate("create");
                        applyDataVOList.add(object);
                    }
@@ -850,10 +846,10 @@
                    throw new Throwable("根据业务类型未查询到业务类型对象！");
                }
                String tableName = btmTypeVO.getTableName();
                if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
                if (StringUtils.isBlank(tableName)) {
                    throw new Throwable("根据业务类型未查询到业务类型相关联的表");
                }
                StringBuffer sb=new StringBuffer();
                StringBuffer sb = new StringBuffer();
                sb.append(" select * from ");
                sb.append(tableName);
                sb.append(" where 1=1 ");
@@ -861,15 +857,16 @@
                sb.append(" and id in (");
                sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
                sb.append(")");
                List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
                List<ClientBusinessObject> cboList=    ChangeMapTOClientBusinessObjects(dataMapList);
                List<Map<String,String>> dataMapList = commonsMapper.queryByOnlySqlForMap(sb.toString());
                DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
                List<ClientBusinessObject> cboList = ChangeMapTOClientBusinessObjects(dataMapList);
                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();
                        String code = cbo.getCode();
                        return !oldpplyDataVOMap.containsKey(code);
                    }).collect(Collectors.toList());
                    applyDatasVO.setObject(applyApplyDataVOList);
@@ -892,7 +889,7 @@
                    DataObjectVO dataObjectVO = new DataObjectVO();
                    this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
                    log.info("start：修改数据执行完毕");
                    boolean  personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
                    boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
                    mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
                    log.info("end：修改数据执行完毕");
                }
@@ -1514,7 +1511,8 @@
                    sb.append(" and lastr=1 and lastv=1" );
                    sb.append(" and codeclsfid in (" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) +")");
                    sb.append(" and Lcstatus in (" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) +")");
                    List<Map<String,String>>  newDataList= commonsMapper.queryByOnlySqlForMap(sb.toString());
                    List<Map<String,String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
                    DefaultAttrAssimtUtil.mapToLowerCase(newDataList,true);
                    List<ClientBusinessObject> clientBusinessObjects=    ChangeMapTOClientBusinessObjects(newDataList);
                    List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
                    if(!CollectionUtils.isEmpty(clientBusinessObjects)){
@@ -2460,7 +2458,7 @@
     */
    public void getConfigDatas(String systemId,String libray, ApplyBZDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {

        LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
        // LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
        //如果将数据转换成所需要的数据对象
        Map<String, String> attrMapConfigMap=new HashMap<>();
        Map<String, String> propMaps=new HashMap<>();