提交get请求中文编码问题，表名常量类，表别名枚举类

 Source/UBCS-WEB/src/api/code/codebasic.js

@@ -8,6 +8,9 @@
      ...params,
      page,
      limit,
    },
    paramsSerializer: function(params) {
      return qs.stringify(params, { encode: false });
    }
  })
}

 Source/UBCS-WEB/src/api/code/mdmrule.js

@@ -8,7 +8,7 @@
      page,
      limit,
      ...params,
    }
    },
  })
}


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

@@ -52,7 +52,8 @@
                        <div class="grid-content">
                            <el-select placeholder="请选择" v-model="searchFormArrays[index].condition">
                                <el-option
                                    v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
                                    v-for="condition in item.fieldType==='text' || item.fieldType==='combox' ? 
                                    item.fieldType==='text' ? searchConditions:switchSearchConditions:dateConditions"
                                    :key="condition.value"
                                    :label="condition.label"
                                    :value="condition.value">
@@ -71,7 +72,12 @@
                                    :value="option.itemValue">
                                </el-option>
                            </el-select>
                            <el-switch  v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
                            <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
                            <el-date-picker v-else-if="item.fieldType==='date'"
                                v-model="searchFormArrays[index].fieldValue"
                                type="date"
                                placeholder="选择日期">
                            </el-date-picker>
                        </div>
                    </el-col>
                    <el-col :span="2">
@@ -106,7 +112,7 @@
            // å¯¹è¯æ¡†æ˜¾ç¤ºæŽ§åˆ¶
            isShowDialog: this.visible,
            initOptions: [],
            // å­—段是输入框类型的条件数组
            // å­—段类型是输入框类型的条件数组
            searchConditions: [
                {
                    value: "_equal",
@@ -120,15 +126,9 @@
                },{
                    value: "_notlike",
                    label: "不包含",
                },{
                    value: "_ge", //大于，默认为大于等于
                    label: "大于", 
                },{
                    value: "_le", //小于，默认为小于等于
                    label: "小于",
                },
                }
            ],
            // å­—段是单选或下拉框类型的条件数组
            // å­—段类型是单选或下拉框类型的条件数组
            switchSearchConditions: [
                {
                    value: "_equal",
@@ -137,6 +137,22 @@
                    value: "_notequal",
                    label: "不等于",
                }
            ],
            // å­—段类型是日期
            dateConditions: [
                {
                    value: "_equal",
                    label: "等于",
                },{
                    value: "_notequal",
                    label: "不等于",
                },{
                    value: "_ge", //大于，默认为大于等于
                    label: "大于", 
                },{
                    value: "_le", //小于，默认为小于等于
                    label: "小于",
                },
            ],
            searchFormArrays: [],
            fieldValue: '',
@@ -236,7 +252,7 @@
            const searchConditions = this.searchFormArrays;
            for(let index = 0; index < searchConditions.length; index++) {
                //console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
                if(searchConditions[index].fieldValue.trim() != '' || searchConditions[index].fieldValue+''==='false') {
                if(searchConditions[index].fieldValue+'' != '' || searchConditions[index].fieldValue+''==='false') {
                    // å­˜åœ¨ç›¸åŒçš„查询条件
                    if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' != 'undefined' ) {
                        this.$message.warning("存在重复查询条件，请仔细核对!");
@@ -247,7 +263,7 @@
                    condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
                }
            }
            // æŸ¥è¯¢æ¡ä»¶æ²¡æœ‰å‡ºçŽ°é‡å¤å±žæ€§ï¼Œå¹¶ä¸”过滤掉了空值，传递给父组件
            // æŸ¥è¯¢æ¡ä»¶æ²¡æœ‰å‡ºçŽ°é‡å¤å±žæ€§ï¼Œå¹¶ä¸”过滤掉了空值，就传递给父组件
            // console.log(condtionParam);
            this.$emit('echoContion',condtionParam)
            this.isShowDialog = false;
@@ -316,6 +332,9 @@
        line-height: 40px;
        height: 40px;
    }
    .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
        width: 100%;
    }


</style>

 Source/UBCS-WEB/src/router/axios.js

@@ -15,6 +15,7 @@
import {Base64} from 'js-base64';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import qs from 'qs';

//默认超时时间
axios.defaults.timeout = 20000;
@@ -51,6 +52,12 @@
  if (config.method === 'post' && meta.isSerialize === true) {
    config.data = serialize(config.data);
  }
  // get请求特殊字符汉字序列化，否则会导致后端无法转码
  if(config.method === 'get'){
    config.paramsSerializer =  function(params) {
      return qs.stringify(params, { encode: true })
    };
  }
  return config
}, error => {
  return Promise.reject(error)

 Source/UBCS-WEB/src/util/param2CondMapUtil.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
/**
 * Param转conditionMap条件的工具类
*/



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

@@ -1173,7 +1173,6 @@
        refreshParentClassifyDataChange() {
          this.parentClassifyOnLoad(this.parentClsfyParams.parentClassifyDataPage, this.parentClsfyParams.parentClassifyQuery);
        },
        // TODO:待修改
        parentClassifyOnLoad(page, params = {}) {
          let parentClsParam = this.parentClsfyParams;
          parentClsParam.classifyDialogLoading = true;
@@ -1204,22 +1203,25 @@
        loadlistClassifyLinkAttr() {
          let attrParam = this.selectAttrParams;
          //console.log(this.currentSelectTreeData);
          attrParam.selectAttrOptionLoading = true;
          this.selectAttrParams.selectAttrOptionLoading = true;
          let conditionMaps = {};
          if(attrParam.selectAttrQeury){
            Object.keys(attrParam.selectAttrQeury).forEach(key=>{
              conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key];
              conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key].trim();
            });
          }
          conditionMaps['conditionMap[codeClassifyOid]'] = this.currentSelectTreeData.oid;
          conditionMaps['conditionMap[btmTypeOid]'] = this.currentSelectTreeData.btmTypeOid;
          listClassifyLinkAttr(conditionMaps).then(res=>{
            //console.log(res.data.data);
            attrParam.selectAttrData = res.data.data;
            attrParam.selectAttrOptionLoading = false;
            const data = res.data;
            this.$nextTick(() => {
                this.$refs[attrParam.ref].doLayout()
              this.$refs[attrParam.ref].doLayout()
            });
            //console.log(data.data);
            this.selectAttrParams.selectAttrData = data.data;
            this.selectAttrParams.selectAttrOptionLoading = false;
            // å°†æœç´¢æ¡†å†…容置空
            this.selectAttrParams.selectAttrQeury = {};
          })
        },
        // ç‚¹å‡»æœç´¢åŽè§¦å‘该事件
