田源
2023-09-14 8fa1d639056f0909823d82f3cca2b59a6d131e6e
Merge remote-tracking branch 'origin/master'
已修改13个文件
354 ■■■■■ 文件已修改
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-prod.yml 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
@@ -1,16 +1,19 @@
package com.vci.ubcs.starter.util;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import java.util.HashMap;
import java.util.Map;
/**
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -248,8 +248,52 @@
            });
        }
    }
    public static  MPJLambdaWrapper buildConditionByMapString(Map<String, String> query) {
        MPJLambdaWrapper<?>qw=new MPJLambdaWrapper<>();
        if (!Func.isEmpty(query)) {
            query.forEach((k, v) -> {
                if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
                    if (k.endsWith("_like")) {
                        qw.like(getColumn(k, "_like"), v);
                    } else if (k.endsWith("_notequal")) {
                        qw.ne(getColumn(k, "_notequal"), v);
                    } else if (k.endsWith("_likeleft")) {
                        qw.likeLeft(getColumn(k, "_likeleft"), v);
                    } else if (k.endsWith("_likeright")) {
                        qw.likeRight(getColumn(k, "_likeright"), v);
                    } else if (k.endsWith("_notlike")) {
                        qw.notLike(getColumn(k, "_notlike"), v);
                    } else if (k.endsWith("_ge")) {
                        qw.ge(getColumn(k, "_ge"), v);
                    } else if (k.endsWith("_le")) {
                        qw.le(getColumn(k, "_le"), v);
                    } else if (k.endsWith("_gt")) {
                        qw.gt(getColumn(k, "_gt"), v);
                    } else if (k.endsWith("_lt")) {
                        qw.lt(getColumn(k, "_lt"), v);
                    } else if (k.endsWith("_datege")) {
                        qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
                    } else if (k.endsWith("_dategt")) {
                        qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
                    } else if (k.endsWith("_dateequal")) {
                        qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
                    } else if (k.endsWith("_datele")) {
                        qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
                    } else if (k.endsWith("_datelt")) {
                        qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
                    } else if (k.endsWith("_null")) {
                        qw.isNull(getColumn(k, "_null"));
                    } else if (k.endsWith("_notnull")) {
                        qw.isNotNull(getColumn(k, "_notnull"));
                    } else {
                        qw.eq(getColumn(k, "_equal"), v);
                    }
                }
            });
        };
        return qw;
    }
    public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
        if (!Func.isEmpty(query)) {
            query.forEach((k, v) -> {
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -25,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -240,12 +241,16 @@
    /**
     * 集团/企业码段判断
     * @param parameter 传入数据 ,classifyGroupCode:配置的中的分类顶节点,oid:选择节点的oid--,nowApplyCode:当前申请编码的分类
     * @param classifyGroupCode 传入数据 ,classifyGroupCode:配置的中的分类顶节点
     * @param oid 传入数据 ,选择节点的oid--,nowApplyCode:当前申请编码的分类
     * @return 执行结果
     */
    @GetMapping("/checkGroupCode")
    @VciBusinessLog(operateName = "集团/企业码段判断")
    public R checkGroupCode(Map<String,String> parameter) throws Exception {
        return R.data(mdmEngineService.checkGroupCode(parameter));
    public R checkGroupCode(String oid,String  classifyGroupCode) throws Exception {
        Map<String,String> codtionMap=new HashMap<>();
        codtionMap.put("oid",oid);
        codtionMap.put("classifyGroupCode",classifyGroupCode);
        return R.data(mdmEngineService.checkGroupCode(codtionMap));
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -1,7 +1,9 @@
package com.vci.ubcs.code.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSystemDTO;
import com.vci.ubcs.code.dto.DockingTaskDTO;
@@ -11,6 +13,7 @@
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,8 +21,10 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
/**
@@ -53,14 +58,17 @@
    private final     ICodeDuckingSyncService codeDuckingSyncService;
    /**系统集成的系统信息列表
     * @param dockingSystem 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     *@return 系统集成的系统信息显示对象列表
     */
    @GetMapping("/gridDockingSystem")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "dockingSystem")
    public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
        IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSystem));
    @ApiOperation(value = "分页", notes = "condtionMap")
    public R<IPage<DockingSystemVO>> page(Map<String,String> condtionMap,Query query) {
        if(!CollectionUtils.isEmpty(condtionMap)){}{
            condtionMap=new HashMap<>();
        }
        IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
        return R.data(DockingSystemWrapper.build().pageVO(pages));
    }
