代码提交

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

@@ -1827,11 +1827,11 @@
        },
        /** 发布编码规则 */
        async enableOrDeactivatse(oid,update){
          /*if(update==="release"){
          if(update==="release"){
            // 避免用户重复点击按钮
            this.releadDisabled = true;
            await checkLikeCodeRule(oid).then(res => {
              console.log(res)
              //console.log(res)
              if(res.data.success){
                this.updateStatus(oid,update);
              }else{
@@ -1840,7 +1840,7 @@
                  confirmButtonText: '继续发布',
                  cancelButtonText: '取消'
                }).then(() => {
                  //this.updateStatus();
                  this.updateStatus(oid,update);
                })
                .catch(action => {
                  this.$message({
@@ -1851,9 +1851,9 @@
              }
            })
            this.releadDisabled = false;
          }else {*/
          }else {
            this.updateStatus(oid,update);
          //}
          }
        },
        /** 打开编码规则克隆对话框*/
        openCodeRuleDialog() {

 Source/UBCS-WEB/vue.config.js

@@ -26,12 +26,11 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost',
        target: 'http://localhost',
        // 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.16:37000',
        // target: 'http://192.168.0.105:37000',
        //xiejun
        // target: 'http://192.168.43.251:37000',
        // target: 'http://192.168.0.103:37000',
        // target: 'http://192.168.1.63:37000',

 Source/UBCS/service-start.sh

@@ -70,7 +70,7 @@
 docker run -d -p 36015:36015 --name ubcs-omd vci-ubcs/ubcs-omd:latest

 #启动applyjtcodeservice服务
 docker build -f ./ubcs-service/ubcs-webservice/Dockerfile -t vci-ubcs/ubcs-applyjtcodeservice .
 docker build -f ./ubcs-service/ubcs-applyjtcodeservice/Dockerfile -t vci-ubcs/ubcs-applyjtcodeservice .
 docker run -d -p 36016:36016 --name ubcs-applyjtcodeservice vci-ubcs/ubcs-applyjtcodeservice:latest

 #其他服务请自行添加

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

@@ -9,15 +9,3 @@
    prior-ip-pattern:
      - 192.168.0.*
      - 127.0.0.1
server:
  port: 80

spring:
  cloud:
    gateway:
      discovery:
        locator:
          enabled: true
    loadbalancer:
      retry:
        enabled: true

 Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml

@@ -11,7 +11,6 @@
      - 127.0.0.1
server:
  port: 80

spring:
  cloud:
    gateway:

 Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
server:
  port: 80
  port: 37000

spring:
  cloud:

 Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application-prod.yml

@@ -4,3 +4,16 @@
    url: ${blade.datasource.flow.prod.url}
    username: ${blade.datasource.flow.prod.username}
    password: ${blade.datasource.flow.prod.password}
#服务器端口
server:
  port: 36004

#flowable配置
flowable:
  activity-font-name: \u5B8B\u4F53
  label-font-name: \u5B8B\u4F53
  annotation-font-name: \u5B8B\u4F53
  check-process-definitions: false
  database-schema-update: false
  async-executor-activate: false
  async-history-executor-activate: false

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml

@@ -4,4 +4,26 @@
    url: ${blade.datasource.prod.url}
    username: ${blade.datasource.prod.username}
    password: ${blade.datasource.prod.password}
    servlet:
      multipart:
        max-file-size: 500MB
        max-request-size: 500MB

#服务器端口
server:
  port: 36007

#默认对象存储配置
oss:
  enabled: true
  name: minio
  tenant-mode: true
  endpoint: http://dev.vci-tech.com:39000
  access-key: TyEeBAJiAKDvHICUVAoH
  secret-key: Reo4wW8EWF4gSizUmVsNjWfbDZzR3rBYFn5Jehd9
  bucket-name: vci-ubcs

#关闭驼峰命名映射
mybatis-plus:
  configuration:
    map-underscore-to-camel-case: false

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

@@ -19,7 +19,6 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.rmi.ServerException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

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

@@ -36,6 +36,7 @@
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
@@ -690,10 +691,9 @@
    /**
     * 校验关键属性
     *
     * @param classifyFullInfo 分类的全部信息
     * @param templateVO       模板的内容，必须包含模板属性
     * @param orderDTO         编码申请的相关的信息
     */
    @Override
    public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) {
        List<Map>dataList=new ArrayList<>();
        CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
@@ -2468,10 +2468,12 @@
            conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, codeClassifyOid);
        } else {
//            conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)

            List<BtmTypeVO> classifyData = btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)).getData();
            if(Func.isEmpty(classifyData)){
                throw new ServiceException("业务类型配置不一致，请修改英文名称为"+MdmBtmTypeConstant.CODE_CLASSIFY);
            }
            conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " +
                    btmTypeClient.selectByIdCollection(Collections.singletonList("classify"))
                            .getData().get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
                classifyData.get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
                    .FRAMEWORK_DATA_ENABLED + "' start with parentCodeClassifyOid = '" + codeClassifyOid +
                    "' CONNECT BY PRIOR OID = parentCodeClassifyOid )");
        }
@@ -2737,7 +2739,7 @@
            CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
            return getCodeRuleByClassifyFullInfo(fullInfo);
        }
        //我们查询编码规则
        //查询编码规则
        return ruleService.getObjectHasSecByOid(codeRuleOid);
    }