提交代码

 Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue

@@ -209,7 +209,7 @@
                    this.initOptions.forEach((item,index) => {
                        if(item.fieldType==='combox') {
                            let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
                            if(enumCach != null) {
                            if(enumCach != null && enumCach.length > 0) {
                                item.data = enumCach;
                            }else {
                                getDictionary({code: item.comboxKey}).then(res=>{

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

ÎļþÌ«´ó

 Source/UBCS-WEB/vue.config.js

@@ -26,9 +26,9 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.0.105:37000',
        // target: 'http://192.168.0.103:37000',

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/ResultDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.vci.ubcs.code.vo.pagemodel;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.Valid;

/**
 * ä¸ºäº†è§£å†³æ ¹æ®è¿”回的不同code做不同的处理，
 * å‰ç«¯åšäº†å¤„理只返回了msg，所以catch时拿不到状态码
 * @author ludc
 * @date 2023/8/29 17:57
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ResultDataVO {

    private Boolean success;

    private String msg;

}

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

@@ -33,10 +33,7 @@
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
import com.vci.ubcs.omd.cache.EnumCache;
@@ -54,7 +51,9 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.api.ResultCode;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
@@ -514,7 +513,7 @@
        CodeRuleVO releaseCodeRule = getObjectHasSecByOid(oid);
        // å½“前发布的规则不存在码段信息，直接空信息返回
        if(Func.isEmpty(releaseCodeRule.getSecVOList())){
            return R.success("");
            return R.fail("规则信息不存在，请刷新后重试！");
        }
        // 2、找出与当前发布的规则码段顺序一致的规则
        String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
@@ -525,7 +524,7 @@
        );
        // ä¸ºç©ºï¼Œè¯æ˜Žä¸å­˜åœ¨ç±»åŒçš„编码规则直接返回
        if(Func.isEmpty(codeRuleList)){
            return R.success("");
            return R.data(new ResultDataVO());
        }
        // æŸ¥è¯¢å‡ºåŸºç¡€ç æ®µåˆ—表（按照orderNum升序排序）
        List<CodeRuleVO> codeRuleVOS = codeRuleDO2VOs(codeRuleList, true);
@@ -589,6 +588,8 @@
                    // å±‚级码段，比对层级类型、层级的值、字符截取类型、取值类型
                    case "codelevelsec":
                        if(!(releasedBasicSec.getCodeLevelType().equals(releaseBasicSec.getCodeLevelType())
                            /*先做非空判断，因为改属性不是必填属性*/
                            && (Func.isNotEmpty(releasedBasicSec.getCodeLevelValue()) && Func.isNotEmpty(releaseBasicSec.getCodeLevelValue()))
                            && releasedBasicSec.getCodeLevelValue().equals(releaseBasicSec.getCodeLevelValue())
                            && releasedBasicSec.getValueCutType().equals(releaseBasicSec.getValueCutType())
                            && releasedBasicSec.getCodeGetValueType().equals(releaseBasicSec.getCodeGetValueType()))){
@@ -611,6 +612,10 @@
                lastCodeRule.add(item);
            }
        });
        // ä¸ºç©ºæ—¶è¯´æ˜Žæ­¥éª¤3没比对出类似的编码规则
        if(lastCodeRule.isEmpty()){
            return R.data(new ResultDataVO());
        }
        StringBuffer resMsg = new StringBuffer();
        resMsg.append("存在如下相似规则，是否继续发布？\n");
        // æœ€åŽå°†ç»“果进行处理并返回
@@ -619,7 +624,8 @@
            resMsg.append(item.getId());
            resMsg.append("编码规则;\n");
        });
        return R.fail(resMsg.toString());
        ResultDataVO resultDataVO = new ResultDataVO(false,resMsg.toString());
        return R.data(resultDataVO);
    }

    /**

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

@@ -179,7 +179,7 @@
     * @return excel的文件地址
     */
    @Override
    public  String downloadTopImportExcel(String codeClassifyOid){
    public String downloadTopImportExcel(String codeClassifyOid){
        List<CodeClassifyTemplateVO> templateVOList=new ArrayList<>();
        VciBaseUtil.alertNotNull("导出模板","导出的配置",codeClassifyOid,"主题库分类的主键");
        CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);

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

@@ -27,6 +27,7 @@
import com.vci.ubcs.code.vo.webserviceModel.classify.ResultClassifyVO;
import com.vci.ubcs.code.vo.webserviceModel.coderule.*;
import com.vci.ubcs.code.vo.webserviceModel.data.*;
import com.vci.ubcs.code.vo.webserviceModel.data.ResultDataVO;
import com.vci.ubcs.code.vo.webserviceModel.result.json.*;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultClassfyVO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;