@@ -104,14 +112,17 @@
    }
    /**
     * 系统集成基础信息列表
     * @param dockingSystemConfig 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 系统集成基础信息显示对象列表
     */
    @GetMapping("/gridSystemConfig")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "dockingSystemConfig")
    public R<IPage<DockingSystemConfigVO>> gridSystemConfig(DockingSystemConfig dockingSystemConfig, Query query){
        IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(dockingSystemConfig,query);
    public R<IPage<DockingSystemConfigVO>> gridSystemConfig(Map<String,String> condtionMap, Query query){
        if(!CollectionUtils.isEmpty(condtionMap)){
            condtionMap=new HashMap<>();
        }
        IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(condtionMap,query);
        return R.data(pages);
    }
@@ -180,41 +191,50 @@
    /**
     * 待集成数据
     * @param dockingData 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 系统集成基础信息显示对象列表
     */
    @GetMapping("/gridDockingData")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingDataVO")
    public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){
        IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(dockingData,query);
    public R<IPage<DockingDataVO>> gridDockingData(Map<String,String>condtionMap, Query query){
        if(!CollectionUtils.isEmpty(condtionMap)){
            condtionMap=new HashMap<>();
        }
        IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
        return R.data(pages);
    }
    /**
     * data列表
     * @param dockingTask 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 系统集成的系统信息显示对象列表
     */
    @GetMapping("/gridDockingTask")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingTaskVO")
    public R<IPage<DockingTaskVO>> gridDockingTask(DockingTask dockingTask, Query query){
        IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(dockingTask,query);
    @ApiOperation(value = "分页", notes = "condtionMap")
    public R<IPage<DockingTaskVO>> gridDockingTask(Map<String,String> condtionMap, Query query){
        if(!CollectionUtils.isEmpty(condtionMap)){
            condtionMap=new HashMap<>();
        }
        IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query);
        return R.data(pages);
    }
    /**
     * 推送数据集成日志列表
     * @param dockingLog 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 集成日志显示对象列表
     */
    @GetMapping("/gridLoge")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingLogeVO")
    public R<IPage<DockingLogeVO>> gridLoge(DockingLog dockingLog, Query query){
        IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(dockingLog,query);
    public R<IPage<DockingLogeVO>> gridLoge(Map<String,String> condtionMap, Query query){
        if(!CollectionUtils.isEmpty(condtionMap)){
            condtionMap=new HashMap<>();
        }
        IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
        return R.data(pages);
    }
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -11,6 +11,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import java.util.Map;
/***
 * 系统接口管理-接口配置服务
 * @author xiejun
@@ -21,10 +23,10 @@
    /**
     * 系统集成基础信息列表
     * @param dockingSystemConfig 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 系统集成基础信息显示对象列表
     */
    IPage<DockingSystemConfigVO> page(DockingSystemConfig dockingSystemConfig, Query query);
    IPage<DockingSystemConfigVO> page(Map<String,String> condtionMap, Query query);
    /**
     * 增加 系统集成的接口管理信息
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
@@ -5,31 +5,33 @@
import com.vci.ubcs.code.vo.pagemodel.*;
import org.springblade.core.mp.support.Query;
import java.util.Map;
/***
 * 系統管理相关服务
 */
public interface IDokingSysManaentService {
    /**
     * data列表
     * @param dockingTask 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 系统集成的系统信息显示对象列表
     */
    IPage<DockingTaskVO>gridDockingTask(DockingTask dockingTask, Query query);
    IPage<DockingTaskVO>gridDockingTask(Map<String,String> condtionMap, Query query);
    /**
     * 待集成数据
     * @param dockingData 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 系统集成基础信息显示对象列表
     */
    IPage<DockingDataVO>gridDockingData(DockingData dockingData, Query query);
    IPage<DockingDataVO>gridDockingData(Map<String,String> condtionMap, Query query);
    /**
     * 推送数据集成日志列表
     * @param dockingLog 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 集成日志显示对象列表
     */
    IPage<DockingLogeVO>gridLoge(DockingLog dockingLog, Query query);
    IPage<DockingLogeVO>gridLoge(Map<String,String> condtionMap, Query query);
    /**
     * 接口param列表
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -156,7 +156,6 @@
     */
    private void initPushDataTaks(int type){
        initSysadmin();
        List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list(
            Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true")
                .eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2是代表分类推送,1是代表数据推送
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -35,6 +35,7 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -135,9 +136,9 @@
    private IDockingLogeService dockingLogeService;
    @Override
    public IPage<DockingSystemConfigVO> page(DockingSystemConfig DockingSystemConfig, Query query) {
    public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) {
        IPage<DockingSystemConfig> pages = page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
        IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap));
        List<DockingSystemConfig>  dockingSystemConfigList= pages.getRecords();
        dockingSystemConfigList.stream().forEach(dockingSystemConfig -> {
            dockingSystemConfig.setDataFlowTypeText(SysIntegrationDataFlowTypeEnum.getTextByValue(dockingSystemConfig.getDataFlowType()));
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -7,12 +7,15 @@
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Map;
@Service
public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
@@ -55,29 +58,30 @@
    private  IDockingDataService dockingDataService;
    /**
     * data列表
     * @param dockingTask 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 系统集成的系统信息显示对象列表
     */
    @Override
    public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
        IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
    public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) {
        IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
        return DockingTaskWrapper.build().pageVO(pages);
    }
    @Override
    public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) {
        IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
    public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) {
        IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
        return DockingDataWrapper.build().pageVO(pages);
    }
    /**
     * 推送数据集成日志列表
     * @param dockingLog 基础查询对象,包含查询条件,分页,排序等
     * @param condtionMap 基础查询对象,包含查询条件,分页,排序等
     * @return 集成日志显示对象列表
     */
    @Override
    public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
        IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
    public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) {
        //IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
        IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
        return DockingLogeWrapper.build().pageVO(pages);
    }
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -3697,7 +3697,7 @@
        //使用业务类型查询
        R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
        if (!allAttributeByBtmId.isSuccess()) {
            throw new ServiceException("业务类型feign接口调用错误!");
            throw new ServiceException("业务类型feign接口调用错误;"+allAttributeByBtmId.getMsg());
        }
        if (Func.isEmpty(allAttributeByBtmId.getData())) {
            throw new VciBaseException("传入业务类型未查询到相应表单,请检查!");
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1781,10 +1781,10 @@
                                    }
                                    log.info(libId);
                                }else if(secType.equals("codelevelsec")) {//层级码段
                                    int level = codeBasicSecVO.getCodeLevelValue();
                                    CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO();
                                    CodeClassifyFullInfoBO classifyFullInfoBO = this.classifyService.getClassifyFullInfo(codeClassifyDO.getOid());
                                    if(codeBasicSecVO.getCodeLevelType().equals("code_level_special")){//指定层级
                                        int level = codeBasicSecVO.getCodeLevelValue();
                                        List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
                                        if (classifyVOS.size() >= level && level > 0) {
                                            levelCodeClassifyVO = classifyVOS.get(level - 1);
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -22,98 +22,3 @@
  configuration:
    map-underscore-to-camel-case: false
    call-setters-on-nulls: true
#顶层批量申请配置
batchadd:
  exportattr:
    type: 基本信息
    redis:
      time: 6000000
#统一接口属性映射文件配置
attrconfig:
  #系统集成
  system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
#数据定时推送配置
dataSyncPush:
  isStart: false
  cronTime: "0 0/1 * * * ?"
  dataParamName: dataString
  dataTranTemp: D:\desktop
#分类定时推送配置
clsfSyncPush:
  isStart: false
  cronTime: "0 0/1 * * * ?"
  dataParamName: dataString
  dataTranTemp: D:\desktop
#统一接口相关配置
code:
  universalinterface:
    checkSystemConfig: false
    attrconfig:
      #系统集成
      system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
#mybatis-plus-join:
#  table-alias: t
######应用基本配置
#app:
#  name: web
#  group: 北京宏博远达科技有限公司
#  description: 平台B/S客户端
#  private-token-key: vciweb20210212
###本项目的配置,注意spring家族读取配置时,大写字母需要转换为-的方式,而feign需要大小写完全相同
#session:
#  session-info-storage-type: "database"
#  database-platform: oracle
#  clear-session-on-start: false
#  ###是否开启用户在线检查
#  checkSessionTimeout: false
#  ###客户端判断超时轮询时间,单位为秒
#  sessionInterval: 10
#  ###客户端最大存在时间,单位为分钟
#  sessionIdlTime: 30
#  ###超时提醒时间,单位为分钟
#  sessionRemind: 3
#user-table-compatibility: "platform1"
##受2021版本的部分接口的影响,下面的内容需要配置,
#vciPlatform:
#  objectServiceUrl: ""
#  cache:
##    type: ehcache
#
###web配置
#vciweb:
#  debug: true
#file-preview:
#  enabled: true
#  preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html"
#  preview-system-key: plt2020
#docking:
#  #是否开启主数据/分类数据推送同步
#  insertCache2: false
#  cron: 0 0/1 * * * ?
#  #预申请数据,配置模板文件存放的文件夹
#  templateDir: D:\desktop
#  tranTemp: D:\mes
#  #图号的key
#  tuhao: tuhao
#
#dataSyncPush:
#  isStart: false
#  cronTime: "0 0/1 * * * ?"
#  dataParamName: dataString
#  dataTranTemp: D:\desktop
#clsfSyncPush:
#  isStart: false
#  cronTime: "0 0/1 * * * ?"
#  dataParamName: dataString
#  dataTranTemp: D:\desktop
#
#attrconfig:
#  #系统集成
#  system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
#  #MPM枚举值属性映射
#  mpmEnumMap: {partType: [{enumValue: 1,enumText: 产品},{enumValue: 2,enumText: 产品},{'enumValue': 3,enumText: 标准件},{'enumValue': 7,enumText: 材料}]}
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-prod.yml
@@ -22,98 +22,3 @@
  configuration:
    map-underscore-to-camel-case: false
    call-setters-on-nulls: true
#顶层批量申请配置
batchadd:
  exportattr:
    type: 基本信息
    redis:
      time: 6000000
#统一接口属性映射文件配置
attrconfig:
  #系统集成
  system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
#数据定时推送配置
dataSyncPush:
  isStart: false
  cronTime: "0 0/1 * * * ?"
  dataParamName: dataString
  dataTranTemp: D:\desktop
#分类定时推送配置
clsfSyncPush:
  isStart: false
  cronTime: "0 0/1 * * * ?"
  dataParamName: dataString
  dataTranTemp: D:\desktop
#统一接口相关配置
code:
  universalinterface:
    checkSystemConfig: false
    attrconfig:
      #系统集成
      system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
#mybatis-plus-join:
#  table-alias: t
######应用基本配置
#app:
#  name: web
#  group: 北京宏博远达科技有限公司
#  description: 平台B/S客户端
#  private-token-key: vciweb20210212
###本项目的配置,注意spring家族读取配置时,大写字母需要转换为-的方式,而feign需要大小写完全相同
#session:
#  session-info-storage-type: "database"
#  database-platform: oracle
#  clear-session-on-start: false
#  ###是否开启用户在线检查
#  checkSessionTimeout: false
#  ###客户端判断超时轮询时间,单位为秒
#  sessionInterval: 10
#  ###客户端最大存在时间,单位为分钟
#  sessionIdlTime: 30
#  ###超时提醒时间,单位为分钟
#  sessionRemind: 3
#user-table-compatibility: "platform1"
##受2021版本的部分接口的影响,下面的内容需要配置,
#vciPlatform:
#  objectServiceUrl: ""
#  cache:
##    type: ehcache
#
###web配置
#vciweb:
#  debug: true
#file-preview:
#  enabled: true
#  preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html"
#  preview-system-key: plt2020
#docking:
#  #是否开启主数据/分类数据推送同步
#  insertCache2: false
#  cron: 0 0/1 * * * ?
#  #预申请数据,配置模板文件存放的文件夹
#  templateDir: D:\desktop
#  tranTemp: D:\mes
#  #图号的key
#  tuhao: tuhao
#
#dataSyncPush:
#  isStart: false
#  cronTime: "0 0/1 * * * ?"
#  dataParamName: dataString
#  dataTranTemp: D:\desktop
#clsfSyncPush:
#  isStart: false
#  cronTime: "0 0/1 * * * ?"
#  dataParamName: dataString
#  dataTranTemp: D:\desktop
#
#attrconfig:
#  #系统集成
#  system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
#  #MPM枚举值属性映射
#  mpmEnumMap: {partType: [{enumValue: 1,enumText: 产品},{enumValue: 2,enumText: 产品},{'enumValue': 3,enumText: 标准件},{'enumValue': 7,enumText: 材料}]}