代码提交

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

@@ -131,3 +131,18 @@
    }
  })
}

/**
 * 规则发布前校验规则
 * @param {*} codeRuleDTO 
 * @returns 
 */
export const checkLikeCodeRule = (oid) => {
  return request({
    url: '/api/ubcs-code/mdmRule/checkLikeCodeRule',
    method: 'get',
    params: {
      oid
    }
  })
}

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue

@@ -44,13 +44,13 @@
        openReconfigInterFace(preReferConfigForm){
            const form = preReferConfigForm;
            let data = {
                referTypeName: form.referBtmName,
                referType: form.referBtmId,
                referTypeName: form.referBtmName || '',
                referType: form.referBtmId || '',
            }
            if(this.referConfigOption.referConfig){
                // 编辑码段时referConfig可能会在为【参照引用的业务类型】选取值之后改变
                let referConfigValue =JSON.parse(form.referConfig);
                if(referConfigValue.referType != form.referBtmId){
                if(referConfigValue.referType != form.referBtmId && data.referType){
                referConfigValue.referType = form.referBtmId || '';
                referConfigValue.referTypeName = form.referBtmName || form.referBtmId;
                this.referConfigOption.referConfig = JSON.stringify(referConfigValue);

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

@@ -37,6 +37,7 @@
            icon="el-icon-position"
            v-show="scope.row.lcStatus=='Editing' ? true:false"
            plain
            :disabled="releadDisabled"
            @click="enableOrDeactivatse(scope.row.oid,'release')">发 布
          </el-button>
          <el-button type="text"
@@ -820,17 +821,8 @@
</template>

<script>
  import { gridCodeRule, getDetail, add, update, remove, listUseRange, updateStatus,clone,clearAllCode } from "@/api/code/mdmrule";
  import {
    gridCodeBasicSec,
    downOrderNum,
    upOrderNum,
    deleteData,
    editSave,
    cloneCodeBasic,
    addSave,
    refDataGridClassifySec,
  } from "@/api/code/codebasic";
  import { gridCodeRule, getDetail, add, update, remove, listUseRange, updateStatus,clone,clearAllCode,checkLikeCodeRule } from "@/api/code/mdmrule";
  import { gridCodeBasicSec, downOrderNum, upOrderNum, deleteData, editSave, cloneCodeBasic, addSave, refDataGridClassifySec } from "@/api/code/codebasic";
  import { listClassifyLinkAttr } from "@/api/code/codeclassify";
  import { gridCodeFixedValue,addSaveCodeFixedValue,deleteCodeFixedValue,editCodeFixedValue,saveOrder } from "@/api/code/codeFixedValue";
  import { treeCodeClassifyValue,addSaveCodeClassifyValue,editCodeClassifyValue,deleteCodeClassifyValue,saveCodeClassifyValueOrder } from "@/api/code/codeClassifyValue";
@@ -884,6 +876,7 @@
          escapeOwnerVisible: false,
          ruleAdminUserList: [], //规则管理员列表
          ruleOwner: '', // 当前要转移给哪个规则管理员的ID
          releadDisabled: false, // 避免规则发布重复提交

          /*使用范围对话框显示控制*/
          codeRangeSettingBox: false,
@@ -1807,9 +1800,9 @@
        refreshUseRangeChange(){
          this.getRangeCodeList();
        },
        /** 启用与停用*/
        enableOrDeactivatse(oId,update){
          updateStatus({"oid":oId,"ts":new Date().getTime,"update":update}).then(() => {
        /** 修改规则状态:启用、停用、发布 */
        updateStatus(oid,update){
          updateStatus({"oid":oid,"ts":new Date().getTime,"update":update}).then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
@@ -1819,6 +1812,31 @@
            window.console.log(error);
          });
        },
        /** 发布编码规则 */
        async enableOrDeactivatse(oid,update){
          // 避免用户重复点击按钮
          this.releadDisabled = true;
          await checkLikeCodeRule(oid).then(res => {
            if(res.data.success){
              this.updateStatus(oid,update);
            }else{
              this.$confirm('test', '提示', {
                distinguishCancelAndClose: true,
                confirmButtonText: '继续发布',
                cancelButtonText: '取消'
              }).then(() => {
                //this.updateStatus();
              })
              .catch(action => {
                this.$message({
                  type: 'info',
                  message: '取消发布!',
                })
              });
            }
          })
          this.releadDisabled = false;
        },
        /** 打开编码规则克隆对话框*/
        openCodeRuleDialog() {
          if (!this.tipsMessage(this.selectionList)) {

 Source/UBCS/service-start.sh

@@ -26,8 +26,8 @@
 docker run -d -p 36004:36004 --name ubcs-flow vci-ubcs/ubcs-flow:latest

 #启动develop服务
 docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
 docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest
# docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
# docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest

 #启动jobAdmin服务
# docker build -f ./ubcs-ops/ubcs-xxljob-admin/Dockerfile -t vci-ubcs/ubcs-jobadmin .

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

@@ -224,7 +224,7 @@
    @GetMapping("/checkLikeCodeRule")
    @ApiOperationSupport(order = 15)
    @ApiOperation(value = "检查相似编码规则", notes = "传入oid")
    public R checkLikeCodeRule(String oid){
    public R checkLikeCodeRule(@Valid @RequestParam String oid){
        return codeRuleService.checkLikeCodeRule(oid);
    }