@@ -1899,7 +1901,7 @@
          //存储当前关联的编码规则相关信息
          this.currentCodeRuleOid = row.oid;
          this.currentRuleLcStatus = row.lcStatus;
          this.sendGridCodeBasicSec({"pkCodeRule_equal":row.oid},false);
          this.sendGridCodeBasicSec({"cpkCodeRule":row.oid},false);
        },
        // å‘送加载基础码段的请求
        sendGridCodeBasicSec(condition,isAdancedQuery/** æ˜¯å¦é«˜çº§æŸ¥è¯¢ */){
@@ -1910,11 +1912,11 @@
          let conditionMaps = {};
          if(condition && !isAdancedQuery){
            Object.keys(condition).forEach(key=>{
              conditionMaps['conditionMap[t.'+key+']'] = condition[key];
              conditionMaps['conditionMap[pl_code_basicsec.'+key+']'] = condition[key].trim();
            });
          }
          if(isAdancedQuery){
            condition['conditionMap[t.pkCodeRule_equal]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == '' 
            condition['conditionMap[pl_code_basicsec.pkCodeRule]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == '' 
            ? this.selectionList[0].oid:this.currentCodeRuleOid;
          }
          gridCodeBasicSec(1, -1,isAdancedQuery ? condition:conditionMaps).then(res => {
@@ -1945,11 +1947,11 @@
        },
        basicSearchChange(params, done){
          //console.log(this.$refs.crudBasic);
          this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule_equal":this.selectionList[this.selectionList.length-1].oid}),false);
          this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule":this.selectionList[this.selectionList.length-1].oid}),false);
          done();
        },
        basicSearchReset(){
          this.sendGridCodeBasicSec({"pkCodeRule_equal":this.selectionList[this.selectionList.length-1].oid},false);
          this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid},false);
        },
        // ä¸Šç§»ä¸‹ç§»åŸºç¡€ç æ®µ
        upOrderNum(row){
@@ -2055,7 +2057,7 @@
                fieldType: 'combox',
                queryField: 'lcStatus',
                comboxKey: 'codeSearchLCStatus',
              }
              },
            ]
          }else {
            this.advancedQueryParam.options = [
@@ -2063,22 +2065,22 @@
                data: [],
                title: '码段编号',
                fieldType: 'text',
                queryField: 't.id',
                queryField: 'pl_code_basicsec.id',
              },{
                data: [],
                title: '码段名称',
                fieldType: 'text',
                queryField: 't.name',
                queryField: 'pl_code_basicsec.name',
              },{
                data: [],
                title: '描述',
                fieldType: 'text',
                queryField: 't.description',
                queryField: 'pl_code_basicsec.description',
              },{
                data: [],
                title: '码段类型',
                fieldType: 'combox',
                queryField: 't.secType',
                queryField: 'pl_code_basicsec.secType',
                comboxKey: 'codeSecType',
              }
            ]
@@ -2355,11 +2357,13 @@
        searchChange(params, done) {
          this.page.currentPage = 1;
          // å¤šä¸ªconditionMap这样传参，快速查询默认采用模糊查询
          let requestData = {};
          if(params){
            Object.keys(params).forEach(key=>{
              this.query['conditionMap['+key+'_like]'] = params[key];
              requestData["conditionMap"+'['+key+']'] = params[key].trim();
            });
          }
          this.query = requestData;
          this.onLoad(this.page);
          done();
        }, 

 Source/UBCS-WEB/vue.config.js

