错误日志修复

 Source/UBCS-WEB/src/views/code/code.vue

@@ -3670,7 +3670,7 @@

.right {
  /* float: right; */
  margin-right: 2vw;
  /* margin-right: 1vw; */
  height: 100%;
  width: auto;
}

 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java

@@ -39,7 +39,6 @@
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/LogApplication.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/LogApplication.java ÐÞ¸Ä
@@ -14,13 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log;
package com.vci.ubcs.log;

import org.springblade.core.cloud.client.UbcsCloudApplication;
import org.springblade.core.launch.UbcsApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;

/**
 * æ—¥å¿—服务
@@ -28,8 +27,7 @@
 * @author Chill
 */
@EnableDiscoveryClient
@EnableFeignClients({"org.springblade"})
@SpringBootApplication
@UbcsCloudApplication
public class LogApplication {

    public static void main(String[] args) {

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogApiController.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogApiController.java ÐÞ¸Ä
@@ -14,13 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.controller;
package com.vci.ubcs.log.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.core.log.service.ILogApiService;
import lombok.AllArgsConstructor;
import org.springblade.core.log.model.LogApi;
import com.vci.ubcs.log.service.ILogApiService;
import org.springblade.core.log.model.LogApi;import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogErrorController.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogErrorController.java ÐÞ¸Ä
@@ -14,18 +14,17 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.controller;
package com.vci.ubcs.log.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.core.log.service.ILogErrorService;
import lombok.AllArgsConstructor;
import com.vci.ubcs.log.service.ILogErrorService;
import org.springblade.core.log.model.LogError;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogSystemController.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogSystemController.java ÐÞ¸Ä
@@ -1,11 +1,11 @@
package com.vci.ubcs.core.log.controller;
package com.vci.ubcs.log.controller;

import com.vci.ubcs.core.log.service.ILogSystemService;
import com.vci.ubcs.log.service.ILogErrorService;
import com.vci.ubcs.log.service.ILogSystemService;
import com.vci.ubcs.log.entity.SystemLog;
import lombok.AllArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -20,12 +20,11 @@
 */
@NonDS
@RestController
//@AllArgsConstructor
@AllArgsConstructor
@RequestMapping("/systemLog")
public class LogSystemController {

    @Autowired
    private ILogSystemService logSystemService;
    private final ILogSystemService logSystemService;

    @GetMapping("/lazy-list")
    private R<List<SystemLog>> getSystemLogList(@RequestParam String serviceName){

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogUsualController.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogUsualController.java ÐÞ¸Ä
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.controller;
package com.vci.ubcs.log.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.core.log.service.ILogUsualService;
import com.vci.ubcs.log.service.ILogUsualService;
import lombok.AllArgsConstructor;
import org.springblade.core.log.model.LogUsual;
import org.springblade.core.mp.support.Condition;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/feign/LogClient.java ÐÞ¸Ä
@@ -14,16 +14,16 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.feign;
package com.vci.ubcs.log.feign;


import com.vci.ubcs.core.log.service.ILogApiService;
import com.vci.ubcs.core.log.service.ILogErrorService;
import com.vci.ubcs.core.log.service.ILogUsualService;
import lombok.AllArgsConstructor;
import com.vci.ubcs.log.service.ILogApiService;
import com.vci.ubcs.log.service.ILogErrorService;
import com.vci.ubcs.log.service.ILogUsualService;
import org.springblade.core.log.feign.ILogClient;
import org.springblade.core.log.model.LogApi;
import org.springblade.core.log.model.LogError;
import lombok.AllArgsConstructor;
import org.springblade.core.log.model.LogApi;
import org.springblade.core.log.model.LogUsual;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/mapper/LogApiMapper.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/mapper/LogApiMapper.java ÐÞ¸Ä
@@ -14,11 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.mapper;
package com.vci.ubcs.log.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.core.log.model.LogApi;


/**
 * Mapper æŽ¥å£

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/mapper/LogErrorMapper.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/mapper/LogErrorMapper.java ÐÞ¸Ä
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.mapper;
package com.vci.ubcs.log.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.core.log.model.LogError;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/mapper/LogUsualMapper.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/mapper/LogUsualMapper.java ÐÞ¸Ä
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.mapper;
package com.vci.ubcs.log.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.core.log.model.LogUsual;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogApiService.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogApiService.java ÐÞ¸Ä
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.service;
package com.vci.ubcs.log.service;


import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.log.model.LogApi;


/**
 * æœåŠ¡ç±»

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogErrorService.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogErrorService.java ÐÞ¸Ä
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.service;
package com.vci.ubcs.log.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.log.model.LogError;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogSystemService.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java ÐÞ¸Ä
@@ -1,11 +1,9 @@
package com.vci.ubcs.core.log.service;
package com.vci.ubcs.log.service;

import com.vci.ubcs.log.entity.SystemLog;
import com.vci.ubcs.resource.bo.FileObjectBO;
import com.vci.ubcs.starter.exception.VciBaseException;

import java.rmi.ServerException;
import java.util.Collection;
import java.util.List;
import java.util.Map;


 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogUsualService.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogUsualService.java ÐÞ¸Ä
@@ -14,11 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.service;
package com.vci.ubcs.log.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.log.model.LogUsual;


/**
 * æœåŠ¡ç±»
 *

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogApiServiceImpl.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogApiServiceImpl.java ÐÞ¸Ä
@@ -14,13 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.service.impl;
package com.vci.ubcs.log.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.core.log.mapper.LogApiMapper;
import com.vci.ubcs.core.log.service.ILogApiService;
import org.springblade.core.log.model.LogApi;
import org.springframework.stereotype.Service;
import com.vci.ubcs.log.mapper.LogApiMapper;
import com.vci.ubcs.log.service.ILogApiService;
import org.springblade.core.log.model.LogApi;import org.springframework.stereotype.Service;

/**
 * æœåŠ¡å®žçŽ°ç±»

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogErrorServiceImpl.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogErrorServiceImpl.java ÐÞ¸Ä
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.service.impl;
package com.vci.ubcs.log.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.core.log.mapper.LogErrorMapper;
import com.vci.ubcs.core.log.service.ILogErrorService;
import com.vci.ubcs.log.service.ILogErrorService;
import com.vci.ubcs.log.mapper.LogErrorMapper;
import org.springblade.core.log.model.LogError;
import org.springframework.stereotype.Service;


 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogSystemServiceImpl.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java ÐÞ¸Ä
@@ -1,17 +1,13 @@
package com.vci.ubcs.core.log.service.impl;
package com.vci.ubcs.log.service.impl;

import com.vci.ubcs.core.log.service.ILogSystemService;
import com.vci.ubcs.log.service.ILogSystemService;
import com.vci.ubcs.log.entity.SystemLog;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.resource.bo.FileObjectBO;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import javax.xml.crypto.Data;
import java.io.File;
import java.io.IOException;
import java.nio.file.FileSystems;
@@ -28,7 +24,7 @@
 * @date 2023/10/31 15:39
 */
@Service
public class LogSystemServiceImpl implements ILogSystemService {
public class LogSystemServiceImpl implements ILogSystemService{

    /**
     * å„个服务存放的的父路径

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogUsualServiceImpl.java

ÎļþÃû´Ó Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogUsualServiceImpl.java ÐÞ¸Ä
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.core.log.service.impl;
package com.vci.ubcs.log.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.core.log.mapper.LogUsualMapper;
import com.vci.ubcs.core.log.service.ILogUsualService;
import com.vci.ubcs.log.mapper.LogUsualMapper;
import com.vci.ubcs.log.service.ILogUsualService;
import org.springblade.core.log.model.LogUsual;
import org.springframework.stereotype.Service;


 Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/mapper/LogApiMapper.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vci.ubcs.core.log.mapper.LogApiMapper">
<mapper namespace="com.vci.core.log.mapper.LogApiMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="logResultMap" type="org.springblade.core.log.model.LogApi">

 Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/mapper/LogErrorMapper.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vci.ubcs.core.log.mapper.LogErrorMapper">
<mapper namespace="com.vci.core.log.mapper.LogErrorMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="errorLogResultMap" type="org.springblade.core.log.model.LogError">

 Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/mapper/LogUsualMapper.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vci.ubcs.core.log.mapper.LogUsualMapper">
<mapper namespace="com.vci.core.log.mapper.LogUsualMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="logResultMap" type="org.springblade.core.log.model.LogUsual">

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/exception/VciBaseException.java

@@ -6,6 +6,7 @@
//

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.starter.web.util.MessageUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@@ -30,7 +30,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springframework.util.CollectionUtils;
@@ -74,8 +73,6 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入CodeRule")
    public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
        // TODO:测试错误日志
        //int i = 1/0;
        IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(bladeQueryObject.getQuery().setDescs("CREATETIME"), bladeQueryObject.getConditionMap());
        return R.data(pages);
    }

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

@@ -6,7 +6,6 @@
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.GetMapping;

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

@@ -81,6 +81,7 @@
            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
        }
    }

    /**
     * ä¸‹è½½æ‰¹é‡ç”³è¯·çš„导入模板
     * @param codeClassifyOid åˆ†ç±»çš„主键
@@ -101,8 +102,6 @@
            }
            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
        }


    }

    /**

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

@@ -145,7 +145,7 @@
     * @param codeRuleDTO ä¸»æ•°æ®ç¼–码规则数据传输对象，oid和ts需要传输
     * @return ä¸»æ•°æ®ç¼–码规则显示对象
     */
    R cloneCodeRule(CodeRuleDTO codeRuleDTO) throws VciBaseException, ServerException;
    R cloneCodeRule(CodeRuleDTO codeRuleDTO) throws ServerException;

    /**
     * ç¼–码规则清空所有已生成的编码
@@ -167,6 +167,5 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    R checkLikeCodeRule(String oid) throws VciBaseException;


}

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

@@ -161,6 +161,7 @@
     * @param conditionMap   æŸ¥è¯¢æ¡ä»¶
     */
    void wrapperResembleConditionMap(String value, CodeResembleRuleVO resembleRuleVO, String attrId, Map<String, String> conditionMap);

    /**
     * èŽ·å–使用的相似查询规则
     *

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

@@ -69,11 +69,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.Cache;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;

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

@@ -109,12 +109,15 @@
    @Resource
    private ICodeClassifyService classifyService;

    @Resource
    private MdmEngineService mdmEngineService;

    /**
     * é€šç”¨æŸ¥è¯¢
     */
    @Resource
    private CommonsMapper commonsMapper;

    /****
     * ç å€¼æœåŠ¡
     */
@@ -352,10 +355,12 @@
    @Override
    public String createImportExcel(String codeClassifyOid, boolean isHistory) {
        List<CodeClassifyTemplateVO> templateVOList=new ArrayList<>();

        VciBaseUtil.alertNotNull("导出模板","导出的配置",codeClassifyOid,"主题库分类的主键");

        CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);

        //获取码段宽度
        //String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());

        if(isHistory){
            templateVOList= templateService.childTemplates(codeClassifyOid);
@@ -467,6 +472,30 @@
        eo.addSheetDataList(templateVOList.size()+"模板信息【请勿删除或移动】",tempEDList);
        ExcelUtil.writeDataToFile(excelName,eo);
        return excelName;
    }

    /**
     * èŽ·å–码段宽度
     * @param codeClassifyOid
     * @return
     */
    private String getCodeSegmentWidth(String codeClassifyOid){
        CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
        // è¦èŽ·å–码段宽度，先要获取规则，当前没有往上找
        CodeRuleVO codeRuleByClassifyFullInfo = mdmEngineService.getCodeRuleByClassifyFullInfo(classifyService.getClassifyFullInfo(codeClassifyOid));
        List<CodeBasicSecVO> secVOList = codeRuleByClassifyFullInfo.getSecVOList();
        if(secVOList.isEmpty()){
            return "";
        }

        StringBuffer secWidth = new StringBuffer("");

        for (int j = 0; j < secVOList.size(); j++) {
            CodeBasicSecVO secVO = secVOList.get(j);
            int width = VciBaseUtil.getInt(secVO.getCodeSecLength()) + ((secVO.getPrefixCode() + secVO.getSuffixCode()).length());
            secWidth.append(width).append("#");
        }
        return secWidth.toString().substring(0, secWidth.length() - 1);
    }

    /**
@@ -3003,6 +3032,7 @@
            }
        });
    }

    /**
     * excel转换为cbo的对象
     * @param classifyFullInfo åˆ†ç±»çš„全部信息

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java

@@ -469,7 +469,7 @@
     * @throws ServiceException å‚数为空的时候会抛出异常
     */
    @Override
    public String getTableName(String id,String domain) throws ServiceException {
    public String getTableName(String id,String domain) throws VciBaseException {
        VciBaseUtil.alertNotNull(id,"业务类型英文名称",domain,"领域名称");
        if (domain.contains("ubcs-")){
            domain = domain.split("ubcs-")[1];

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java

@@ -18,7 +18,6 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.system.entity.Menu;
import com.vci.ubcs.system.entity.TopMenu;