@@ -26,17 +26,17 @@
    proxy: {
      '/api': {
        //本地服务接口地址
         target: 'http://localhost:37000',
        target: 'http://localhost:37000',
        //  target: 'http://localhost:37000',
        //target: 'http://192.168.1.51:37000',
        //target: 'http://192.168.3.7:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.3.7:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        //   target: 'http://localhost:37000',
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.63:37000',
        //target: 'http://192.168.3.7:37000',
        // target: 'http://192.168.3.7:37000',
        // target: 'http://dev.vci-tech.com:37000',
        //target: 'http://192.168.1.51:37000/',
        // target: 'http://192.168.1.51:37000/',
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',
        ws: true,

 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java

@@ -41,7 +41,7 @@
     * nacos dev åœ°å€
     */
    //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
    String NACOS_DEV_ADDR = "127.0.0.1:8848";
    String NACOS_DEV_ADDR = "localhost:8848";

    /**
     * nacos prod åœ°å€

 Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml

@@ -12,7 +12,6 @@
    <name>${project.artifactId}</name>
    <version>${bladex.project.version}</version>
    <dependencies>

        <!--<dependency>
            <groupId>com.thoughtworks.xstream</groupId>
            <artifactId>xstream</artifactId>
@@ -23,7 +22,6 @@
            <version>1.0-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>-->

        <!--<dependency>
            <groupId>com.vci</groupId>
            <artifactId>vci-platform-web</artifactId>
@@ -68,7 +66,6 @@
            <groupId>com.thoughtworks.xstream</groupId>
            <artifactId>xstream</artifactId>
        </dependency>

    </dependencies>
    <packaging>jar</packaging>


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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -31,7 +32,7 @@
 * @since 2023-04-03
 */
@Data
@TableName("PL_CODE_ALLCODE")
@TableName(CodeTableNameConstant.PL_CODE_ALLCODE)
@ApiModel(value = "CodeAllCode对象", description = "全部码值")
@EqualsAndHashCode(callSuper = true)
public class CodeAllCode extends BaseModel {

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

@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableName;

import com.vci.ubcs.starter.annotation.Transient;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.ibatis.type.Alias;

import java.sql.Clob;

@@ -18,7 +20,7 @@
 * @date 2022-1-18
 */
@Data
@TableName("PL_CODE_BASICSEC")
@TableName(CodeTableNameConstant.PL_CODE_BASICSEC)
@ApiModel(value = "CodeBasicSec对象", description = "码段基础信息")
@EqualsAndHashCode(callSuper = true)
public class CodeBasicSec extends BaseModel {

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

@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.annotation.VciUseEnum;
import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
@@ -40,7 +41,7 @@
 * @since 2023-03-29
 */
@Data
@TableName("PL_CODE_BUTTON")
@TableName(CodeTableNameConstant.PL_CODE_BUTTON)
@ApiModel(value = "codebutton对象", description = "模板扩展池")
@EqualsAndHashCode(callSuper = true)
public class CodeButton extends BaseModel {

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.annotation.Transient;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -15,7 +16,7 @@
 */
//@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY,text = "主题库分类",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
@Data
@TableName("PL_CODE_CLASSIFY")
@TableName(CodeTableNameConstant.PL_CODE_CLASSIFY)
@ApiModel(value = "CodeClassify对象", description = "主题库的分类")
@EqualsAndHashCode(callSuper = true)
public class CodeClassify extends BaseModel {

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.annotation.VciUseEnum;
import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
@@ -15,7 +16,7 @@
 * @date 2023/5/5
 */
@Data
@TableName("PL_CODE_CLSFLOWTEMP")
@TableName(CodeTableNameConstant.PL_CODE_CLSFLOWTEMP)
@ApiModel(value = "CodeTempphase对象", description = "分类使用的流程模板")
public class CodeClassifyProcessTemp extends BaseModel {


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

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.annotation.Transient;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -32,7 +33,7 @@
 * @since 2023-04-10
 */
@Data
@TableName("PL_CODE_CLSTEMPLATE")
@TableName(CodeTableNameConstant.PL_CODE_CLSTEMPLATE)
@ApiModel(value = "PlCodeClstemplate对象", description = "编码库定义-模板管理")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyTemplate extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.annotation.VciFieldType;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
@@ -16,7 +17,7 @@
 */
//@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,text = "主题库分类的模板属性",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
@Data
@TableName("PL_CODE_CLSTEMPATTR")
@TableName(CodeTableNameConstant.PL_CODE_CLSTEMPATTR)
@ApiModel(value = "CodeTempphase对象", description = "编码库定义-模板阶段")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyTemplateAttr extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -31,7 +32,7 @@
 * @since 2023-04-20
 */
@Data
@TableName("PL_CODE_TEMPBUTTON")
@TableName(CodeTableNameConstant.PL_CODE_TEMPBUTTON)
@ApiModel(value = "CodeTempbutton对象", description = "编码库定义-模板按钮扩展")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyTemplateButton extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -13,7 +14,7 @@
 * @date 2023/4/5
 */
@Data
@TableName("PL_CODE_CLASSIFYVALUE")
@TableName(CodeTableNameConstant.PL_CODE_CLASSIFYVALUE)
@ApiModel(value = "CodeClassify对象", description = "分类码段的码值")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyValue extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -13,7 +14,7 @@
 * @date 2022-1-18
 */
@Data
@TableName("PL_CODE_FIXEDVALUE")
@TableName(CodeTableNameConstant.PL_CODE_FIXEDVALUE)
@ApiModel(value = "CodeFixedValue对象", description = "固定码段的码值")
@EqualsAndHashCode(callSuper = true)
public class CodeFixedValue extends BaseModel {

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

@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,7 +36,7 @@
 * @since 2023-04-03
 */
@Data
@TableName("PL_CODE_KEYATTRREPEAT")
@TableName(CodeTableNameConstant.PL_CODE_KEYATTRREPEAT)
@ApiModel(value = "PlCodeKeyattrrepeat对象", description = "关键属性查重规则")
//@EqualsAndHashCode(callSuper = true)
public class CodeKeyAttrRepeat implements Serializable {

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

@@ -17,6 +17,7 @@
package com.vci.ubcs.code.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -30,7 +31,7 @@
 * @since 2023-04-20
 */
@Data
@TableName("PL_CODE_PHASEATTR")
@TableName(CodeTableNameConstant.PL_CODE_PHASEATTR)
@ApiModel(value = "CodePhaseattr对象", description = "编码库定义-模板阶段-属性")
@EqualsAndHashCode(callSuper = true)
public class CodePhaseAttr extends BaseModel {

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

@@ -8,6 +8,7 @@
import com.github.yulichang.annotation.EntityMapping;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -15,13 +16,13 @@
import java.util.List;

/**
 * ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®æ“ä½œå±‚
 * ç¼–码规则管理-引用码段-参照配置
 *
 * @author ludc
 * @date 2023/5/19 17:24
 */
@Data
@TableName("PL_CODE_REFERCONFIG")
@TableName(CodeTableNameConstant.PL_CODE_REFERCONFIG)
@ApiModel(value = "CodeReferConfig对象", description = "编码规则管理-引用码段-参照配置")
@JsonInclude(JsonInclude.Include.NON_EMPTY)  //不输出掉空字段
public class CodeReferConfig extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -30,7 +31,7 @@
 * @since 2023-04-03
 */
@Data
@TableName("PL_CODE_RULE")
@TableName(CodeTableNameConstant.PL_CODE_RULE)
@ApiModel(value = "CodeRule对象", description = "编码规则")
@EqualsAndHashCode(callSuper = true)
public class CodeRule extends BaseModel {

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

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


import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -13,7 +14,7 @@
 * @date 2022-3-1
 */
@Data
@TableName("PL_CODE_SERIALVALUE")
@TableName(CodeTableNameConstant.PL_CODE_SERIALVALUE)
@ApiModel(value = "CodeSerialValue对象", description = "编码规则的流水值")
@EqualsAndHashCode(callSuper = true)
public class CodeSerialValue extends BaseModel {

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.yulichang.annotation.EntityMapping;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -17,7 +18,7 @@
 * @date 2023/5/19 17:35
 */
@Data
@TableName("PL_CODE_SHOWFIELDCONFIG")
@TableName(CodeTableNameConstant.PL_CODE_SHOWFIELDCONFIG)
@ApiModel(value = "CodeShowFieldConfig对象", description = "编码规则管理-引用码段-参照配置-显示属性配置")
public class CodeShowFieldConfig implements Serializable {


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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -15,7 +16,7 @@
 */

@Data
@TableName("PL_CODE_SRCHCONDCONFIG")
@TableName(CodeTableNameConstant.PL_CODE_SRCHCONDCONFIG)
@ApiModel(value = "CodeSrchCondConfig对象", description = "编码规则管理-引用码段-参照配置-搜索条件配置")
public class CodeSrchCondConfig {


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

@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,7 +36,7 @@
 * @since 2023-04-04
 */
@Data
@TableName("PL_CODE_SYNONYM")
@TableName(CodeTableNameConstant.PL_CODE_SYNONYM)
@ApiModel(value = "PlCodeSynonym对象", description = "近义词维护")
//@EqualsAndHashCode(callSuper = true)
public class CodeSynonymEntity implements Serializable {

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

@@ -17,6 +17,7 @@
package com.vci.ubcs.code.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -30,7 +31,7 @@
 * @since 2023-04-20
 */
@Data
@TableName("PL_CODE_TEMPPHASE")
@TableName(CodeTableNameConstant.PL_CODE_TEMPPHASE)
@ApiModel(value = "CodeTempphase对象", description = "编码库定义-模板阶段")
@EqualsAndHashCode(callSuper = true)
public class CodeTemplatePhase extends BaseModel {

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

@@ -17,6 +17,7 @@
package com.vci.ubcs.code.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -30,7 +31,7 @@
 * @since 2023-04-20
 */
@Data
@TableName("PL_CODE_TEMPPHASE")
@TableName(CodeTableNameConstant.PL_CODE_TEMPPHASE)
@ApiModel(value = "CodeTempphase对象", description = "编码库定义-模板阶段")
@EqualsAndHashCode(callSuper = true)
public class CodeTempphaseEntity extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -32,7 +33,7 @@
 * @since 2023-05-05
 */
@Data
@TableName("PL_CODE_WUPIN")
@TableName(CodeTableNameConstant.PL_CODE_WUPIN)
@ApiModel(value = "CodeWupin对象", description = "编码信息")
@EqualsAndHashCode(callSuper = true)
public class CodeWupin extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +10,7 @@
import lombok.EqualsAndHashCode;

@Data
@TableName("PL_DOCKING_LOG")
@TableName(CodeTableNameConstant.PL_DOCKING_LOG)
@ApiModel(value = "DockingLog对象", description = "集成日志对象")
@EqualsAndHashCode(callSuper = true)
public class DockingLog extends BaseModel {

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

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

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -12,7 +13,7 @@
 * @date 2023-06-01
 */
@Data
@TableName("PL_CODE_SYSINTBASE")
@TableName(CodeTableNameConstant.PL_CODE_SYSINTBASE)
@ApiModel(value = "DockingSystem", description = "集成管理接口-集成系统维护对象")
@EqualsAndHashCode(callSuper = true)
public class DockingSystem extends BaseModel {

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +19,7 @@
 * @date 2023-06-01
 */
@Data
@TableName("PL_CODE_SYSINTINFO")
@TableName(CodeTableNameConstant.PL_CODE_SYSINTINFO)
@ApiModel(value = "DockingSystemConfig", description = "集成接口-集成接口管理对象")
@EqualsAndHashCode(callSuper = true)
public class DockingSystemConfig extends BaseModel{

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java

@@ -115,7 +115,7 @@
    /**
     * å±žæ€§ç±»åž‹
     */
    VCO_FIELD_TYPE("vciFieldType"),
    VCI_FIELD_TYPE("vciFieldType"),
    /**
     * çª—口类型
     */

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,125 @@
package com.vci.ubcs.starter.constant;

/**
 * code服务中用到的表名常量类
 * @author ludc
 * @date 2023/6/8 11:04
 */
public class CodeTableNameConstant {

    /**
     * åŸºç¡€ç æ®µçš„信息
     */
    public static final String PL_CODE_BASICSEC = "PL_CODE_BASICSEC";

    /**
     * ä¸»é¢˜åº“的分类
     */
    public static final String PL_CODE_CLASSIFY = "PL_CODE_CLASSIFY";

    /**
     * æ¨¡æ¿æ‰©å±•æ± 
     */
    public static final String PL_CODE_BUTTON = "PL_CODE_BUTTON";

    /**
     * å…¨éƒ¨ç å€¼
     */
    public static final String PL_CODE_ALLCODE = "PL_CODE_ALLCODE";

    /**
     * åˆ†ç±»ä½¿ç”¨çš„流程模板
     */
    public static final String PL_CODE_CLSFLOWTEMP = "PL_CODE_CLSFLOWTEMP";

    /**
     * ç¼–码库定义-模板管理
     */
    public static final String PL_CODE_CLSTEMPLATE = "PL_CODE_CLSTEMPLATE";

    /**
     * ä¸»é¢˜åº“分类的模板属性
     */
    public static final String PL_CODE_CLSTEMPATTR = "PL_CODE_CLSTEMPATTR";

    /**
     * ç¼–码库定义-模板按钮扩展
     */
    public static final String PL_CODE_TEMPBUTTON = "PL_CODE_TEMPBUTTON";

    /**
     * åˆ†ç±»ç æ®µçš„码值
     */
    public static final String PL_CODE_CLASSIFYVALUE = "PL_CODE_CLASSIFYVALUE";

    /**
     * å›ºå®šç æ®µçš„码值
     */
    public static final String PL_CODE_FIXEDVALUE = "PL_CODE_FIXEDVALUE";

    /**
     * å…³é”®å±žæ€§æŸ¥é‡è§„则
     */
    public static final String PL_CODE_KEYATTRREPEAT = "PL_CODE_KEYATTRREPEAT";

    /**
     * ç¼–码库定义
     */
    public static final String PL_CODE_PHASEATTR = "PL_CODE_PHASEATTR";

    /**
     * ç¼–码规则管理-引用码段-参照配置
     */
    public static final String PL_CODE_REFERCONFIG = "PL_CODE_REFERCONFIG";

    /**
     * ç¼–码规则
     */
    public static final String PL_CODE_RULE = "PL_CODE_RULE";

    /**
     * ç¼–码规则的流水值
     */
    public static final String PL_CODE_SERIALVALUE = "PL_CODE_SERIALVALUE";

    /**
     * ç¼–码规则管理-引用码段-参照配置-显示属性配置
     */
    public static final String PL_CODE_SHOWFIELDCONFIG = "PL_CODE_SHOWFIELDCONFIG";

    /**
     * ç¼–码规则管理-引用码段-参照配置-搜索条件配置
     */
    public static final String PL_CODE_SRCHCONDCONFIG = "PL_CODE_SRCHCONDCONFIG";

    /**
     * è¿‘义词维护 å®žä½“ç±»
     */
    public static final String PL_CODE_SYNONYM = "PL_CODE_SYNONYM";

    /**
     * ç¼–码库定义-模板阶段 å®žä½“ç±»
     */
    public static final String PL_CODE_TEMPPHASE = "PL_CODE_TEMPPHASE";

    /**
     * ç¼–码信息 å®žä½“ç±»
     */
    public static final String PL_CODE_WUPIN = "PL_CODE_WUPIN";

    /**
     * é›†æˆæ—¥å¿—对象
     */
    public static final String PL_DOCKING_LOG = "PL_DOCKING_LOG";

    /**
     * é›†æˆç®¡ç†æŽ¥å£-集成系统维护对象
     */
    public static final String PL_CODE_SYSINTBASE = "PL_CODE_SYSINTBASE";

    /**
     * é›†æˆæŽ¥å£-集成接口管理对象
     */
    public static final String PL_CODE_SYSINTINFO = "PL_CODE_SYSINTINFO";

}

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/enumpack/CodeTableNameEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,161 @@
package com.vci.ubcs.starter.enumpack;

import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import org.springblade.core.launch.constant.AppConstant;

/**
 * code服务中用到的联表查询时表别名
 * @author ludc
 * @date 2023/6/8 11:22
 */
public enum CodeTableNameEnum {

    /**
     * åŸºç¡€ç æ®µçš„信息表别名
     */
    PL_CODE_BASICSEC(CodeTableNameConstant.PL_CODE_BASICSEC,"pl_code_basicsec"),

    /**
     * ä¸»é¢˜åº“的分类表别名
     */
    PL_CODE_CLASSIFY(CodeTableNameConstant.PL_CODE_CLASSIFY,"pl_code_classify"),

    /**
     * æ¨¡æ¿æ‰©å±•æ± 
     */
    PL_CODE_BUTTON(CodeTableNameConstant.PL_CODE_BUTTON,"pl_code_button"),

    /**
     * å…¨éƒ¨ç å€¼
     */
    PL_CODE_ALLCODE(CodeTableNameConstant.PL_CODE_ALLCODE,"pl_code_allcode"),

    /**
     * åˆ†ç±»ä½¿ç”¨çš„流程模板
     */
    PL_CODE_CLSFLOWTEMP(CodeTableNameConstant.PL_CODE_CLSFLOWTEMP,"pl_code_clsflowtemp"),

    /**
     * ç¼–码库定义-模板管理
     */
    PL_CODE_CLSTEMPLATE(CodeTableNameConstant.PL_CODE_CLSTEMPLATE,"pl_code_clstemplate"),

    /**
     * ä¸»é¢˜åº“分类的模板属性
     */
    PL_CODE_CLSTEMPATTR(CodeTableNameConstant.PL_CODE_CLSTEMPATTR,"pl_code_clstempattr"),

    /**
     * ç¼–码库定义-模板按钮扩展
     */
    PL_CODE_TEMPBUTTON(CodeTableNameConstant.PL_CODE_TEMPBUTTON,"pl_code_tempbutton"),

    /**
     * åˆ†ç±»ç æ®µçš„码值
     */
    PL_CODE_CLASSIFYVALUE(CodeTableNameConstant.PL_CODE_CLASSIFYVALUE,"pl_code_classifyvalue"),

    /**
     * å›ºå®šç æ®µçš„码值
     */
    PL_CODE_FIXEDVALUE(CodeTableNameConstant.PL_CODE_FIXEDVALUE,"pl_code_fixedvalue"),

    /**
     * å…³é”®å±žæ€§æŸ¥é‡è§„则
     */
    PL_CODE_KEYATTRREPEAT(CodeTableNameConstant.PL_CODE_KEYATTRREPEAT,"pl_code_keyattrrepeat"),

    /**
     * ç¼–码库定义
     */
    PL_CODE_PHASEATTR(CodeTableNameConstant.PL_CODE_PHASEATTR,"pl_code_phaseattr"),

    /**
     * ç¼–码规则管理-引用码段-参照配置
     */
    PL_CODE_REFERCONFIG(CodeTableNameConstant.PL_CODE_REFERCONFIG,"pl_code_referconfig"),

    /**
     * ç¼–码规则
     */
    PL_CODE_RULE(CodeTableNameConstant.PL_CODE_RULE,"pl_code_rule"),

    /**
     * ç¼–码规则的流水值
     */
    PL_CODE_SERIALVALUE(CodeTableNameConstant.PL_CODE_SERIALVALUE,"pl_code_serialvalue"),

    /**
     * ç¼–码规则管理-引用码段-参照配置-显示属性配置
     */
    PL_CODE_SHOWFIELDCONFIG(CodeTableNameConstant.PL_CODE_SHOWFIELDCONFIG,"pl_code_showfieldconfig"),

    /**
     * ç¼–码规则管理-引用码段-参照配置-搜索条件配置
     */
    PL_CODE_SRCHCONDCONFIG(CodeTableNameConstant.PL_CODE_SRCHCONDCONFIG,"pl_code_srchcondconfig"),

    /**
     * è¿‘义词维护 å®žä½“ç±»
     */
    PL_CODE_SYNONYM(CodeTableNameConstant.PL_CODE_SYNONYM,"pl_code_synonym"),

    /**
     * ç¼–码库定义-模板阶段 å®žä½“ç±»
     */
    PL_CODE_TEMPPHASE(CodeTableNameConstant.PL_CODE_TEMPPHASE,"pl_code_tempphase"),

    /**
     * ç¼–码信息 å®žä½“ç±»
     */
    PL_CODE_WUPIN(CodeTableNameConstant.PL_CODE_WUPIN,"pl_code_wupin"),

    /**
     * é›†æˆæ—¥å¿—对象
     */
    PL_DOCKING_LOG(CodeTableNameConstant.PL_DOCKING_LOG,"pl_code_log"),

    /**
     * é›†æˆç®¡ç†æŽ¥å£-集成系统维护对象
     */
    PL_CODE_SYSINTBASE(CodeTableNameConstant.PL_CODE_SYSINTBASE,"pl_code_sysintbase"),

    /**
     * é›†æˆæŽ¥å£-集成接口管理对象
     */
    PL_CODE_SYSINTINFO(CodeTableNameConstant.PL_CODE_SYSINTINFO,"pl_code_sysintinfo")

    ;

    /**
     * æžšä¸¾çš„name
     */
    private String name;

    /**
     * æžšä¸¾æ˜¾ç¤ºæ–‡æœ¬
     */
    private String text;

    CodeTableNameEnum(String name, String text) {
        this.name = name;
        this.text = text;
    }

    public String getName() {
        return name;
    }

    public String getText() {
        return text;
    }

    public void setName(String name) {
        this.name = name;
    }

    public void setText(String text) {
        this.text = text;
    }

}

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

@@ -9,7 +9,7 @@
import java.util.Map;

/**
 * UBCSSqlKeyword
 * UBCSSqlKeyword,高级查询不传的时候默认是_equal
 * map转wrapper时用到的比对转换
 * @author ludc
 * @date 2023/06/06 10:01
@@ -43,8 +43,8 @@
        if (!Func.isEmpty(query)) {
            query.forEach((k, v) -> {
                if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
                    if (k.endsWith("_equal")) {
                        qw.eq(getColumn(k, "_equal"), v);
                    if (k.endsWith("_like")) {
                        qw.eq(getColumn(k, "_like"), v);
                    } else if (k.endsWith("_notequal")) {
                        qw.ne(getColumn(k, "_notequal"), v);
                    } else if (k.endsWith("_likeleft")) {
@@ -76,7 +76,7 @@
                    } else if (k.endsWith("_notnull")) {
                        qw.isNotNull(getColumn(k, "_notnull"));
                    } else {
                        qw.like(getColumn(k, "_like"), v);
                        qw.like(getColumn(k, "_equal"), v);
                    }

                }

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java

@@ -5,13 +5,14 @@
import org.springblade.core.mp.support.Query;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;

/**
 * å› ä¸ºå½“前框架使用的是query来做分页，
 * æ‰€ä»¥æˆ‘这边参照以前的BladeQueryObject来修改
 * ä¸€ä¸ªå½“前框架使用起来方便一点的对象
 * æ‰€ä»¥æˆ‘这边参照以前的BaseQueryObject来修改的
 * @author ludc
 * @date 2023/5/23 13:00
 */
@@ -25,7 +26,7 @@
    @JSONField
    private Map<String, Object> conditionMap = new HashMap();
    @JSONField
    private int page = 1;
    private Integer page = 1;
    @JSONField
    private String sort;
    @JSONField

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

@@ -49,7 +49,7 @@
    @GetMapping("/gridCodeBasicSec")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页 ç æ®µåŸºç¡€ä¿¡æ¯åˆ—表", notes = "传入codeRuleVO")
    public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject){
    public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
        IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(bladeQueryObject.getQuery().setAscs("ordernum"),bladeQueryObject.getConditionMap());
        return R.data(codeRuleVOIPage);
    }

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

@@ -17,6 +17,7 @@
package com.vci.ubcs.code.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.CodeRule;
@@ -31,6 +32,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.http.util.EncodingUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -39,6 +41,8 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Collection;
import java.util.Map;

@@ -71,7 +75,7 @@
     * ç¼–码规则 è‡ªå®šä¹‰åˆ†é¡µ
     * @return baseQueryObject
     */
    @GetMapping("/gridCodeRule")
    @GetMapping(value = "/gridCodeRule")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入CodeRule")
    public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {

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

@@ -22,10 +22,8 @@
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;

import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import org.apache.commons.codec.net.QCodec;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;

@@ -137,7 +135,6 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    R clearAllCode(String oid);


    /**
     * ä½¿ç”¨ä¸»é”®èŽ·å–编码规则的内容

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

@@ -26,11 +26,13 @@
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.enumpack.CodeTableNameEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.enumpck.NewAppConstantEnum;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
@@ -40,6 +42,7 @@
import com.vci.ubcs.starter.web.util.WebUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -120,15 +123,17 @@
     * @throws VciBaseException æŸ¥è¯¢æ¡ä»¶å’Œåˆ†é¡µå‡ºé”™çš„时候会抛出异常
     */
    @Override
    public IPage<CodeBasicSecVO> gridCodeBasicSec(Query query, Map<String,Object> conditionMap) throws VciBaseException {
        if(Func.isEmpty(conditionMap.get("pkCodeRule")) && Func.isEmpty(conditionMap.get("t.pkCodeRule_equal")) ){
    public IPage<CodeBasicSecVO> gridCodeBasicSec(Query query, Map<String,Object> conditionMap) throws ServiceException {
        if(Func.isEmpty(Func.isEmpty(conditionMap.get(CodeTableNameEnum.PL_CODE_BASICSEC.getText()+".pkCodeRule")))){
            return null;
        }
        // è”表查询
        MPJLambdaWrapper<CodeBasicSec> mpjLambdaWrapper = UBCSCondition.getMPJLambdaWrapper(conditionMap, CodeBasicSec.class)
        // è”表查询 ,设置表别名，表别名默认就采用表名小写，配置高级查询的时候就需要根据这个来对where条件进行配置
        MPJLambdaWrapper<CodeBasicSec> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeBasicSec.class, CodeTableNameEnum.PL_CODE_BASICSEC.getText())
            .selectAll(CodeBasicSec.class)
            .selectAs(CodeClassify::getName, CodeBasicSec::getReferCodeClassifyOidName)
            .leftJoin(CodeClassify.class, CodeClassify::getOid, CodeBasicSec::getReferCodeClassifyOid);
            .leftJoin(CodeClassify.class,CodeTableNameEnum.PL_CODE_CLASSIFY.getText(), CodeClassify::getOid, CodeBasicSec::getReferCodeClassifyOid);
        // æ·»åŠ where条件
        UBCSSqlKeyword.buildCondition(conditionMap,mpjLambdaWrapper);
        IPage<CodeBasicSec> codeBasicSecIPage = codeBasicSecMapper.selectPage(UBCSCondition.getPage(query), mpjLambdaWrapper);
        return CodeBasicSecWrapper.build().pageVO(codeBasicSecIPage);
    }
@@ -140,7 +145,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean batchDeleteSecByCodeRuleOid(String codeRuleOid) {
    public boolean batchDeleteSecByCodeRuleOid(String codeRuleOid) throws ServiceException {
        VciBaseUtil.alertNotNull(codeRuleOid,"编码规则主键");
        // 1、通过pkcoderule作为条件，先查询要删除基础码段
        List<CodeBasicSec> deleteList = this.codeBasicSecMapper.selectList(Wrappers.<CodeBasicSec>query().eq("pkcoderule", codeRuleOid));
@@ -183,7 +188,7 @@
     * @return æœ‰ç©ºçš„则传key-属性名 value-字段含义，没有空的则传 key-success value-true
     */
    @Override
    public KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO) {
    public KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO) throws ServiceException {
        VciBaseUtil.alertNotNull(codeBasicSecDTO.getSecType(), "码段分类");
        String secType = codeBasicSecDTO.getSecType();
        HashMap<String, String> attrMap = JSONObject.parseObject(JSONObject.toJSONString(codeBasicSecDTO), HashMap.class);
@@ -346,7 +351,7 @@
     * @param secType ç æ®µç±»åž‹
     * @return ä¸å¯ä¸ºç©ºçš„字段集合
     */
    private Map<String, String> getNotNullableAttr(String secType) {
    private Map<String, String> getNotNullableAttr(String secType) throws ServiceException {
        Map<String, String> attrMap = new HashMap<>();
        if (CodeSecTypeEnum.CODE_ATTR_SEC.getValue().equalsIgnoreCase(secType)) {
            attrMap.put("name", "属性码段名称");
@@ -496,7 +501,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R cloneCodeBasicSec(List<String> oidList, String pkCodeRule) {
    public R cloneCodeBasicSec(List<String> oidList, String pkCodeRule) throws ServiceException {
        boolean isLinked = checkIsLinked(pkCodeRule,null);
        if (isLinked) {
            return R.fail("编码规则已被引用，不允许编辑或删除");
@@ -560,7 +565,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean upOrderNum(String oid) {
    public boolean upOrderNum(String oid) throws ServiceException{
        CodeBasicSec secDO = selectByOid(oid);
        if(secDO.getOrderNum() > 1){
            //等于1的时候不能上移了
@@ -591,7 +596,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean downOrderNum(String oid) {
    public boolean downOrderNum(String oid) throws ServiceException {
        CodeBasicSec secDO = selectByOid(oid);
        Long total = codeBasicSecMapper.selectCount(Wrappers.<CodeBasicSec>query()
            .lambda().eq(CodeBasicSec::getPkCodeRule,secDO.getPkCodeRule())
@@ -623,7 +628,7 @@
     * @return
     */
    @Override
    public List<String> getOidByCodeclassifysecOid(String codeClassifySecOid) {
    public List<String> getOidByCodeclassifysecOid(String codeClassifySecOid)throws ServiceException {
        return codeBasicSecMapper.getOidByCodeclassifysecOid(codeClassifySecOid.trim());
    }

@@ -703,7 +708,7 @@
     * @return ç æ®µçš„内容
     */
    @Override
    public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid) {
    public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid)throws ServiceException {
        if(StringUtils.isBlank(ruleOid)){
            return new ArrayList<>();
        }

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

@@ -57,9 +57,11 @@
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.awt.event.ItemEvent;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.*;

@@ -912,12 +914,12 @@
                attributeVO.setAttributeLength(attr.getAttributeLength());
                attributeVO.setBtmTypeId(btmTypeDetail.getData().getId());
                attributeVO.setBtmname(btmTypeDetail.getData().getName());
                attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,attr.getAttrDataType()));
                attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,attr.getAttrDataType()));
                boolean add = true;
                if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
                    add = false;
                }
                if(StringUtils.isNotBlank(name) && !attributeVO.getId().contains(name.replace("*",""))){
                if(StringUtils.isNotBlank(name) && !attributeVO.getName().contains(name.replace("*",""))){
                    add = false;
                }
                if(add){
@@ -930,20 +932,31 @@
            throw new ServiceException("业务类型feign接口调用出错");
        }
        List<BtmTypeAttributeVO> defaultAttrVOS = btmTypeVOR.getData().getAttributes();
        if(!CollectionUtils.isEmpty(defaultAttrVOS)){
            defaultAttrVOS.stream().forEach(attr->{

        // å–两个集合差集
        List<String> ids = unDefaultAttributes.stream().map(BtmTypeAttributeVO::getId).collect(Collectors.toList());
        defaultAttrVOS.forEach(item->{
            if(!ids.contains(item.getId())){
                BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
                BeanUtils.copyProperties(item,attributeVO);
                attributeVO.setAttrDataType(item.getAttrDataType());
                attributeVO.setAttributeLength(item.getAttributeLength());
                attributeVO.setBtmTypeId(btmTypeDetail.getData().getId());
                attributeVO.setBtmname(btmTypeDetail.getData().getName());
                attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,item.getAttrDataType()));
                boolean add = true;
                if(StringUtils.isNotBlank(id) && !attr.getId().contains(id.replace("*",""))){
                if(StringUtils.isNotBlank(id) && !item.getId().contains(id.replace("*",""))){
                    add = false;
                }
                if(StringUtils.isNotBlank(name) && !attr.getId().contains(name.replace("*",""))){
                if(StringUtils.isNotBlank(name) && !item.getName().contains(name.replace("*",""))){
                    add = false;
                }
                if(add){
                    attributeVOS.add(attr);
                    attributeVOS.add(attributeVO);
                }
            });
        }
            }
        });

        DataGrid<BtmTypeAttributeVO> dataGrid = new DataGrid<>();
        dataGrid.setData(attributeVOS);
        dataGrid.setTotal(attributeVOS.size());
@@ -1030,20 +1043,7 @@
    }

    /**
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
     * ä¸»é¢˜åº“çš„æ ‘,已联调业务类型查询feign
=======
     * ä¸»é¢˜åº“çš„æ ‘,已经联调业务类型查询
>>>>>>> Stashed changes
=======
     * ä¸»é¢˜åº“çš„æ ‘,已经联调业务类型查询
>>>>>>> Stashed changes
=======
     * ä¸»é¢˜åº“çš„æ ‘,已经联调业务类型查询
>>>>>>> Stashed changes
     *
     * @param treeQueryObject æ ‘形查询对象
     * @return ä¸»é¢˜åº“显示树
     */

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

@@ -19,7 +19,9 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.wrapper.CodeClassifyTemplateAttrWrapper;
import com.vci.ubcs.omd.feign.IAttributeClient;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
@@ -28,14 +30,17 @@
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.context.annotation.Lazy;
@@ -89,7 +94,7 @@
     * å±žæ€§æœåŠ¡å¯¹è±¡
     */
    @Resource
    private IAttributeClient attributeClient;
    private IBtmTypeClient btmTypeClient;

    /**
     * æŸ¥è¯¢æ‰€æœ‰çš„主题库分类的模板属性
@@ -297,34 +302,17 @@
            pageHelper = new PageHelper(-1);
        }
        pageHelper.addDefaultAsc("ordernum");
//        IPage iPage = new IPage();
        Query query = new Query();
        query.setAscs("ordernum");
//        query.setSize(100);
        if(pageHelper.getLimit() != -1){
            query.setSize(pageHelper.getLimit());
            query.setCurrent(pageHelper.getPage());
        }
//        Condition.getPage(query)
        CodeClassifyTemplateAttr codeClstempattrVO = new CodeClassifyTemplateAttr();
//        BeanUtil.toBean(map,codeClstempattrVO);
//        BeanUtil
        BeanMap beanMap = BeanMap.create(codeClstempattrVO);

        beanMap.putAll(conditionMap);
//        Condition.getQueryWrapper(
        IPage<CodeClassifyTemplateAttr> doList = baseMapper.
            selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClstempattrVO));


            selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class));
        if (!CollectionUtils.isEmpty(doList.getRecords())) {
//            CodeClstempattrEntity codeClstempattrEntity = new CodeClstempattrEntity();
//            BeanUtils.copyProperties(conditionMap, codeClstempattrEntity);
//            List<CodeClstempattrEntity> codeClstempattrEntities = new ArrayList<>();
//            BeanUtils.copyProperties(doList,codeClstempattrEntities);
//            codeClstempattrEntities.addAll(doList);
            dataGrid.setData(codeClassifyTemplateAttrDO2VOs(doList.getRecords()));
            dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(Condition.getQueryWrapper(codeClstempattrVO)))));
            dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class)))));
        }
        return dataGrid;
    }
@@ -649,6 +637,7 @@
    public  CodeClassifyTemplateAttrVO getObjectByOid(String oid) throws VciBaseException{
        return codeClassifyTemplateAttrDO2VO(selectByOid(oid));
    }

    /**
     * ä¸»é”®æŸ¥è¯¢æ•°æ®å¯¹è±¡
     * @param oid ä¸»é”®
@@ -697,21 +686,6 @@
    }

    /**
     * å‚照主题库分类的模板属性列表
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     * @param pageHelper åˆ†é¡µå’ŒæŽ’序
     * @return ä¸»é¢˜åº“分类的模板属性显示对象列表，生效的内容
     * @throws VciBaseException æŸ¥è¯¢æ¡ä»¶å’Œåˆ†é¡µå‡ºé”™çš„时候会抛出异常
     */
    //    @Override
    //    public DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
    //        if(conditionMap == null){
    //            conditionMap = new HashMap<String, String>();
    //        }
    //        return gridCodeClassifyTemplateAttr(conditionMap,pageHelper);
    //    }

    /**
     * æŸ¥è¯¢è¿™ä¸ªæ¨¡æ¿ï¼Œä¸šåŠ¡ç±»åž‹ä¸‹çš„所有未选择的属性
     * @param baseQueryObject
     * @return
@@ -736,35 +710,16 @@

        //查询模板对象
        CodeClassifyTemplate codeClassifyTemplateDO = codeClassifyTemplateMapper.selectById(templateAttrOid);

        //这个业务类型下的所有属性
        // å¾…完善
        List<BtmTypeAttributeVO> boAttrs = null;  //(List<BtmTypeAttributeVO>)attributeClient.selectById(codeClassifyTemplateDO.getBtmTypeId());// this.btmService.listAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
        // codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId());
        // BeanUtils.copyProperties(codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId()),boAttrs);
        //把默认的属性也添加到boAttrs
        if(boAttrs == null){
            boAttrs = new ArrayList<>();
        // æ²¡æœ‰æ¨¡æ¿å¯¹è±¡ä¸æ‰§è¡Œé€»è¾‘
        if(Objects.isNull(codeClassifyTemplateDO)){
            dataGrid.setData(new ArrayList<>());
            dataGrid.setTotal(0);
            return dataGrid;
        }
        if(!false){
//            List<CodeOsbtmtypeattributeVO> finalBoAttrs = boAttrs;
//            attributeService.getDefaultAttributeVOs().stream().forEach(attr-> {
//                CodeOsbtmtypeattributeVO attributeVO = new CodeOsbtmtypeattributeVO();
//                BeanUtil.convert(attr, attributeVO);
//                if ("id".equalsIgnoreCase(attributeVO.getId())) {
//                    attributeVO.setName("企业编码");
//                }
//                if ("name".equalsIgnoreCase(attributeVO.getId())) {
//                    attributeVO.setName("集团码");
//                }
//                attributeVO.setAttrDataType(attr.getAttributeDataType());
//                attributeVO.setAttributeLength(attr.getAttrLength());
//                attributeVO.setReferBtmTypeId(attr.getBtmTypeId());
//                attributeVO.setReferBtmTypeName(attr.getBtmTypeName());
//                finalBoAttrs.add(attributeVO);
//            });
//            boAttrs = finalBoAttrs;
            Object o = null;
        //这个业务类型下的所有属性
        R<BtmTypeVO> btmTypeVOR = btmTypeClient.getAllAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
        if(btmTypeVOR.getCode() != 200){
            throw new ServiceException("业务类型feign调用失败！");
        }

        //这个模板下已经有的属性
@@ -782,7 +737,7 @@
        //过滤掉已经存在的属性
        List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>();

        for (BtmTypeAttributeVO osBtmTypeAttributeVO:boAttrs){
        for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){
            if(!btmOids.contains(osBtmTypeAttributeVO.getId())){
                //看看是不是有模糊查询
                boolean inSearch = true;

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

@@ -42,7 +42,7 @@
    public CodeClassifyTemplateAttrVO entityVO(CodeClassifyTemplateAttr CodeClstempattr) {
        CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO = Objects.requireNonNull(BeanUtil.copy(CodeClstempattr, CodeClassifyTemplateAttrVO.class));
        if(StringUtils.isNotBlank(CodeClstempattr.getAttributeDataType())){
            codeClassifyTemplateAttrVO.setAttributeDataTypeText( EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,CodeClstempattr.getAttributeDataType()));
            codeClassifyTemplateAttrVO.setAttributeDataTypeText( EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,CodeClstempattr.getAttributeDataType()));
        }
        return codeClassifyTemplateAttrVO;
    }

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml

@@ -1,19 +1,28 @@
#服务器端口
server:
  port: 36014

  tomcat:
    uri-encoding: UTF-8
  servlet:
    encoding:
      enabled: true
      charset: UTF-8
      force: true
#数据源配置
spring:
  datasource:
    url: ${ubcs.datasource.mdm.dev.url}
    username: ${ubcs.datasource.mdm.dev.username}
    password: ${ubcs.datasource.mdm.dev.password}
  messages:
    encoding: utf-8
    basename: i18n/messages
#关闭驼峰命名映射
mybatis-plus:
  configuration:
    map-underscore-to-camel-case: false
#mybatis-plus-join:
#  table-alias:
#  table-alias: t

######应用基本配置
#app:

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java

@@ -51,7 +51,7 @@
    @Override
    @GetMapping(GET_DETAIL)
    public R<BtmTypeVO> getDetail(String oid) {
        return R.data(btmTypeService.getAllAttributeByBtmOid(oid));
        return R.data(btmTypeService.getBtmTypeByOid(oid));
    }

    /**

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

@@ -216,7 +216,7 @@
    @GetMapping( "/queryApplyState")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "查看申请单状态", notes = "查看申请单状态")
    public R  queryApplyState(String oids){
    public R queryApplyState(String oids){
        try {
            return groupMdmInterService.queryApplyState(oids);
        }catch (VciBaseException e){

 Source/data/applogs/xxl-job/xxl-job-admin.log

Binary files differ

 Source/data/applogs/xxl-job/xxl-job-admin.log.2023-06-07.zip

Binary files differ