前端代码提交

 Source/UBCS-WEB/src/api/omd/btmType.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
import request from '@/router/axios';

export const initTree = () => {
    return request({
        url: '/api/ubcs-omd/btm-type/tree-domain',
        method: 'get',
    })
}

export const refOnLoad = (domain) => {
    return request({
        url: '/api/ubcs-omd/btm-type/get-from-table',
        method: 'get',
        params: {
            domain: domain
        }
    })
}

export const getDomain = () => {
    return request({
        url: '/api/ubcs-omd/btm-type/domain',
        method: 'get'
    })
}

export const saveFromTable = (list,domain) => {
    return request({
        url: '/api/ubcs-omd/btm-type/save-from-table/' + domain,
        method: 'post',
        data: list
    })
}

export const getDetail = (oid) => {
    return request({
        url: '/api/ubcs-omd/btm-type/detail',
        method: 'get',
        params: {
            oid: oid
        }
    })
}

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

@@ -1133,6 +1133,7 @@
            type: "success",
            message: "操作成功!"
          });
<<<<<<< HEAD
        })
      },
      //基础码段查询
@@ -1169,6 +1170,31 @@
          this.$message({
            type: "success",
            message: "操作成功!"
=======
        },
        //刷新使用范围列表
        refreshUseRangeChange(){
          this.getRangeCodeList();
        },
        //单击编码规则实现行选择
        codeRuleRowClick (row) {
          this.$refs.crud.toggleSelection();
          this.selectionList = row;
          this.$refs.crud.setCurrentRow(row);
          this.$refs.crud.toggleRowSelection(row); //选中当前行
          this.loadBasic(row);
        },
        // å¯ç”¨ä¸Žåœç”¨
        enableOrDeactivatse(oId,update){
          updateStatus({"oid":oId,"ts":new Date().getTime,"update":update}).then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          }, error => {
            window.console.log(error);
>>>>>>> 7938e5bedb3ff3b17dae51eb9588e8c8e71136c2
          });
        }, error => {
          window.console.log(error);
@@ -1299,7 +1325,56 @@
};
</script>

<<<<<<< HEAD
<style>
=======
<style scope>

  .code-rule-crud > .avue-crud__search ,.code-basic-crud > .avue-crud__search {
    margin-bottom: -15px;
  }

  .code-rule-crud > .avue-crud__pagination {
    padding: 14px 0 2px 20px;
  }
  

  .clone-input-textarea > .el-form-item__content {
    width: 495px;
  }

  .clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
    display: none!important;
  }

  .fixed-avue-crud > .el-card> .el-card__body > .avue-crud__menu {
    display: none!important;
  }

  .other-clone-codebasic-crud > .el-card> .el-card__body > .avue-crud__menu {
    display: none!important;
  }

  .other-clone-coderule-crud > .el-card> .el-card__body > .avue-crud__menu {
    display: none!important;
  }
  
  .el-table--small .el-table__cell {
    padding: 3px 0;
  }

  .classify_value_box > .el-scrollbar {
    height: 95%;
  }

  .basic-container > .el-card  > .el-card__body {
    margin: -10px 0;
  }
  .code-basicsec-container{
    padding: 1px 6px;
  }

>>>>>>> 7938e5bedb3ff3b17dae51eb9588e8c8e71136c2
  .el-divider--horizontal {
      margin-top: 19px !important;
      margin-bottom: -20px !important;

 Source/UBCS-WEB/src/views/modeling/Business.vue

@@ -1,74 +1,141 @@
<template>

  <el-container>
    <el-header>
      <el-button type="primary" @click="businessAdd">新增</el-button>
      <el-button type="primary" @click="businessEdit">修改</el-button>
      <el-button type="primary" @click="selectFromTable">从已有中获取</el-button>
    </el-header>
  <el-container>
    <el-aside width="240px">
      <basic-container>
        <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick">
            <span class="el-tree-node__label" slot-scope="{ node, data }">
              <span>
                <i class="el-icon-star-on"></i>
                {{ (node || {}).label }}
              </span>
            </span>
        </avue-tree>
      </basic-container>
    </el-aside>
      <el-container>
    <el-main>
      <!--        åŸºæœ¬ä¿¡æ¯-->
      <basic-container>
        <p style="margin-top: 10px;font-weight: 570;font-size: 19px">基本信息</p>
        <avue-crud
          v-model="objs"
          :data="basicData"
          :option="basicOption"
          @row-save="basicSave"
        >
          <!--           ç‰ˆæœ¬è§„则-->
          <template slot="rulesForm" slot-scope="{disabled,size}">
            <div>
              <el-input v-if="rulesFalg==false" v-model="objs.tex" :size="size" placeholder="请输入版本号规则"
                        style="width: 290px"></el-input>
              <el-select v-if="rulesFalg" v-model="objs.select" placeholder="请选择版本号规则" style="max-width: 300px">
                <el-option label="测试1" value="1"></el-option>
                <el-option label="测试2" value="2"></el-option>
                <el-option label="测试3" value="3"></el-option>
              </el-select>
              <el-button style="margin-bottom: 5px;margin-left: 10px" type="primary" @click="handelRules">
                {{ rulesFalg == false ? "选择版本号规则" : "手动输入" }}
              </el-button>
            </div>
            <el-descriptions class="margin-top" :column="3" :size="size" border>
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-finished"></i>
                  è‹±æ–‡åç§°
          </template>
          <!--            ç”Ÿå‘½å‘¨æœŸ-->
          <template slot="lifeCycleForm">
            <el-select v-model="objs.select" placeholder="请选择生命周期" style="max-width: 300px">
              <el-option label="测试1" value="1"></el-option>
              <el-option label="测试2" value="2"></el-option>
              <el-option label="测试3" value="3"></el-option>
            </el-select>
            <el-button style="margin-bottom: 5px;display: inline-block;margin-left: 10px" type="primary"
                       @click="handelLife">生命周期列表
            </el-button>
                {{ obj.id }}
              </el-descriptions-item>
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-info"></i>
                  ä¸­æ–‡åç§°
          </template>
                {{ obj.name }}
              </el-descriptions-item>
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-date"></i>
                  æ•°æ®åº“表名
                </template>
                {{ obj.tableName }}
              </el-descriptions-item>
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-folder-opened"></i>
                  æ‰€å±žé¢†åŸŸ
                </template>
                {{ obj.domain }}
              </el-descriptions-item>
              <!-- <el-descriptions-item>
            <template slot="label">
              <i class="el-icon-s-ticket"></i>
              æ ‡ç­¾
            </template>
            {{obj.hashtag}}
          </el-descriptions-item> -->
              <!-- <el-descriptions-item>
            <template slot="label">
              <i class="el-icon-arrow-up"></i>
              ç»§æ‰¿è‡ª
            </template>
            {{ obj.sss }}
          </el-descriptions-item> -->
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-s-check"></i>
                  ç‰ˆæœ¬è§„则
                </template>
                {{ obj.versionRule }}
              </el-descriptions-item>
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-refresh-right"></i>
                  ç”Ÿå‘½å‘¨æœŸ
                </template>
                {{ obj.lifeCycleId }}
              </el-descriptions-item>
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-view"></i>
                  è§†å›¾
                </template>
                {{ obj.viewFlag }}
              </el-descriptions-item>
              <!-- <el-descriptions-item>
            <template slot="label">
              <i class="el-icon-arrow-down"></i>
              å®žçŽ°ç±»
            </template>
            {{ obj.implClass }}
          </el-descriptions-item> -->
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-chat-line-square"></i>
                  æè¿°
                </template>
                {{ obj.description }}
              </el-descriptions-item>
            </el-descriptions>
          </basic-container>
          <!-- å±žæ€§åˆ—表-->
          <basic-container>
            <p style="margin-top: 10px;font-weight: 570;font-size: 19px">属性列表</p>
            <avue-crud v-model="obj" :data="obj.attributes" :option="loadOption" @row-save="loadSave"></avue-crud>
          </basic-container>
        </el-main>
        <el-dialog :visible="ref.visible" title="从数据库中添加" width="700px" append-to-body @close="dialoghandelfalse">
          é€‰æ‹©é¢†åŸŸï¼š
          <el-select v-model="domain" placeholder="请选择" @change="refOnLoad">
            <el-option v-for="item in domainOptions" :key="item" :label="item" :value="item">
            </el-option>
          </el-select>
          <avue-crud class="businessCrud" v-model="ref.form" :option="ref.option" :data="ref.data" @selection-change="selectionChange">
        </avue-crud>
        <el-dialog :visible.sync="packageLifeBox"
                   append-to-body
                   title="查看使用范围"
                   width="1000px">
          <Businpackage></Businpackage>
          <span slot="footer" class="dialog-footer">
            <el-button @click="dialoghandelfalse">取 æ¶ˆ</el-button>
            <el-button type="primary" @click="dialoghandeltrue">ç¡® å®š</el-button>
  </span>
        </el-dialog>
      </basic-container>
      <!--        å±žæ€§åˆ—表-->
      <basic-container>
        <p style="margin-top: 10px;font-weight: 570;font-size: 19px">属性列表</p>
        <avue-crud
          v-model="obj"
          :data="loadData"
          :option="loadOption"
          @row-save="loadSave"
        ></avue-crud>
      </basic-container>
    </el-main>
      </el-container>
    </el-container>
    <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions">
  </business-add>
  </el-container>
</template>
<script>
import {
  initTree,
  refOnLoad,
  getDomain,
  saveFromTable,
  getDetail
} from "@/api/omd/btmType"
export default {
  name: "Business",
  data() {
@@ -78,282 +145,99 @@
      //版本规则状态
      rulesFalg: false,
      obj: {},
      treeData: [{
        value: 0,
        label: '业务类型树',
        children: [
          {
            value: 1,
            label: 'A',
          },
          {
            value: 2,
            label: 'B',
          },
          {
            value: 3,
            label: 'C',
          },
          {
            value: 4,
            label: 'D',
          },
          {
            value: 5,
            label: 'E',
          }
        ]
      }],
      selectionList: [],
      treeData: [],
      treeOption: {
        defaultExpandAll: true,
      },
      loadData: [],
      loadData1: [
        {
          name: '张三',
          business: '测试',
          attrType: "测试",
          default: "测试",
          explain: "测试说明"
        },
        {
          name: '李四',
          business: '测试',
          attrType: "测试",
          default: "测试",
          explain: "测试说明"
        title: '业务类型树',
        props: {
          labelText: '',
          label: 'name',
          value: 'oid',
          children: 'childList',
        }
      ],
      loadData2: [
        {
          name: '王五',
          business: '测试',
          attrType: "测试",
          default: "测试",
          explain: "测试说明"
        },
        {
          name: '宋六',
          business: '测试',
          attrType: "测试",
          default: "测试",
          explain: "测试说明"
        }
      ],
      addOption:{
        btmType:{},
      },
      loadOption: {
        border: true,
        height: 422,
        height: 466,
        editBtn: false,
        addBtn: false,
        menu: false,
        highlightCurrentRow: true,
        refreshBtn:false,
        columnBtn:false,
        column: [
          {
            label: '属性名',
            prop: 'name'
          },
          {
            label: '业务类型',
            prop: 'business'
            label: '属性英文名称',
            prop: 'id',
            align: 'center'
          }, {
            label: '属性中文名称',
            prop: 'name',
            align: 'center'
          },
          {
            label: "属性类型",
            prop: "attrType"
            prop: "attrDataType",
            align: 'center'
          },
          {
            label: "默认值",
            prop: "default",
            prop: "defaultValue",
            align: 'center'
          },
          {
            label: "说明",
            prop: "explain"
            prop: "description",
            align: 'center'
          }
        ]
      },
      //基本信息
      objs: {
        tex: "",
        select: "",
        lifeTex: ""
      },
      basicData: [],
      basicData1: [
        {
          typeName: "测试1",
          tag: "客户",
          inherit: "测试",
          implement: "测试",
          lifeCycle: "周期",
          desc: "这是一个描述"
        }
      ],
      basicData2: [
        {
          typeName: "测试2",
          tag: "客户",
          inherit: "测试",
          implement: "测试",
          lifeCycle: "周期",
          desc: "这是一个描述"
        }
      ],
      basicOption: {
      domain: null,
      domainOptions: [],
      ref: {
        // ä»Žè¡¨ä¸­é€‰æ‹©dialog状态
        visible: false,
        form: {},
        option: {
          height: "550px",
          selection: true,
          headerAlign: 'center',
        border: true,
        height: 88,
          index: true,
          rowKey: 'id',
        tabs: true,
          addBtn: false,
          menu: false,
          highlightCurrentRow: true,
        column: [
          {
            label: "类型名称",
            prop: "typeName",
              label: '表名',
              prop: 'tableName',
              align: 'center',
            display: false
          },
          {
            label: "标签",
            prop: "tag",
            display: false
          },
          {
            label: "继承自",
            prop: "inherit",
            display: false
          },
          {
            label: "实现类",
            prop: "implement",
            display: false
          },
          {
            label: "描述",
            prop: "desc",
              label: '描述',
              prop: 'description',
              align: 'center',
            display: false
          }
        ],
        group: [
          {
            label: "基本信息",
            column: [
              {
                label: "类型名称",
                prop: "typeName"
              },
              {
                label: "标签",
                prop: "tag"
              },
              {
                label: "继承自",
                prop: "inherit"
              },
              {
                label: "是否实例化",
                prop: "case",
                type: "switch",
                align: "center",
                hide: true,
                labelWidth: 90,
                dicData: [
                  {
                    label: "否",
                    value: 0
                  },
                  {
                    label: "是",
                    value: 1
                  }
                ],
              },
              {
                label: "描述",
                prop: "desc",
                type: "textarea"
              },
              {
                label: "实现类",
                prop: "implement"
              },

            ]
          },
          {
            label: "版本规则",
            column: [
              {
                label: '版本规则',
                prop: 'radio',
                type: 'radio',
                button: true,
                change: this.radioChange,
                value: 0,
                dicData: [{
                  label: '不可修订',
                  value: 0
                }, {
                  label: '采用一级版本管理',
                  value: 1
                }, {
                  label: '采用二级版本管理',
                  value: 2
        data: [{
          tableName: '1',
          description: '2'
                }]
              },
              {
                label: "版本号规则",
                prop: "rules",
                display: true,
                formslot: true,
              },
              {
                label: "分隔符",
                prop: "interval",
                type: "select",
                display: true,
                dicData: [
                  {
                    label: ".",
                    value: 0
                  },
                  {
                    label: "-",
                    value: 1
                  },
                  {
                    label: " ",
                    value: 2
                  }
                ]
              },
              {
                label: '版次号规则',
                prop: 'radioRules',
                type: 'radio',
                display: true,
                dicData: [{
                  label: '1.2.3...',
                  value: 0
                }, {
                  label: 'a.b.c...',
                  value: 1
                }, {
                  label: '0.1.2...',
                  value: 2
                }]
              },
            ]
          },
          {
            label: "生命周期",
            column: [
              {
                label: "生命周期",
                prop: "lifeCycle"
              }
            ]
          }
        ]
      },

    }
  },
  created() {
    this.loadData = this.loadData1;
    this.basicData = this.basicData1

    this.initTreeOnLoad();
    this.initDomainOption();
  },
  methods: {
    //生命周期对话框取消点击事件
@@ -389,15 +273,9 @@
      }
    },
    nodeClick(data) {
      if (data.value == 1) {
        this.loadData = this.loadData1;
        this.basicData = this.basicData1
      } else if (data.value == 2) {
        this.loadData = this.loadData2;
        this.basicData = this.basicData2
      }
      this.$message.success(JSON.stringify(data))
    }
      getDetail(data.oid).then(res => {
        this.obj = res.data.data;
      })
  },
//  åŸºæœ¬ä¿¡æ¯æ·»åŠ 
  basicSave(row, done, loading) {
@@ -422,7 +300,53 @@
    }).catch(() => {
      loading()
    })
    },
    selectFromTable() {
      console.log('获取');
      this.ref.visible = true;
    },
    refOnLoad(domain) {
      refOnLoad(domain).then(res => {
        this.ref.data = res.data.data;
      })
    },
    initTreeOnLoad() {
      initTree().then(res => {
        console.log('123');
        this.treeData = res.data.data;
      });
    },
    initDomainOption() {
      getDomain().then(res => {
        this.domainOptions = res.data.data;
      })
    },
    selectionChange(list) {
      this.selectionList = list;
      console.log(this.selectionList);
    },
    dialoghandelfalse() {
      this.ref.visible = false;
      this.selectionList = [];
      this.domain = null;
    },
    dialoghandeltrue() {
      saveFromTable(this.selectionList, this.domain).then(res => {
        this.$message.success('保存成功');
        this.dialoghandelfalse();
        this.initTreeOnLoad();
      })
    },
    businessAdd(){
      this.$refs.btmAdd.showSubmitDialog = true;
      console.log('添加');
    },
    businessEdit(){
      this.addOption.btmType = this.obj;
      this.$refs.addOption.showSubmitDialog = true;
      console.log('编辑');
  }
  },
}
</script>

@@ -432,4 +356,7 @@
  border-radius: 10px;
}

.businessCrud > .el-card > .el-card__body > .avue-crud_menu{
        display: none!important;
    }
</style>

 Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,112 @@
<template>
    <el-dialog 
    title="业务类型"
    :visible.sync="showSubmitDialog"
    append-to-body
    @close="closeSubmitDialog"
    width="70%"
    >
        <el-form ref="form" :model="btmType" show-message="true" inline>
            <el-form-item label="英文名称:" label-width="100px">
                <el-input v-model="btmType.id" prefix-icon="el-icon-finished"></el-input>
            </el-form-item>
            <el-form-item label="中文名称:" label-width="100px">
                <el-input v-model="btmType.name" prefix-icon="el-icon-info"></el-input>
            </el-form-item>
            <el-form-item label="数据库表名:" label-width="100px">
                <el-input v-model="btmType.tableName" prefix-icon="el-icon-date"></el-input>
            </el-form-item>
            <el-form-item label="所属领域:" label-width="100px">
                <el-select v-model="btmType.domain" prefix-icon="el-icon-folder-opened">
                    <el-option v-for="item in domainOption"
                    :label="item"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="版本规则:" label-width="100px">
                <el-input v-model="btmType.revisionRuleId" prefix-icon="el-icon-s-check"></el-input>
            </el-form-item>
            <el-form-item label="生命周期:" label-width="100px">
                <el-input v-model="btmType.lifeCycleId" prefix-icon="el-icon-refresh-right"></el-input>
            </el-form-item>
            <el-form-item label="视图:" label-width="100px">
                <el-input v-model="btmType.view" prefix-icon="el-icon-view"></el-input>
            </el-form-item>
            <el-form-item label="描述:" label-width="100px">
                <el-input v-model="btmType.description" 
                prefix-icon="el-icon-chat-line-square" 
                style="width:254%;"></el-input>
            </el-form-item>
        </el-form>
        <avue-crud :option="option" :data="btmType.attributes"></avue-crud>
    </el-dialog>
</template>


<script>
import { } from '@/api/omd/btmType';
import { } from '@/api/omd/OmdAttribute';
export default {
    name: 'BusinessAdd',
    props: {
        btmType:{
            type: Object
        },
        domainOption:{
            type: Array
        }
    },
    data() {
        return {
            form: {},
            showSubmitDialog : false,
            option: {
                height: "330px",
                selection: true,
                headerAlign: 'center',
                border: true,
                index: true,
                rowKey: 'id',
                tabs: true,
                menu: false,
                highlightCurrentRow: true,
                column: [
                    {
                        label: '属性英文名称',
                        prop: 'id',
                        align: 'center'
                    }, {
                        label: '属性中文名称',
                        prop: 'name',
                        align: 'center'
                    },
                    {
                        label: "属性类型",
                        prop: "attrDataType",
                        align: 'center'
                    },
                    {
                        label: "默认值",
                        prop: "defaultValue",
                        align: 'center'
                    },
                    {
                        label: "说明",
                        prop: "description",
                        align: 'center'
                    }
                ]
            },
        }
    },
    created() {
        console.log('123');
    },
    methods: {
        closeSubmitDialog(){
            this.showSubmitDialog = false;
        }
    }
}
</script>

<style></style>

 Source/UBCS-WEB/src/views/modeling/original.vue

@@ -147,6 +147,7 @@
        index: true,
        rowKey: 'id',
        tabs: true,
        highlightCurrentRow:true,
        column: [
          {
            label: '属性编号',
@@ -540,6 +541,9 @@
        this.loading = false;
        this.data = res.data.data.records
        this.itemData = this.data[0];
        this.$nextTick(() => {
          this.$refs.crud.setCurrentRow(this.data[0]);
        })
      })
    },
    rowClick(row) {

 Source/UBCS/pom.xml

@@ -185,11 +185,10 @@
                    <skip>true</skip>
                </configuration>
            </plugin>
            <!--springboot打包插件会去找每个模块下面的启动类，因为当前有不需要启动类的需求，所以注释掉，使用mvn的打包插件-->
            <!--<plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>-->
            </plugin>
            <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
                <version>${maven.plugin.version}</version>

 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 = "192.168.93.185:38848";
    String NACOS_DEV_ADDR = "192.168.93.186:38848";

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

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java

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


import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import lombok.Data;

/**
 * åˆ†ç±»ä½¿ç”¨çš„流程模板数据传输对象
@@ -9,6 +10,7 @@
 * @author weidy
 * @date 2022-01-24
 */
@Data
public class CodeClassifyProcessTempDTO extends BaseModelVO {

    /**
@@ -19,12 +21,12 @@
    /**
     * ä¸»é¢˜åº“分类主键
     */
    private String codeclassifyoid;
    private String codeClassifyOid;

    /**
     * ä¸»é¢˜åº“分类主键显示文本
     */
    private String codeclassifyoidName;
    private String codeClassifyoidName;

    /**
     * æ‰€å±žæ¨¡æ¿
@@ -33,12 +35,12 @@
    /**
     * æµç¨‹æ¨¡æ¿ç”¨é€”
     */
    private String codeprocessuse;
    private String codeProcessUse;

    /**
     * æµç¨‹æ¨¡æ¿ç”¨é€”显示文本
     */
    private String codeprocessuseText;
    private String codeProcessUseText;

    /**
     * æµç¨‹æ¨¡æ¿çš„版本
@@ -55,98 +57,4 @@
     */
    private String codeTempAttrOidArrName;

    /**
     * èŽ·å– ä¸»é¢˜åº“分类主键
     */
    public String getCodeclassifyoid (){
        return codeclassifyoid;
    }

    /**
     * è®¾ç½® ä¸»é¢˜åº“分类主键
     */
    public void setCodeclassifyoid (String codeclassifyoid){
        this.codeclassifyoid = codeclassifyoid;
    }

    /**
     * èŽ·å–主题库分类主键显示文本
     */
    public String getCodeclassifyoidName (){
        return codeclassifyoidName;
    }

    /**
     * è®¾ç½®ä¸»é¢˜åº“分类主键显示文本
     */
    public void setCodeclassifyoidName (String codeclassifyoidName){
        this.codeclassifyoidName = codeclassifyoidName;
    }
    /**
     * èŽ·å– æµç¨‹æ¨¡æ¿ç”¨é€”
     */
    public String getCodeprocessuse (){
        return codeprocessuse;
    }

    /**
     * è®¾ç½® æµç¨‹æ¨¡æ¿ç”¨é€”
     */
    public void setCodeprocessuse (String codeprocessuse){
        this.codeprocessuse = codeprocessuse;
    }

    public String getCodeprocessuseText() {
        return codeprocessuseText;
    }

    public void setCodeprocessuseText(String codeprocessuseText) {
        this.codeprocessuseText = codeprocessuseText;
    }

    public String getProcessVersion() {
        return processVersion;
    }

    public void setProcessVersion(String processVersion) {
        this.processVersion = processVersion;
    }

    public String getClassifyTemplateOid() {
        return classifyTemplateOid;
    }

    public void setClassifyTemplateOid(String classifyTemplateOid) {
        this.classifyTemplateOid = classifyTemplateOid;
    }

    public String getCodeTempAttrOidArr() {
        return codeTempAttrOidArr;
    }

    public void setCodeTempAttrOidArr(String codeTempAttrOidArr) {
        this.codeTempAttrOidArr = codeTempAttrOidArr;
    }

    public String getCodeTempAttrOidArrName() {
        return codeTempAttrOidArrName;
    }

    public void setCodeTempAttrOidArrName(String codeTempAttrOidArrName) {
        this.codeTempAttrOidArrName = codeTempAttrOidArrName;
    }

    @Override
    public String toString() {
        return "CodeClassifyProcessTempDTO{" +
                "codeclassifyoid='" + codeclassifyoid + '\'' +
                ", codeclassifyoidName='" + codeclassifyoidName + '\'' +
                ", classifyTemplateOid='" + classifyTemplateOid + '\'' +
                ", codeprocessuse='" + codeprocessuse + '\'' +
                ", codeprocessuseText='" + codeprocessuseText + '\'' +
                ", processVersion='" + processVersion + '\'' +
                ", codeTempAttrOidArr='" + codeTempAttrOidArr + '\'' +
                ", codeTempAttrOidArrName='" + codeTempAttrOidArrName + '\'' +
                "} " + super.toString();
    }
}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java

copy from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java
copy to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java
Îļþ´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java ¸´ÖÆ
@@ -14,29 +14,21 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.entity;
package com.vci.ubcs.code.dto;

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;

/**
 * ç¼–码库定义-模板阶段 å®žä½“ç±»
 * ç¼–码信息 æ•°æ®ä¼ è¾“对象实体类
 *
 * @author yuxc
 * @since 2023-04-20
 * @since 2023-05-05
 */
@Data
@TableName("PL_CODE_TEMPPHASE")
@ApiModel(value = "CodeTempphase对象", description = "编码库定义-模板阶段")
@EqualsAndHashCode(callSuper = true)
public class CodeTemplatePhase extends BaseModel {
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String codeClassifyTemplateOid;
public class CodeWupinDTO extends CodeWupinEntity {
    private static final long serialVersionUID = 1L;

}

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

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java ÐÞ¸Ä
@@ -33,7 +33,7 @@
@TableName("PL_CODE_PHASEATTR")
@ApiModel(value = "CodePhaseattr对象", description = "编码库定义-模板阶段-属性")
@EqualsAndHashCode(callSuper = true)
public class CodePhaseAttr extends BaseModel {
public class CodePhaseattrEntity extends BaseModel {


    /**

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

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java ÐÞ¸Ä
@@ -33,7 +33,7 @@
@TableName("PL_CODE_TEMPPHASE")
@ApiModel(value = "CodeTempphase对象", description = "编码库定义-模板阶段")
@EqualsAndHashCode(callSuper = true)
public class CodeTemplatePhase extends BaseModel {
public class CodeTempphaseEntity extends BaseModel {
    /**
     *
     */

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,376 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;

/**
 * ç¼–码信息 å®žä½“ç±»
 *
 * @author yuxc
 * @since 2023-05-05
 */
@Data
@TableName("PL_CODE_WUPIN")
@ApiModel(value = "CodeWupin对象", description = "编码信息")
@EqualsAndHashCode(callSuper = true)
public class CodeWupinEntity  extends BaseModel {

    /**
     *
     */
    @ApiModelProperty(value = "")
    private String checkinby;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private Date checkintime;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String checkoutby;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private Date checkouttime;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String codeclsfid;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String codeclsfpath;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String codetemplateoid;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String materialclassify;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String materialid;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String tuhao;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String pinpai;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String morengongys;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xieyijiage;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String hesuanpici;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String beizhushuoming;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private Short materialtype;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String materialname;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String ruanjianbanben;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String qitachicun;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String morencaigouy;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String yumaileixing;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String chuangjiangongsi;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String caigouwl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String wuliaoxingzhi;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xieyibianhao;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String caizhi;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String chukufangshi;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String shifoupihaoguanli;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String kucunwl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xinghaoguige;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String duiwaiguige;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String zhibaoqi;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String caigoutiqianqi;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String hesuanfenlei;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xiaoshouwl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String changjiaxinghao;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String zuixiaoqiding;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jiliangdw;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String zhiliangbz;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String firstfl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String secondfl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String thrifl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String oldcode;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String baozhuangguige;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String passing;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xbj;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xbxkxs;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xfjjstj;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xgzccdgcd;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xxndj;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xzjmc;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String zjxh;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String clph;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String bmcl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String cpxs;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xbzjbmc;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String xwlwwmc;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jjzyq;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jsbmc;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jsbxh;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jsccj;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jssxt;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jszgl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jzl;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jzrxx;
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String jzxzb;

    @ApiModelProperty(value = "")
    @TableField(exist = false)
    private String codeSecLengthField;

}

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

@@ -16,8 +16,7 @@
 */
package com.vci.ubcs.code.vo;

import com.vci.ubcs.code.entity.CodePhaseAttr;
import org.springblade.core.tool.node.INode;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -29,7 +28,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class CodePhaseattrVO extends CodePhaseAttr {
public class CodePhaseattrVO extends CodePhaseattrEntity {
    private static final long serialVersionUID = 1L;

}

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

copy from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java
copy to Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeWupinVO.java
Îļþ´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java ¸´ÖÆ
@@ -14,29 +14,22 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.entity;
package com.vci.ubcs.code.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;

/**
 * ç¼–码库定义-模板阶段 å®žä½“ç±»
 * ç¼–码信息 è§†å›¾å®žä½“ç±»
 *
 * @author yuxc
 * @since 2023-04-20
 * @since 2023-05-05
 */
@Data
@TableName("PL_CODE_TEMPPHASE")
@ApiModel(value = "CodeTempphase对象", description = "编码库定义-模板阶段")
@EqualsAndHashCode(callSuper = true)
public class CodeTemplatePhase extends BaseModel {
    /**
     *
     */
    @ApiModelProperty(value = "")
    private String codeClassifyTemplateOid;
public class CodeWupinVO extends CodeWupinEntity {
    private static final long serialVersionUID = 1L;

}

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

@@ -4,6 +4,7 @@
//
package com.vci.ubcs.code.vo.pagemodel;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.Transient;
import java.io.Serializable;
import java.util.Date;
@@ -33,6 +34,9 @@
    private String versionValue;
    private String lcStatus;
    private String lcStatusText;
    @JsonFormat(
        pattern = "yyyy-MM-dd HH:mm:ss.SSS"
    )
    private Date ts;
    private String owner;
//    private String checkInBy;

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

@@ -2,16 +2,18 @@

import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import lombok.Data;

import java.util.List;

/**
 * åˆ†ç±»ä½¿ç”¨çš„流程模板显示对象
 *
 * @author weidy
 * @date 2022-01-24
 * @author ludc
 * @date 2023-05-6
 */
public class CodeClassifyProcessTempVO extends CodeClassifyProcessTemp {
@Data
public class CodeClassifyProcessTempVO extends BaseModelVO {

    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
@@ -21,12 +23,12 @@
    /**
    * ä¸»é¢˜åº“分类主键
    */
    private String codeclassifyoid;
    private String codeClassifyOid;

    /**
    * ä¸»é¢˜åº“分类主键显示文本
    */
    private String codeclassifyoidName;
    private String codeClassifyoidName;

    /**
     * æ‰€å±žæ¨¡æ¿
@@ -36,12 +38,12 @@
    /**
    * æµç¨‹æ¨¡æ¿ç”¨é€”
    */
    private String codeprocessuse;
    private String codeProcessUse;

    /**
     * æµç¨‹æ¨¡æ¿ç”¨é€”名称
     */
    private String codeprocessuseText;
    private String codeProcessUseText;

    /**
     * æµç¨‹æ¨¡æ¿çš„版本
@@ -63,106 +65,4 @@
     */
    private List<CodeClassifyTemplateAttrVO> attrList;

    /**
     * èŽ·å– ä¸»é¢˜åº“分类主键
     */
    public String getCodeclassifyoid (){
        return codeclassifyoid;
    }

    /**
    * è®¾ç½® ä¸»é¢˜åº“分类主键
    */
    public void setCodeclassifyoid (String codeclassifyoid){
        this.codeclassifyoid = codeclassifyoid;
    }
    /**
     * èŽ·å–主题库分类主键显示文本
     */
    public String getCodeclassifyoidName (){
        return codeclassifyoidName;
    }

    /**
    * è®¾ç½®ä¸»é¢˜åº“分类主键显示文本
    */
    public void setCodeclassifyoidName (String codeclassifyoidName){
        this.codeclassifyoidName = codeclassifyoidName;
    }
    /**
     * èŽ·å– æµç¨‹æ¨¡æ¿ç”¨é€”
     */
    public String getCodeprocessuse (){
        return codeprocessuse;
    }

    /**
    * è®¾ç½® æµç¨‹æ¨¡æ¿ç”¨é€”
    */
    public void setCodeprocessuse (String codeprocessuse){
        this.codeprocessuse = codeprocessuse;
    }

    public String getCodeprocessuseText() {
        return codeprocessuseText;
    }

    public void setCodeprocessuseText(String codeprocessuseText) {
        this.codeprocessuseText = codeprocessuseText;
    }

    public String getClassifyTemplateOid() {
        return classifyTemplateOid;
    }

    public void setClassifyTemplateOid(String classifyTemplateOid) {
        this.classifyTemplateOid = classifyTemplateOid;
    }

    public String getProcessVersion() {
        return processVersion;
    }

    public void setProcessVersion(String processVersion) {
        this.processVersion = processVersion;
    }

    public List<CodeClassifyTemplateAttrVO> getAttrList() {
        return attrList;
    }

    public void setAttrList(List<CodeClassifyTemplateAttrVO> attrList) {
        this.attrList = attrList;
    }

    public String getCodeTempAttrOidArr() {
        return codeTempAttrOidArr;
    }

    public void setCodeTempAttrOidArr(String codeTempAttrOidArr) {
        this.codeTempAttrOidArr = codeTempAttrOidArr;
    }

    public String getCodeTempAttrOidArrName() {
        return codeTempAttrOidArrName;
    }

    public void setCodeTempAttrOidArrName(String codeTempAttrOidArrName) {
        this.codeTempAttrOidArrName = codeTempAttrOidArrName;
    }

    @Override
    public String toString() {
        return "CodeClassifyProcessTempVO{" +
                "codeclassifyoid='" + codeclassifyoid + '\'' +
                ", codeclassifyoidName='" + codeclassifyoidName + '\'' +
                ", classifyTemplateOid='" + classifyTemplateOid + '\'' +
                ", codeprocessuse='" + codeprocessuse + '\'' +
                ", codeprocessuseText='" + codeprocessuseText + '\'' +
                ", processVersion='" + processVersion + '\'' +
                ", codeTempAttrOidArr='" + codeTempAttrOidArr + '\'' +
                ", codeTempAttrOidArrName='" + codeTempAttrOidArrName + '\'' +
                ", attrList=" + attrList +
                '}' + super.toString();
    }
}

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

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java ÐÞ¸Ä
@@ -1,7 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;

import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import com.vci.ubcs.code.entity.CodeTempphaseEntity;

/**
 * æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡
@@ -9,7 +8,7 @@
 * @author weidy
 * @date 2022-01-24
 */
public class CodeTemplatePhaseVO extends CodeTemplatePhase {
public class CodeTemplatePhaseEntityVO extends CodeTempphaseEntity {

    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java

@@ -74,10 +74,10 @@
        };
        BASE_MODEL_COMPATIBILITY_MAP = new HashMap() {
            {
                this.put("lastr", "islastr");
                this.put("firstr", "isfirstr");
                this.put("lastv", "islastv");
                this.put("firstv", "isfirstv");
                this.put("lastr", "lastr");
                this.put("firstr", "firstr");
                this.put("lastv", "lastv");
                this.put("firstv", "firstv");
            }
        };
        LIFECYCLE_MANAGE_FIELD_MAP = new HashMap() {

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java

@@ -126,7 +126,7 @@
     */
    @ApiModelProperty("参照的主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long referToId;
    private String referToId;

    /**
     * å‚照对象的名称

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java

@@ -135,7 +135,7 @@
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    private String btmName;

    /**
     * æ‹¥æœ‰è€…

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java

@@ -14,7 +14,7 @@
 * @date 2019/10/11 3:21 PM
 */
@Data
@TableName("pl_omd_btm_type_attr")
@TableName("pl_omd_btm_type_attribute")
@ApiModel(value = "业务类型包含的属性", description = "业务类型包含的属性")
public class BtmTypeAttribute implements java.io.Serializable{

@@ -106,7 +106,7 @@
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    private String btmName;

    /**
     * æ‹¥æœ‰è€…

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfo.java

@@ -125,4 +125,9 @@
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;

    /**
     * æ—¶é—´æˆ³
     */
    private Date ts;
}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeTreeVO.java

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


import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * Description: ä¸šåŠ¡ç±»åž‹æ ‘的显示对象
 *
 * @author LiHang
 * @date 2023/5/5
 */
@Data
public class BtmTypeTreeVO implements Serializable{
    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = -1243940048761060562L;

    private String name;

    private String oid;

    private List<BtmTypeTreeVO> childList;
}

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java

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

import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

@@ -11,7 +12,7 @@
 * @date 2019/10/11 5:24 PM
 */
@Data
public class BtmTypeVO implements java.io.Serializable{
public class BtmTypeVO implements Serializable {

    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
@@ -139,7 +140,7 @@
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    private String btmName;

    /**
     * æ‹¥æœ‰è€…

 Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Param.java

@@ -21,7 +21,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.import com.vci.ubcs.starter.revision.model.TreeQueryObject;.BaseEntity;

/**
 * å®žä½“ç±»

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

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


import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface VciBusinessLog {
    String modelName() default "";

    String operateName() default "";

    VciLogType logType() default VciBusinessLog.VciLogType.Operate;

    String description() default "";

    boolean notStore() default false;

    public static enum VciLogType {
        Login,
        Operate,
        Audit;

        private VciLogType() {
        }
    }
}


 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java

@@ -7,13 +7,13 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.data.annotation.Transient;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.Map;

public class BaseModel implements Serializable {
    @JsonSerialize(
        using = ToStringSerializer.class

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

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

import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.secure.utils.AuthUtil;

import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.util.Date;

/**
 * æ–°å¢žæ—¶é»˜è®¤å€¼å±žæ€§èµ‹å€¼
 *
 * @author ludc
 * @date 2023/5/6
 */
public class DefaultAttrAssimtUtil {

    /**
     * æ–°å¢žæ—¶å¡«å……默认值
     * @param object ç»§æ‰¿äº†BaseModel的实体对象
     * @param <T>   è¿”回值的类型
     * @param btmName  ä¸šåŠ¡ç±»åž‹
     * @return
     * @throws VciBaseException
     */
    public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
        BaseModel baseModel = object;
        try {
            baseModel.setOid(VciBaseUtil.getPk());
            baseModel.setCreateTime(new Date());
            baseModel.setNameOid(VciBaseUtil.getPk());
            baseModel.setLastModifyTime(new Date());
            baseModel.setTs(new Date());
            //用户id
            String userId = AuthUtil.getUserId().toString();
            baseModel.setBtmname(btmName);
            baseModel.setCreator(userId);
            baseModel.setFirstR("1");
            baseModel.setFirstV("1");
            baseModel.setLastR("1");
            baseModel.setLastV("1");
            baseModel.setRevisionSeq(1);
            baseModel.setOwner("1");
            baseModel.setVersionSeq(1);
            baseModel.setVersionRule("0");
            baseModel.setVersionValue("1");
            baseModel.setNameOid(VciBaseUtil.getPk());
            baseModel.setLastModifier(userId);
        }catch (VciBaseException e){
            e.printStackTrace();
        }
        return (T)baseModel;
    }

    /**
     * ä¿®æ”¹æ—¶å¡«å……默认值
     * @param object ç»§æ‰¿äº†BaseModel的实体对象
     * @param <T>   è¿”回值的类型
     * @return
     * @throws VciBaseException
     */
    public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
        BaseModel baseModel = object;
        try {
            baseModel.setLastModifyTime(new Date());
            baseModel.setTs(new Date());
            //用户id
            String userId = AuthUtil.getUserId().toString();
            baseModel.setLastModifier(userId);
        }catch (VciBaseException e){
            e.printStackTrace();
        }
        return (T)baseModel;
    }

}

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

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MybatisParameterUtils.java ÐÞ¸Ä
@@ -1,8 +1,6 @@
package com.vci.ubcs.starter.util;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.vci.ubcs.starter.exception.VciBaseException;
import org.springframework.util.ObjectUtils;
@@ -16,7 +14,7 @@
 * @author ludc
 * @date 2023/5/5
 */
public class MybatisParameterUtils {
public class MybatisParameterUtil {

    public static <T, F> LambdaQueryWrapper<T> cutInParameter(LambdaQueryWrapper<T> wrapper, SFunction<T, ?> column, List<F> coll) throws VciBaseException {
        List<List<F>> newList = splitList(coll, 900);

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

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


public class RegExpConstant {
    public static final String INCLUDE_CHINESE = "[Α-ï¿¥]";
    public static final String NUMBER = "^[0-9]*$";
    public static final String INT = "/^-?[1-9]+[0-9]*$/";
    public static final String LONG = "/^-?[1-9]+[0-9]*$/";
    public static final String DOUBLE = "[0-9]*(\\.[0-9]*|[eE][+-][0-9]*)$";
    public static final String LETTER = "^[A-Za-z]+$";
    public static final String LETTER_AND_NUMBER = "^[A-Za-z0-9]+$";
    public static final String UP_LETTER = "^[A-Z]+$";
    public static final String LOW_LETTER = "^[a-z]+$";
    public static final String SPECIAL_CHARACTER = "^[` ~!@#$%^&*()_\\-+=<>?:\"{}|,.\\/;'\\[\\]·~！@#ï¿¥%……&*（）——\\-+={}|《》？：“”【】、；‘’，。、]+$";
    public static final String HAS_LETTER = ".*[a-z][A-Z]{1,}.*";
    public static final String HAS_UP_LETTER = ".*[A-Z]{1,}.*";
    public static final String HAS_LOW_LETTER = ".*[a-z]{1,}.*";
    public static final String HAS_NUMBER = ".*[0-9]{1,}.*";
    public static final String HAS_SPECIAL_CHARACTER = ".*[` ~!@#$%^&*()_\\-+=<>?:\"{}|,.\\/;'\\[\\]·~！@#ï¿¥%……&*（）——\\-+={}|《》？：“”【】、；‘’，。、]{1,}.*";

    public RegExpConstant() {
    }
}

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

@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.toolmodel.DateConverter;
import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
@@ -93,6 +94,11 @@
        }
    }

    public static Integer getCurrentUserSecret() {
        SessionInfo currentUserSession = getCurrentUserSessionInfoNotException();
        return currentUserSession != null ? getInt(currentUserSession.getUserSecret()) : UserSecretEnum.NONE.getValue();
    }

    public static float getFloat(String s) {
        float f = 0.0F;
        if (s == null) {

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

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

import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class VciQueryWrapperForDO {

    public static boolean USER_TABLE_COMPATIBILITY = false;
    public static String DATABASE_PLATFORM;
    public static Map<String, String> USER_TABLE_COMPATIBILITY_BTM_MAP;
    public static Map<String, String> USER_TABLE_COMPATIBILITY_FIELD_MAP;
    public static final String USER_TABLE_COMPATIBILITY_FIELD_SEP = "${vcicomplibitysep}";
    private Map<String, String> conditionMap;
    private Map<String, String> customerSqlMap;
    private String oidFieldName;
    private static final String SPACE = " ";
    public static final String QUERY_FIELD_SECRET = "${vciQuerySecret}";
    public static final Boolean DEFAULT_QUERY_SECRET;
    public static final Boolean DEFAULT_QUERY_DATARIGHT;
    public static final String QUERY_FIELD_DATARIGHT = "${vciQueryDataRight}";
//    private VciQueryWrapperOption queryWrapperOption;
    private Class<?> doClass;
//    private PageHelper pageHelper;
    private Map<String, String> allFieldNameMap;
    private List<String> xmlTypeFieldList;
    private boolean distinct;
    public static final Map<String, String> REVISION_MANAGE_FIELD_MAP;
    public static final Map<String, String> BASIC_FIELD_MAP;
    public static final Map<String, String> BASE_MODEL_COMPATIBILITY_MAP;
    public static final String OID_FIELD = "oid";
    public static final String ID_FIELD = "id";
    public static final String LC_STATUS_FIELD = "lcstatus";
    public static final String LC_STATUS_FIELD_TEXT = "lcStatus_text";
    public static final Map<String, String> LIFECYCLE_MANAGE_FIELD_MAP;
    public static final Map<String, String> SECRET_MANAGE_FIELD_MAP;
    public static final Map<String, String> LINK_TYPE_FIELD_MAP;
    private Map<String, VciFieldTypeEnum> allFieldTypeMap;
//    private List<VciReferFieldInfo> referFieldInfoList;
    private Map<String, String> useReferMap;
    private Map<String, String> enumFieldMap;
    private String linkTableSql;
    private String selectFieldSql;
    private String selectPrefixForPage;
    private String whereSql;
    private String orderSql;
    private String whereSubfixForPage;
    private Map<String, String> valuesMap;
    private String tableNick;
    private Map<String, String> extendFieldMap;
    private static final String DATETIME_FORMAT = "yyyy-mm-dd hh24:mi:ss";
    private static final String DATE_FORMAT = "yyyy-mm-dd";


    static {
//        DATABASE_PLATFORM = DataBaseEnum.ORACLE.getValue();
        USER_TABLE_COMPATIBILITY_BTM_MAP = new HashMap();
        USER_TABLE_COMPATIBILITY_FIELD_MAP = new HashMap();
        DEFAULT_QUERY_SECRET = true;
        DEFAULT_QUERY_DATARIGHT = false;
        REVISION_MANAGE_FIELD_MAP = new HashMap() {
            {
                this.put("nameoid", "对象主键");
                this.put("revisionoid", "版本主键");
                this.put("lastr", "是否最新版本");
                this.put("firstr", "是否最老版本");
                this.put("lastv", "是否最新版次");
                this.put("firstv", "是否最老版次");
                this.put("revisionrule", "版本规则");
                this.put("revisionseq", "版本排序号");
                this.put("revisionvalue", "版本值");
                this.put("versionrule", "版次规则");
                this.put("versionseq", "版次排序号");
                this.put("versionvalue", "版次值");
                this.put("checkinby", "签入人");
                this.put("checkintime", "签入时间");
                this.put("checkoutby", "签出人");
                this.put("checkouttime", "签出时间");
                this.put("copyfromversion", "拷贝版本来源");
            }
        };
        BASIC_FIELD_MAP = new HashMap() {
            {
                this.put("oid", "主键");
                this.put("btmname", "业务类型的名称");
                this.put("id", "编号");
                this.put("name", "名称");
                this.put("description", "描述");
                this.put("creator", "创建人");
                this.put("createtime", "创建时间");
                this.put("lastmodifier", "最后时间人");
                this.put("lastmodifytime", "最后修改时间");
                this.put("ts", "时间戳");
                this.put("owner", "拥有者");
            }
        };
        BASE_MODEL_COMPATIBILITY_MAP = new HashMap() {
            {
                this.put("lastr", "islastr");
                this.put("firstr", "isfirstr");
                this.put("lastv", "islastv");
                this.put("firstv", "isfirstv");
            }
        };
        LIFECYCLE_MANAGE_FIELD_MAP = new HashMap() {
            {
                this.put("lcstatus", "生命周期值");
            }
        };
        SECRET_MANAGE_FIELD_MAP = new HashMap() {
            {
                this.put("secretgrade", "密级值");
            }
        };
        LINK_TYPE_FIELD_MAP = new HashMap() {
            {
                this.put("oid", "主键");
                this.put("creator", "创建人");
                this.put("createtime", "创建时间");
                this.put("lastmodifier", "最后时间人");
                this.put("lastmodifytime", "最后修改时间");
                this.put("f_oid", "from端主键");
                this.put("f_revisionoid", "from端版本主键");
                this.put("f_nameoid", "from端对象主键");
                this.put("f_btmname", "from端业务类型");
                this.put("t_oid", "to端主键");
                this.put("t_revisionoid", "to端版本主键");
                this.put("t_nameoid", "to端对象主键");
                this.put("t_btmname", "to端业务类型");
                this.put("ts", "时间戳");
            }
        };
    }
}

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

@@ -119,6 +119,7 @@

    /**
     * ä¸»é¢˜åº“定义表 æ–°å¢ž
     * @param
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
@@ -310,6 +311,16 @@
    public DataGrid<CodeOsattributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject){
        return codeClassifyService.listClassifyLinkAttr(baseQueryObject);
    }
    /**
     * ä¸»é”®èŽ·å–主题库分类
     * @param oid ä¸»é”®
     * @return ä¸»é¢˜åº“分类显示对象
     */
    @GetMapping("/getObjectByOid")
    public R<CodeClassifyVO> getObjectByOid(String oid){
        CodeClassifyVO codeClassifyVO = codeClassifyService.getObjectByOid(oid);
        return R.data(codeClassifyVO);
    }

    /**
     * ä½¿ç”¨ç¼–号的路径获取对象

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

@@ -165,4 +165,5 @@
            return R.data(codeClassifyProcessTempVOS.get(0));
        }
    }

}

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

@@ -19,8 +19,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
import com.vci.ubcs.code.service.ICodePhaseattrService;
import com.vci.ubcs.code.vo.CodePhaseattrVO;
import com.vci.ubcs.code.wrapper.CodePhaseattrWrapper;
@@ -45,13 +45,13 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("ubcs-code/CodePhaseattr")
@RequestMapping("/CodePhaseattr")
@Api(value = "编码库定义-模板阶段-属性", tags = "编码库定义-模板阶段-属性接口")
public class CodePhaseattrController extends BladeController {

    private final ICodePhaseattrService CodePhaseattrService;

    private CodePhaseAttrMapper codePhaseAttrMapper;
    private CodePhaseattrMapper codePhaseAttrMapper;

    /**
     * ç¼–码库定义-模板阶段-属性 è¯¦æƒ…
@@ -59,8 +59,8 @@
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入CodePhaseattr")
    public R<CodePhaseattrVO> detail(CodePhaseAttr CodePhaseattr) {
        CodePhaseAttr detail = CodePhaseattrService.getOne(Condition.getQueryWrapper(CodePhaseattr));
    public R<CodePhaseattrVO> detail(CodePhaseattrEntity codePhaseattr) {
        CodePhaseattrEntity detail = CodePhaseattrService.getOne(Condition.getQueryWrapper(codePhaseattr));
        return R.data(CodePhaseattrWrapper.build().entityVO(detail));
    }
    /**
@@ -69,8 +69,8 @@
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入CodePhaseattr")
    public R<IPage<CodePhaseattrVO>> list(CodePhaseAttr CodePhaseattr, Query query) {
        IPage<CodePhaseAttr> pages = CodePhaseattrService.page(Condition.getPage(query), Condition.getQueryWrapper(CodePhaseattr));
    public R<IPage<CodePhaseattrVO>> list(CodePhaseattrEntity codePhaseattr, Query query) {
        IPage<CodePhaseattrEntity> pages = CodePhaseattrService.page(Condition.getPage(query), Condition.getQueryWrapper(codePhaseattr));
        return R.data(CodePhaseattrWrapper.build().pageVO(pages));
    }

@@ -91,8 +91,8 @@
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入CodePhaseattr")
    public R save(@Valid @RequestBody CodePhaseAttr CodePhaseattr) {
        return R.status(CodePhaseattrService.save(CodePhaseattr));
    public R save(@Valid @RequestBody CodePhaseattrEntity codePhaseattr) {
        return R.status(CodePhaseattrService.save(codePhaseattr));
    }

    /**
@@ -101,8 +101,8 @@
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入CodePhaseattr")
    public R update(@Valid @RequestBody CodePhaseAttr CodePhaseattr) {
        return R.status(CodePhaseattrService.updateById(CodePhaseattr));
    public R update(@Valid @RequestBody CodePhaseattrEntity codePhaseattr) {
        return R.status(CodePhaseattrService.updateById(codePhaseattr));
    }

    /**
@@ -111,8 +111,8 @@
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入CodePhaseattr")
    public R submit(@Valid @RequestBody CodePhaseAttr CodePhaseattr) {
        return R.status(CodePhaseattrService.saveOrUpdate(CodePhaseattr));
    public R submit(@Valid @RequestBody CodePhaseattrEntity codePhaseattr) {
        return R.status(CodePhaseattrService.saveOrUpdate(codePhaseattr));
    }

    /**

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

@@ -16,32 +16,21 @@
 */
package com.vci.ubcs.code.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
import com.vci.ubcs.code.service.ICodeTempphaseService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.code.wrapper.CodeTempphaseWrapper;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Collection;
import java.util.Map;

/**
 * ç¼–码库定义-模板阶段 æŽ§åˆ¶å™¨
@@ -67,7 +56,7 @@
     * @return æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡åˆ—表
     */
    @GetMapping("/gridCodeTemplatePhase")
    public DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(CodeTemplatePhaseVO codeTemplatePhaseVO,Query query){
    public DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query){
        return codeTemplatePhaseService.gridCodeTemplatePhase(codeTemplatePhaseVO,query);
    }

@@ -77,7 +66,7 @@
     * @return æ‰§è¡Œç»“果，success为true表示成功，msg是失败的提示信息，obj是添加完成后的显示对象
     */
    @PostMapping( "/addSave")
    public R<CodeTemplatePhaseVO> addSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
    public R<CodeTemplatePhaseEntityVO> addSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
        return R.data(codeTemplatePhaseService.addSave(codeTemplatePhaseDTO));
    }

@@ -87,8 +76,8 @@
     * @return æ‰§è¡Œç»“果，success为true表示成功，msg是失败的提示信息，obj是添加完成后的显示对象
     */
    @PutMapping("/editSave")
    public R<CodeTemplatePhaseVO> editSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
        CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.editSave(codeTemplatePhaseDTO);
    public R<CodeTemplatePhaseEntityVO> editSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
        CodeTemplatePhaseEntityVO codeTemplatePhaseVO = codeTemplatePhaseService.editSave(codeTemplatePhaseDTO);
        return R.data(codeTemplatePhaseVO);
    }

@@ -108,8 +97,8 @@
     * @return æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/getObjectByOid")
    public R<CodeTemplatePhaseVO> getObjectByOid(String oid){
        CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.getObjectByOid(oid);
    public R<CodeTemplatePhaseEntityVO> getObjectByOid(String oid){
        CodeTemplatePhaseEntityVO codeTemplatePhaseVO = codeTemplatePhaseService.getObjectByOid(oid);
        return R.data(codeTemplatePhaseVO);
    }

@@ -119,8 +108,8 @@
     * @return æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/listDataByOids")
    public R<Collection<CodeTemplatePhaseVO>> listCodeTemplatePhaseByOids(String oids){
        Collection<CodeTemplatePhaseVO> voCollection =  codeTemplatePhaseService.listCodeTemplatePhaseByOids(VciBaseUtil.str2List(oids));
    public R<Collection<CodeTemplatePhaseEntityVO>> listCodeTemplatePhaseByOids(String oids){
        Collection<CodeTemplatePhaseEntityVO> voCollection =  codeTemplatePhaseService.listCodeTemplatePhaseByOids(VciBaseUtil.str2List(oids));
        return R.data(voCollection);
    }

@@ -130,7 +119,7 @@
     * @return æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡åˆ—表，生效的内容
     */
    @GetMapping("/refDataGrid")
    public DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(BaseQueryObject baseQueryObject){
    public DataGrid<CodeTemplatePhaseEntityVO> refDataGridCodeTemplatePhase(BaseQueryObject baseQueryObject){
        if(baseQueryObject == null){
            baseQueryObject = new BaseQueryObject();
        }

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,126 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.vci.ubcs.code.wrapper.CodeWupinWrapper;
import com.vci.ubcs.code.service.ICodeWupinService;
import org.springblade.core.boot.ctrl.BladeController;

/**
 * ç¼–码信息 æŽ§åˆ¶å™¨
 *
 * @author yuxc
 * @since 2023-05-05
 */
@RestController
@AllArgsConstructor
@RequestMapping("ubcs-code/codeWupin")
@Api(value = "编码信息", tags = "编码信息接口")
public class CodeWupinController extends BladeController {

    private final ICodeWupinService codeWupinService;

    /**
     * ç¼–码信息 è¯¦æƒ…
     */
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入codeWupin")
    public R<CodeWupinVO> detail(CodeWupinEntity codeWupin) {
        CodeWupinEntity detail = codeWupinService.getOne(Condition.getQueryWrapper(codeWupin));
        return R.data(CodeWupinWrapper.build().entityVO(detail));
    }
    /**
     * ç¼–码信息 åˆ†é¡µ
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入codeWupin")
    public R<IPage<CodeWupinVO>> list(CodeWupinEntity codeWupin, Query query) {
        IPage<CodeWupinEntity> pages = codeWupinService.page(Condition.getPage(query), Condition.getQueryWrapper(codeWupin));
        return R.data(CodeWupinWrapper.build().pageVO(pages));
    }

    /**
     * ç¼–码信息 è‡ªå®šä¹‰åˆ†é¡µ
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入codeWupin")
    public R<IPage<CodeWupinVO>> page(CodeWupinVO codeWupin, Query query) {
        IPage<CodeWupinVO> pages = codeWupinService.selectCodeWupinPage(Condition.getPage(query), codeWupin);
        return R.data(pages);
    }

    /**
     * ç¼–码信息 æ–°å¢ž
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入codeWupin")
    public R save(@Valid @RequestBody CodeWupinEntity codeWupin) {
        return R.status(codeWupinService.save(codeWupin));
    }

    /**
     * ç¼–码信息 ä¿®æ”¹
     */
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入codeWupin")
    public R update(@Valid @RequestBody CodeWupinEntity codeWupin) {
        return R.status(codeWupinService.updateById(codeWupin));
    }

    /**
     * ç¼–码信息 æ–°å¢žæˆ–修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入codeWupin")
    public R submit(@Valid @RequestBody CodeWupinEntity codeWupin) {
        return R.status(codeWupinService.saveOrUpdate(codeWupin));
    }

    /**
     * ç¼–码信息 åˆ é™¤
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(codeWupinService.removeBatchByIds(Func.toLongList(ids)));
    }


}

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

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


import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.StringUtils;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
import com.vci.ubcs.code.service.MdmEngineService;
import com.vci.ubcs.code.service.MdmIOService;
import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO;
import com.vci.ubcs.starter.annotation.VciBusinessLog;
import com.vci.ubcs.starter.util.LocalFileUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;

@RestController
//@AllArgsConstructor
@RequestMapping("/mdmEngineController")
@Api(value = "编码数据管理", tags = "编码数据管理")
public class MdmEngineController {

//    /**
//     * æ—¥å¿—
//     */
    private Logger logger = LoggerFactory.getLogger(getClass());
    /**
     * ä¸»æ•°æ®å¼•æ“ŽæœåŠ¡
     */
    @Autowired
    private MdmEngineService engineService;
    /**
     * ä¸»æ•°æ®å¯¼å…¥å¯¼å‡ºæœåŠ¡
     */
    @Autowired
    private MdmIOService mdmIOService;

    /**
     * ä¸‹è½½æ‰¹é‡ç”³è¯·çš„导入模板
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @param response å“åº”对象
     * @throws IOException æŠ›å‡ºå¼‚常
     */
    @GetMapping("/downloadImportExcel")
    @VciBusinessLog(operateName = "下载批量申请编码的导入模板")
    public void downloadImportExcel(String codeClassifyOid, HttpServletResponse response) throws IOException{
        String excelName = mdmIOService.createImportExcel(codeClassifyOid,false);
        try {
            ControllerUtil.writeFileToResponse(response,excelName);
        } catch (Throwable e) {
            //如果出错,把错误信息写到text
            String msg = LangBaseUtil.getErrorMsg(e);
            if(StringUtils.isBlank(msg)){
                msg = "未知错误";
            }
            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
        }
    }


    /**
     * æ‰¹é‡ç”³è¯·ç¼–码的信息
     * @param secDTOList ç”³è¯·ç¼–码的信息，必须包含码段和分类主键的信息
     * @param file æ–‡ä»¶çš„内容
     */
    @VciBusinessLog(operateName = "批量申请编码的信息")
    @PostMapping("/batchImportCode")
    public R batchImportCode(String secDTOList, String codeClassifyOid, MultipartFile file, HttpServletResponse response) throws Throwable {
        CodeOrderDTO orderDTO = new CodeOrderDTO();
        orderDTO.setCodeClassifyOid(codeClassifyOid);
        if(StringUtils.isNotBlank(secDTOList)){
            List<CodeOrderSecDTO> secDTOS = JSONObject.parseArray(secDTOList, CodeOrderSecDTO.class);
            orderDTO.setSecDTOList(secDTOS);
        }
        String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
        File file1 = new File(excelFileName);
        try {
            file.transferTo(new File(excelFileName));
            CodeImProtRusultVO codeImProtRusultVO = mdmIOService.batchImportCode(orderDTO,file1);
            if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())||StringUtils.isNotBlank(codeImProtRusultVO.getRedisUuid())){
                //放到map里
                R result = R.fail("导入失败");
                if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())) {
                    String filedUUid = ControllerUtil.putErrorFile(codeImProtRusultVO.getFilePath());
                    codeImProtRusultVO.setFileOid(filedUUid);
                }
                result.setData(codeImProtRusultVO);
                return result;
            }else {
                return R.success("操作成功！");
            }
        }catch (Throwable e) {
            logger.error("导入错误",e);
            String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "错误.txt";
            LocalFileUtil.writeContentToFile( LangBaseUtil.getErrorMsg(e),errorFile);
            String uuid=ControllerUtil.putErrorFile(errorFile);
            CodeImProtRusultVO codeImProtRusultVO =new CodeImProtRusultVO();
            codeImProtRusultVO.setRedisUuid("");
            codeImProtRusultVO.setFileOid(uuid);
            codeImProtRusultVO.setFilePath(errorFile);
            R result = R.fail("导入失败");
            result.setData(codeImProtRusultVO);
//            result.setObj(codeImProtRusultVO);
            return result;
        }finally {
            file1.delete();
        }
    }


    /**
     * ä¿®æ”¹çŠ¶æ€
     * @param baseModelDTO æ•°æ®ä¼ è¾“对象
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("changeStatus")
    public R changeStatus(BaseModelDTO baseModelDTO) {
        engineService.changeStatus(baseModelDTO);
        return R.success("操作成功！");
    }


    /**
     * ç”³è¯·ç¼–码保存
     * @param orderDTO ç¼–码申请相关的信息，需要有属性和码段相关的信息
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/addSaveCode")
    @VciBusinessLog(operateName = "申请单个编码")
    public R addSaveCode(@RequestBody CodeOrderDTO orderDTO){
        return R.success(engineService.addSaveCode(orderDTO));
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,141 @@
package com.vci.ubcs.code.enumpack;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
import com.vci.ubcs.starter.web.enumpck.BaseEnum;

/**
 * ä¸»é¢˜åº“数据的默认生命周期
 * @author weidy
 * @date 2022-3-2
 */
public enum CodeDefaultLC implements BaseEnum {

    /**
     * ç¼–辑中
     */
    EDITING(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,"编辑中"),

    /**
     * å®¡æ‰¹ä¸­
     */
    AUDITING(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,"审批中"),

    /**
     * å·²å‘布
     */
    RELEASED(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,"已发布"),

    /**
     * ç å€¼å›žæ”¶
     */
    TASK_BACK(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,"码值回收"),
    /**
     * åœç”¨
     */
    DISABLE(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,"停用");


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

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

    /**
     * èŽ·å–枚举值
     *
     * @return æžšä¸¾å€¼
     */
    @Override
    public String getValue() {
        return value;
    }

    /**
     * è®¾ç½®æžšä¸¾å€¼
     *
     * @param value æžšä¸¾å€¼
     */
    public void setValue(String value) {
        this.value = value;
    }

    /**
     * èŽ·å–枚举显示文本
     *
     * @return æ˜¾ç¤ºæ–‡æœ¬
     */
    @Override
    public String getText() {
        return text;
    }

    /**
     * è®¾ç½®æ˜¾ç¤ºæ–‡æœ¬
     *
     * @param text æ˜¾ç¤ºæ–‡æœ¬
     */
    public void setText(String text) {
        this.text = text;
    }

    /**
     * æž„造函数
     *
     * @param value å€¼
     * @param text  æ˜¾ç¤ºæ–‡æœ¬
     */
    private CodeDefaultLC(String value, String text) {
        this.value = value;
        this.text = text;
    }

    /**
     * æ ¹æ®åç§°èŽ·å–对应的枚举值
     *
     * @param text åç§°
     * @return æžšä¸¾å€¼
     */
    public static String getValueByText(String text) {
        for (CodeDefaultLC wenum : CodeDefaultLC.values()) {
            if (wenum.getText().equalsIgnoreCase(text)) {
                return wenum.getValue();
            }
        }
        return "";
    }

    /**
     * æ ¹æ®æžšä¸¾å€¼èŽ·å–名称
     *
     * @param value æžšä¸¾å€¼
     * @return åç§°
     */
    public static String getTextByValue(String value) {
        for (CodeDefaultLC wenum : CodeDefaultLC.values()) {
            if (wenum.getValue().equalsIgnoreCase(value)) {
                return wenum.getText();
            }
        }
        return "";
    }

    /**
     * æ ¹æ®æžšä¸¾å€¼èŽ·å–枚举对象
     *
     * @param value æžšä¸¾å€¼
     * @return æžšä¸¾å¯¹è±¡ï¼Œä¸å­˜åœ¨æ—¶å€™è¿”回null
     */
    public static CodeDefaultLC forValue(String value) {
        for (CodeDefaultLC wenum : CodeDefaultLC.values()) {
            if (wenum.getValue().equalsIgnoreCase(value)) {
                return wenum;
            }
        }
        return null;
    }
}


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

@@ -18,13 +18,12 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.vci.ubcs.code.service.ICodePhaseattrService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -40,15 +39,15 @@
@AllArgsConstructor
public class CodePhaseattrClient implements ICodePhaseattrClient {

    private final CodePhaseAttrMapper codePhaseAttrMapper;
    private final CodePhaseattrMapper codePhaseAttrMapper;

    @Override
    @GetMapping(TOP)
    public BladePage<CodePhaseAttr> top(Integer current, Integer size) {
    public BladePage<CodePhaseattrEntity> top(Integer current, Integer size) {
        Query query = new Query();
        query.setCurrent(current);
        query.setSize(size);
        IPage<CodePhaseAttr> page = codePhaseAttrMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
        IPage<CodePhaseattrEntity> page = codePhaseAttrMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
        return BladePage.of(page);
    }


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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.entity.CodeTempphaseEntity;
import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
@@ -43,11 +43,11 @@

    @Override
    @GetMapping(TOP)
    public BladePage<CodeTemplatePhase> top(Integer current, Integer size) {
    public BladePage<CodeTempphaseEntity> top(Integer current, Integer size) {
        Query query = new Query();
        query.setCurrent(current);
        query.setSize(size);
        IPage<CodeTemplatePhase> page = codeTempphaseMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
        IPage<CodeTempphaseEntity> page = codeTempphaseMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());

        return BladePage.of(page);
    }

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.feign;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.mapper.CodeWupinMapper;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.service.ICodeWupinService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;

/**
 * ç¼–码信息 Feign实现类
 *
 * @author yuxc
 * @since 2023-05-05
 */
@ApiIgnore()
@RestController
@AllArgsConstructor
public class CodeWupinClient implements ICodeWupinClient {

    private final CodeWupinMapper codeWupinMapper;

    @Override
    @GetMapping(TOP)
    public BladePage<CodeWupinEntity> top(Integer current, Integer size) {
        Query query = new Query();
        query.setCurrent(current);
        query.setSize(size);
        IPage<CodeWupinEntity> page = codeWupinMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());//service.page(Condition.getPage(query));
        return BladePage.of(page);
    }

}

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

@@ -16,8 +16,7 @@
 */
package com.vci.ubcs.code.feign;

import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import org.springblade.core.mp.support.BladePage;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +44,6 @@
     * @return BladePage
     */
    @GetMapping(TOP)
    BladePage<CodePhaseAttr> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
    BladePage<CodePhaseattrEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);

}

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

@@ -16,7 +16,7 @@
 */
package com.vci.ubcs.code.feign;

import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.entity.CodeTempphaseEntity;
import org.springblade.core.mp.support.BladePage;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +44,6 @@
     * @return BladePage
     */
    @GetMapping(TOP)
    BladePage<CodeTemplatePhase> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
    BladePage<CodeTempphaseEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.feign;

import org.springblade.core.mp.support.BladePage;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * ç¼–码信息 Feign接口类
 *
 * @author yuxc
 * @since 2023-05-05
 */
@FeignClient(
    value = "ubcs-code"
)
public interface ICodeWupinClient {

    String API_PREFIX = "/wuPinClient";
    String TOP = API_PREFIX + "/top";

    /**
     * èŽ·å–编码信息列表
     *
     * @param current   é¡µå·
     * @param size      é¡µæ•°
     * @return BladePage
     */
    @GetMapping(TOP)
    BladePage<CodeWupinEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);

}

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

@@ -49,7 +49,7 @@
     * @param oid
     * @return
     */
    @MapKey("oid")
    @MapKey("OID")
    Map<String,String> selectAllLevelChildOid(@Param("oid") String oid);

    /**
@@ -78,14 +78,14 @@
    List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid);


    @MapKey("oid")
    @MapKey("OID")
    List<Map<String,Object>> selectAllLevelParentByOid(@Param("oid") String oid);

    @MapKey("oid")
    @MapKey("OID")
    List<Map<String,Object>> selectAllLevelParents(@Param("oid") String oid);


    @MapKey("oid")
    @MapKey("OID")
    List<Map<String,Object>> selectByFieldPath(@Param("fieldPath") String fieldPath);

}

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

@@ -65,11 +65,14 @@
     * @param nameoid
     * @return
     */
    @MapKey("REVISIONSEQ")
//    @MapKey("REVISIONSEQ")
    Map<String,Object> getNextRevision(@Param("nameoid") String nameoid);



    List<CodeClstemplateEntity> selectCodeClassifyTemplateDOByTree(@Param("codeclassifyoid") String codeclassifyoid,
                                                                   @Param("lcstatus") String lcstatus);
    List<Map<String,String>> selectChildHasReleaseTemplate(@Param("lcstatus") String lcstatus,
                                                              @Param("classifyoid") String classifyoid,
                                                              @Param("templatelcstatus") String templatelcstatus);
}

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

@@ -16,7 +16,7 @@
 */
package com.vci.ubcs.code.mapper;

import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import com.vci.ubcs.code.vo.CodePhaseattrVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,7 +28,7 @@
 * @author yuxc
 * @since 2023-04-20
 */
public interface CodePhaseAttrMapper extends BaseMapper<CodePhaseAttr> {
public interface CodePhaseattrMapper extends BaseMapper<CodePhaseattrEntity> {

    /**
     * è‡ªå®šä¹‰åˆ†é¡µ
@@ -39,9 +39,9 @@
     */
    List<CodePhaseattrVO> selectCodePhaseattrPage(IPage page, CodePhaseattrVO CodePhaseattr);

    List<CodePhaseAttr> selectByPhasea(String oid);
    List<CodePhaseattrEntity> selectByPhasea(String oid);

    List<CodePhaseAttr> selectByPhaseaIds(String oids);
    List<CodePhaseattrEntity> selectByPhaseaIds(String oids);

    List<CodePhaseAttr> listLinkAttrDOByTemplateAttrDOS(String id,String codeClassifyTemplateOid);
    List<CodePhaseattrEntity> listLinkAttrDOByTemplateAttrDOS(String id, String codeClassifyTemplateOid);
}

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

@@ -1,6 +1,8 @@
package com.vci.ubcs.code.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.code.entity.CodeSerialValue;
import com.vci.ubcs.code.entity.CodeSynonymEntity;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -11,7 +13,7 @@
 * @author ludc
 * @date 2022-03-01
 */
public interface CodeSerialValueMapper {
public interface CodeSerialValueMapper  extends BaseMapper<CodeSerialValue> {


    List<CodeSerialValue> selectByCodeRoleId(@Param("codeRuleOid") String codeRuleOid);

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

@@ -16,10 +16,10 @@
 */
package com.vci.ubcs.code.mapper;

import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.code.entity.CodeTempphaseEntity;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;

import java.util.List;

@@ -29,7 +29,7 @@
 * @author yuxc
 * @since 2023-04-20
 */
public interface CodeTemplatePhaseMapper extends BaseMapper<CodeTemplatePhase> {
public interface CodeTemplatePhaseMapper extends BaseMapper<CodeTempphaseEntity> {

    /**
     * è‡ªå®šä¹‰åˆ†é¡µ
@@ -38,7 +38,7 @@
     * @param CodeTempphase
     * @return
     */
    List<CodeTemplatePhaseVO> selectCodeTempphasePage(IPage page, CodeTemplatePhaseVO CodeTempphase);
    List<CodeTemplatePhaseEntityVO> selectCodeTempphasePage(IPage page, CodeTemplatePhaseEntityVO CodeTempphase);


}

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

ÎļþÃû´Ó Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java ÐÞ¸Ä
@@ -16,32 +16,28 @@
 */
package com.vci.ubcs.code.mapper;

import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.vo.CodePhaseattrVO;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;

/**
 * ç¼–码库定义-模板阶段-属性 Mapper æŽ¥å£
 * ç¼–码信息 Mapper æŽ¥å£
 *
 * @author yuxc
 * @since 2023-04-20
 * @since 2023-05-05
 */
public interface CodePhaseAttrMapper extends BaseMapper<CodePhaseAttr> {
public interface CodeWupinMapper extends BaseMapper<CodeWupinEntity> {

    /**
     * è‡ªå®šä¹‰åˆ†é¡µ
     *
     * @param page
     * @param CodePhaseattr
     * @param codeWupin
     * @return
     */
    List<CodePhaseattrVO> selectCodePhaseattrPage(IPage page, CodePhaseattrVO CodePhaseattr);
    List<CodeWupinVO> selectCodeWupinPage(IPage page, CodeWupinVO codeWupin);

    List<CodePhaseAttr> selectByPhasea(String oid);

    List<CodePhaseAttr> selectByPhaseaIds(String oids);

    List<CodePhaseAttr> listLinkAttrDOByTemplateAttrDOS(String id,String codeClassifyTemplateOid);
}

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

@@ -143,5 +143,28 @@
     */
    List<String> getOidByCodeclassifysecOid(String codeClassifySecOid);

    /**
     * ä½¿ç”¨è§„则的主键获取对应的码段内容
     * @param oid è§„则的内容
     * @return ç æ®µçš„内容
     */
    List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String oid);

    /**
     * æ‰¹é‡æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     *
     * @param codeBasicSecDOs æ•°æ®å¯¹è±¡åˆ—表
     * @param hasFixedValue æ˜¯å¦æœ‰å›ºå®šå€¼
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException å‚数为空或者不存在的时候会抛出异常
     */
    List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException;

    /**
     * æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     * @param  codeBasicSecDO æ•°æ®å¯¹è±¡
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException æ‹·è´å±žæ€§å‡ºé”™çš„时候会抛出异常
     */
    CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException;
}

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

@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.vo.CodeOsattributeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
@@ -212,4 +214,18 @@
     * @return æŸ¥è¯¢ç»“æžœ
     */
    List<CodeClassify> selectAllLevelParents(String oid);

    /**
     * ä¸»é”®èŽ·å–主题库分类
     * @param oid ä¸»é”®
     * @return ä¸»é¢˜åº“分类显示对象
     */
    CodeClassifyVO getObjectByOid(String oid) throws VciBaseException;

    /**
     * ä½¿ç”¨åˆ†ç±»ä¸»é”®èŽ·å–分类相关的所有信息
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @return åˆ†ç±»ä¸Šçº§ï¼Œä¸‹çº§çš„信息
     */
    CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid);
}

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

@@ -1,17 +1,13 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr;
import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;

import java.sql.Wrapper;
import java.util.Collection;
import java.util.List;
import java.util.Map;

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

@@ -183,4 +183,36 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    R<CodeClstemplateVO> editSave(CodeClstemplateDTO codeClassifyTemplateDTO);

    /**
     * èŽ·å–所有子分类模板
     * @param codeClassifyOid çˆ¶åˆ†ç±»çš„主键
     * @return true表示相同
     */
    List<CodeClstemplateVO> childTemplates(String codeClassifyOid);

    /**
     * ä½¿ç”¨ä¸»é¢˜åº“的分类主键，获取生效的模板
     * @param codeClassifyOid ä¸»é¢˜åº“分类主键
     * @param hasAttribute æ˜¯å¦åŒ…含属性
     * @return æ¨¡æ¿çš„信息
     */
    List<CodeClstemplateVO> listReleaseTemplateByClassifyOid(String codeClassifyOid,boolean hasAttribute);

    /**
     * ç”¨æ¨¡æ¿çš„版本来排序
     * @param templateVOList æ¨¡æ¿çš„显示对象
     * @return æŽ’序后的列表
     */
    List<CodeClstemplateVO> sortTemplateByRevision(List<CodeClstemplateVO> templateVOList);


    /**
     * ä¸»é”®èŽ·å–分类模板对象(包含属性）
     * @param templateOid ä¸»é”®
     * @return åˆ†ç±»æ¨¡æ¿å¯¹è±¡æ˜¾ç¤ºå¯¹è±¡
     */
    CodeClstemplateVO getObjectHasAttrByOid(String templateOid);


}

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

@@ -16,6 +16,7 @@
 */
package com.vci.ubcs.code.service;

import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeKeyattrrepeatEntity;
import com.vci.ubcs.code.vo.CodeKeyattrrepeatVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
@@ -62,4 +63,18 @@
     * @return æ˜¾ç¤ºå¯¹è±¡
     */
    CodeKeyAttrRepeatRuleVO codeKeyAttrRepeatRuleDO2VO(CodeKeyattrrepeatEntity codeKeyattrrepeatEntity);

    /**
     * ä½¿ç”¨åˆ†ç±»çš„全部信息来获取关键属性判断规则的内容
     * @param classifyFullInfo ä¸»é¢˜åº“分类的全部信息
     * @return è§„则的显示对象
     */
    CodeKeyattrrepeatVO getRuleByClassifyFullInfo(CodeClassifyFullInfoBO classifyFullInfo);

    /**
     * ä¸»é”®èŽ·å–关键数据查重规则
     * @param oid ä¸»é”®
     * @return å…³é”®æ•°æ®æŸ¥é‡è§„则显示对象
     */
    CodeKeyAttrRepeatRuleVO getObjectByOid(String oid);
}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import com.vci.ubcs.code.vo.CodePhaseattrVO;

/**
@@ -27,7 +27,7 @@
 * @author yuxc
 * @since 2023-04-20
 */
public interface ICodePhaseattrService extends IService<CodePhaseAttr> {
public interface ICodePhaseattrService extends IService<CodePhaseattrEntity> {

    /**
     * è‡ªå®šä¹‰åˆ†é¡µ

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

@@ -135,4 +135,11 @@
     */
    R clearAllCode(String oid);


    /**
     * ä½¿ç”¨ä¸»é”®èŽ·å–编码规则的内容
     * @param codeRuleOid ä¸»é”®
     * @return è§„则的显示对象
     */
    CodeRuleVO getObjectHasSecByOid(String codeRuleOid);
}

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

@@ -19,9 +19,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
import com.vci.ubcs.code.entity.CodeClstempattrEntity;
import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.entity.CodeTempphaseEntity;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
@@ -38,7 +38,7 @@
 * @author yuxc
 * @since 2023-04-20
 */
public interface ICodeTempphaseService extends IService<CodeTemplatePhase> {
public interface ICodeTempphaseService extends IService<CodeTempphaseEntity> {

    /**
     * æŸ¥è¯¢æ‰€æœ‰çš„模板阶段
@@ -47,7 +47,7 @@
     * @return æ‰§è¡Œç»“æžœ
     * @throws VciBaseException æŸ¥è¯¢æ¡ä»¶å’Œåˆ†é¡µå‡ºé”™çš„时候会抛出异常
     */
    DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(CodeTemplatePhaseVO codeTemplatePhaseVO, Query query) throws VciBaseException;
    DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query) throws VciBaseException;

    /**
     * æ¨¡æ¿åˆ é™¤çš„时候触发
@@ -65,19 +65,19 @@

    /**
     * æ‰¹é‡æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     * @param codeTemplatePhaseDOs æ•°æ®å¯¹è±¡åˆ—表
     * @param codeTemplatePhaseEntityDOS æ•°æ®å¯¹è±¡åˆ—表
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException å‚数为空或者不存在的时候会抛出异常
     */
    List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhase> codeTemplatePhaseDOs) throws VciBaseException;
    List<CodeTemplatePhaseEntityVO> codeTemplatePhaseDO2VOs(Collection<CodeTempphaseEntity> codeTemplatePhaseEntityDOS) throws VciBaseException;

    /**
     * æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     * @param  codeTemplatePhaseDO æ•°æ®å¯¹è±¡
     * @param  codeTemplatePhaseEntityDO æ•°æ®å¯¹è±¡
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException æ‹·è´å±žæ€§å‡ºé”™çš„时候会抛出异常
     */
    CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhase codeTemplatePhaseDO) throws VciBaseException;
    CodeTemplatePhaseEntityVO codeTemplatePhaseDO2VO(CodeTempphaseEntity codeTemplatePhaseEntityDO) throws VciBaseException;

    /**
     * å¢žåŠ æ¨¡æ¿é˜¶æ®µ
@@ -85,7 +85,7 @@
     * @return æ‰§è¡Œç»“æžœ
     * @throws VciBaseException å‚数为空，唯一项，必输项不通过时会抛出异常
     */
    CodeTemplatePhaseVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
    CodeTemplatePhaseEntityVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;

    /**
     * ä¿®æ”¹æ¨¡æ¿é˜¶æ®µ
@@ -93,7 +93,7 @@
     * @return æ‰§è¡Œç»“æžœ
     * @throws VciBaseException å‚数为空，唯一项，必输项不通过时会抛出异常
     */
    CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
    CodeTemplatePhaseEntityVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;

    /**
     * åˆ é™¤æ¨¡æ¿é˜¶æ®µ
@@ -109,7 +109,7 @@
     * @return æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException å‚数为空，数据不存在时会抛出异常
     */
    CodeTemplatePhaseVO getObjectByOid(String oid) throws VciBaseException;
    CodeTemplatePhaseEntityVO getObjectByOid(String oid) throws VciBaseException;

    /**
     * ä¸»é”®æ‰¹é‡èŽ·å–模板阶段
@@ -117,7 +117,7 @@
     * @return æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException æŸ¥è¯¢å‡ºçŽ°å¼‚常时会抛出
     */
    Collection<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException;
    Collection<CodeTemplatePhaseEntityVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException;

    /**
     * å‚照模板阶段列表
@@ -126,7 +126,7 @@
     * @return æ¨¡æ¿é˜¶æ®µæ˜¾ç¤ºå¯¹è±¡åˆ—表，生效的内容
     * @throws VciBaseException æŸ¥è¯¢æ¡ä»¶å’Œåˆ†é¡µå‡ºé”™çš„时候会抛出异常
     */
    DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
    DataGrid<CodeTemplatePhaseEntityVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;

    /**
     * é˜¶æ®µä¸åŒ…含的属性

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.vo.CodeWupinVO;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**
 * ç¼–码信息 æœåŠ¡ç±»
 *
 * @author yuxc
 * @since 2023-05-05
 */
public interface ICodeWupinService extends IService<CodeWupinEntity> {

    /**
     * è‡ªå®šä¹‰åˆ†é¡µ
     *
     * @param page
     * @param codeWupin
     * @return
     */
    IPage<CodeWupinVO> selectCodeWupinPage(IPage<CodeWupinVO> page, CodeWupinVO codeWupin);


}

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

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


import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.vo.CodeClstempattrVO;
import com.vci.ubcs.code.vo.CodeClstemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;

import java.util.List;

/**
 * ä¸»æ•°æ®å¼•æ“ŽæœåŠ¡
 * @author weidy
 * @date 2022-2-21
 */
public interface MdmEngineService extends IService<CodeAllCode> {
    /**
     * ä½¿ç”¨åˆ†ç±»çš„主键获取可以使用的模板对象
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @return æ¨¡æ¿çš„显示对象
     */
    CodeClstemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid);

    /**
     * ä½¿ç”¨åˆ†ç±»çš„主键获取可以使用的模板对象
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @param hasAttr åŒ…含属性
     * @return æ¨¡æ¿çš„显示对象
     */
    CodeClstemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid, boolean hasAttr);

    /**
     * èŽ·å–枚举的下拉选项
     * @param attrVO æ¨¡æ¿å±žæ€§çš„对象
     * @return ä¸‹æ‹‰é€‰é¡¹
     */
    List<KeyValue> listComboboxItems(CodeClstempattrVO attrVO);

    /**
     * ä¿®æ”¹çŠ¶æ€
     * @param baseModelDTO æ•°æ®ä¼ è¾“对象
     */
    void changeStatus(BaseModelDTO baseModelDTO);

    /**
     * ç”³è¯·å•ä¸€ç¼–码
     * @param orderDTO ç”³è¯·çš„信息，需要包含属性的内容和码段相关的内容
     * @return è¿”回编码的内容
     */
    String addSaveCode(CodeOrderDTO orderDTO);

    /**
     * åˆ¤æ–­ç¼–码的码段是否输入或者选择了码值
     * @param ruleVO è§„则的显示对象
     * @param orderDTO ç¼–码申请的内容
     */
    void checkSecValueOnOrder(CodeRuleVO ruleVO, CodeOrderDTO orderDTO);
}

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

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

import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO;

import java.io.File;

public interface MdmIOService {

    /**
     * ç”Ÿæˆå¯¼å…¥çš„文件
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @param isHistory æ˜¯å¦åŽ†å²æ•°æ®å¯¼å…¥
     * @return excel的文件地址
     */
    String createImportExcel(String codeClassifyOid,boolean isHistory);

    /**
     * æ‰¹é‡ç”³è¯·ç¼–码数据
     * @param orderDTO ç¼–码申请信息，必须包含分类主键和码段的信息
     * @param file excel文件的信息
     * @return æœ‰é”™è¯¯ä¿¡æ¯çš„excel
     */
    CodeImProtRusultVO batchImportCode(CodeOrderDTO orderDTO, File file);
}

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

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

import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.vo.CodeClstemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;

import java.util.List;

public interface MdmProductCodeService {
    /**
     * ç”Ÿæˆç¼–码--并且保存数据-方法加锁，因此不能返回batchCBO
     * @param classifyFullInfoBO åˆ†ç±»çš„全部信息
     * @param templateVO æ¨¡æ¿çš„显示对象
     * @param ruleVO ç¼–码规则的显示对象
     * @param secDTOList å„个码段的值
     * @param dataCBOList ä¸šåŠ¡æ•°æ®
     */
    List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClstemplateVO templateVO,
                                        CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList);

}

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

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

import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,8 +18,10 @@
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.service.ICodeClassifyValueService;
import com.vci.ubcs.code.service.ICodeFixedValueService;
import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -34,6 +37,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,6 +85,12 @@

    @Resource
    private IDictBizClient iDictBizClient;

    /**
     * å›ºå®šç æ®µçš„码值的服务
     */
    @Resource
    private ICodeFixedValueService fixedValueService;

    /**
     * ä¸Šå±‚分类码段的属性名称
@@ -672,4 +682,77 @@
        return codeBasicSecDO;
    }


    /**
     * ä½¿ç”¨è§„则的主键获取对应的码段内容
     *
     * @param ruleOid è§„则的内容
     * @return ç æ®µçš„内容
     */
    @Override
    public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid) {
        if(StringUtils.isBlank(ruleOid)){
            return new ArrayList<>();
        }
        Map<String,String> conditionMap = new HashMap<>();
        conditionMap.put("pkCodeRule",ruleOid);
//        PageHelper pageHelper = new PageHelper(-1);
//        pageHelper.addDefaultAsc("ordernum");
        QueryWrapper<CodeBasicSec> wrapper = new QueryWrapper<>();
        wrapper.orderByAsc("ordernum");
        List<CodeBasicSec> secDOList = codeBasicSecMapper.selectList(wrapper);//.selectByCondition(conditionMap, pageHelper);
        return codeBasicSecDO2VOs(secDOList,true);
    }

    /**
     * æ‰¹é‡æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     *
     * @param codeBasicSecDOs æ•°æ®å¯¹è±¡åˆ—表
     * @param hasFixedValue æ˜¯å¦æœ‰å›ºå®šå€¼
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException å‚数为空或者不存在的时候会抛出异常
     */
    @Override
    public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException {
        List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>();
        if (!CollectionUtils.isEmpty(codeBasicSecDOs)) {
            for (CodeBasicSec s : codeBasicSecDOs) {
                CodeBasicSecVO vo = codeBasicSecDO2VO(s);
                if (vo != null) {
                    voList.add(vo);
                }
            }
        }
        if(hasFixedValue && !CollectionUtils.isEmpty(voList)){
            List<CodeBasicSecVO> fixedSecVOList = voList.stream().filter(s -> CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equalsIgnoreCase(s.getSecType())).collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(fixedSecVOList)){
                //查询固定码的码值
                Map<String, List<CodeFixedValueVO>> secValueMap = fixedValueService.listCodeFixedValueBySecOids(fixedSecVOList.stream().map(CodeBasicSecVO::getOid).collect(Collectors.toList()));
                voList.stream().forEach(vo->{
                    vo.setFixedValueVOList(secValueMap.getOrDefault(vo.getOid(),null));
                });
            }
        }
        return voList;
    }

    /**
     * æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     *
     * @param codeBasicSecDO æ•°æ®å¯¹è±¡
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException æ‹·è´å±žæ€§å‡ºé”™çš„时候会抛出异常
     */
    @Override
    public CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException {
        CodeBasicSecVO vo = new CodeBasicSecVO();
        if (codeBasicSecDO != null) {
            BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, vo);
            //如果有lcstatus的类的话
            if (true) {
                //vo.setLcStatusText({lcStatusFullClassName}.getTextByValue(vo.getLcStatus()));
            }
        }
        return vo;
    }
}

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

@@ -2,29 +2,24 @@

import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
import com.vci.ubcs.code.mapper.CodeClassifyMapper;
import com.vci.ubcs.code.mapper.CodeClassifyProcessTempMapper;
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
import com.vci.ubcs.code.wrapper.CodeClassifyProcessTempWrapper;
import com.vci.ubcs.common.utils.PageDO2PageVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
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.wrapper.VciQueryWrapperForDO;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -86,7 +81,7 @@
        IPage<CodeClassifyProcessTempVO> pageList = new Page<CodeClassifyProcessTempVO>();
        //DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
        if (!CollectionUtils.isEmpty(doList.getRecords())) {
            pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
            pageList.setRecords(CodeClassifyProcessTempWrapper.build().listVO(doList.getRecords()));
            //分页参数转到pageVO对象
            pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
        }
@@ -139,8 +134,8 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public CodeClassifyProcessTempVO addSave(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException{
        VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"需要添加的数据对象",codeClassifyProcessTempDTO.getProcessVersion(),"流程模板的版本号",codeClassifyProcessTempDTO.getCodeprocessuse(),"模板流程的用途");
        if (StringUtils.isBlank(codeClassifyProcessTempDTO.getCodeprocessuse())){
        VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"需要添加的数据对象",codeClassifyProcessTempDTO.getProcessVersion(),"流程模板的版本号",codeClassifyProcessTempDTO.getCodeProcessUse(),"模板流程的用途");
        if (StringUtils.isBlank(codeClassifyProcessTempDTO.getCodeProcessUse())){
            throw new VciBaseException("模板流程用途不能为空");
        }
        Long count = countProcessTemplate(codeClassifyProcessTempDTO);
@@ -150,10 +145,11 @@
        //将DTO转换为DO
        CodeClassifyProcessTemp codeClassifyProcessTempDO = new CodeClassifyProcessTemp();
        BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
        codeClassifyProcessTempDO = DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO,"codeclsflowtemp");
        codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
        //因为业务类型本身没有控制版本，所有强制给版本revisionValue设置值，平台也会变成空。。。。
        //版本号不能使用默认的属性
        return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
        return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
    }

    /**
@@ -169,8 +165,9 @@
        //将DTO转换为DO
        CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
        revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
        codeClassifyProcessTempDO = DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
        codeClassifyProcessTempMapper.updateById(codeClassifyProcessTempDO);
        return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
        return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO);
    }

    /**
@@ -185,7 +182,7 @@
        VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"分类使用的流程模板数据对象",codeClassifyProcessTempDTO.getOid(),"分类使用的流程模板的主键");
        CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
        R baseResult = checkIsCanDeleteForDO(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
        if(!baseResult.isSuccess()) {
        if(baseResult.isSuccess()) {
        }else{
            return baseResult;
        }
@@ -202,7 +199,7 @@
     */
    @Override
    public  CodeClassifyProcessTempVO getObjectByOid(String oid) throws VciBaseException{
        return codeClassifyProcessTempDO2VO(selectByOid(oid));
        return CodeClassifyProcessTempWrapper.build().entityVO((selectByOid(oid)));
    }

    /**
@@ -215,7 +212,7 @@
    public Collection<CodeClassifyProcessTempVO> listCodeClassifyProcessTempByOids(Collection<String> oidCollections) throws VciBaseException{
        VciBaseUtil.alertNotNull(oidCollections,"数据对象主键集合");
        List<CodeClassifyProcessTemp> codeClassifyProcessTempDOList = listCodeClassifyProcessTempDOByOidCollections(oidCollections);
        return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempDOList);
        return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempDOList);
    }

    /**
@@ -252,7 +249,7 @@
        LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
            .lambda().eq(CodeClassifyProcessTemp::getClassifyTemplateOid, codeTemplateOid)
            .eq(CodeClassifyProcessTemp::getCodeProcessUse, processUse);
        return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempMapper.selectList(wrapper));
        return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempMapper.selectList(wrapper));
    }

    /**
@@ -263,7 +260,7 @@
    @Override
    public List<CodeClassifyProcessTempVO> selectByWrapper(LambdaQueryWrapper<CodeClassifyProcessTemp> queryWrapper) {
        List<CodeClassifyProcessTemp> codeClassifyProcessTempDOList= codeClassifyProcessTempMapper.selectList(queryWrapper);
        return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempDOList);
        return CodeClassifyProcessTempWrapper.build().listVO(codeClassifyProcessTempDOList);
    }

    /**
@@ -295,7 +292,7 @@
    private R checkIsCanDeleteForDO(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO, CodeClassifyProcessTemp codeClassifyProcessTempDO) {
        CodeClassifyProcessTemp tempDO = new CodeClassifyProcessTemp();
        BeanUtil.convert(codeClassifyProcessTempDTO,tempDO);
        if (!checkTs(tempDO)) {
        if (!checkTs(tempDO,codeClassifyProcessTempDO)) {
            return R.fail(TS_NOT_PROCESS);
        }
        if(!checkIsLinked(codeClassifyProcessTempDO.getOid())) {
@@ -310,12 +307,11 @@
     * @param tempDO
     * @return
     */
    private boolean checkTs(CodeClassifyProcessTemp tempDO){
        LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
            .lambda().eq(CodeClassifyProcessTemp::getOid,tempDO.getOid()).select(CodeClassifyProcessTemp::getTs);
        long dbTs = codeClassifyProcessTempMapper.selectById(wrapper).getTs().getTime();
        long currentTs = tempDO.getTs().getTime();
        if(dbTs == currentTs){
    private boolean checkTs(CodeClassifyProcessTemp tempDO, CodeClassifyProcessTemp codeClassifyProcessTempDO){
        Date dbTs = codeClassifyProcessTempDO.getTs();
        Date currentTs = tempDO.getTs();
        int i = currentTs.compareTo(dbTs);
        if(i==0){
            return true;
        }
        return false;
@@ -357,7 +353,7 @@
            throw new VciBaseException("模板流程名称不能为空");
        }
        LambdaQueryWrapper<CodeClassifyProcessTemp> wrapper = Wrappers.<CodeClassifyProcessTemp>query()
            .lambda().eq(CodeClassifyProcessTemp::getCodeProcessUse, codeClassifyProcessTempDTO.getCodeprocessuse())
            .lambda().eq(CodeClassifyProcessTemp::getCodeProcessUse, codeClassifyProcessTempDTO.getCodeProcessUse())
            .eq(CodeClassifyProcessTemp::getClassifyTemplateOid, codeClassifyProcessTempDTO.getClassifyTemplateOid())
            .eq(CodeClassifyProcessTemp::getId, codeClassifyProcessTempDTO.getId());
        Long count = codeClassifyProcessTempMapper.selectCount(wrapper);

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.entity.CodeClstemplateEntity;
import com.vci.ubcs.code.entity.CodeOsbtmtypeEntity;
@@ -74,6 +75,8 @@
    private CodeOsbtmtypeMapper codeOsbtmtypeMapper;
    @Resource
    CodeOsbtmtypeattributeMapper codeOsbtmtypeattributeMapper;
    @Resource
    ICodeRuleService ICodeRuleService;

    /**
     * æ—¥å¿—
@@ -251,7 +254,7 @@
        if(StringUtils.isBlank(oid)){
            throw new ServiceException("oid不能为空！");
        }
        return codeClassifyMapper.checkHasChild(oid.trim());
        return !codeClassifyMapper.checkHasChild(oid.trim());
    }


@@ -297,7 +300,8 @@
                    //2、查询要删除的子类数据
                    List<CodeClassify>  codeClassifyDOList = codeClassifyMapper.selectBatchIds(s);
                    deletes.addAll(codeClassifyDOList);
                    codeClassifyMapper.deleteBatchIds(s);
//                    codeClassifyMapper.deleteBatchIds(s);
                    baseMapper.deleteBatchIds(s);
                }

            }
@@ -951,6 +955,17 @@
    }

    /**
     * ä¸»é”®èŽ·å–主题库分类
     * @param oid ä¸»é”®
     * @return ä¸»é¢˜åº“分类显示对象
     * @throws VciBaseException å‚数为空，数据不存在时会抛出异常
     */
    @Override
    public  CodeClassifyVO getObjectByOid(String oid) throws VciBaseException{
        return codeClassifyDO2VO(selectByOid(oid));
    }

    /**
     * ä½¿ç”¨ç¼–号的路径获取对象
     *
     * @param idPath ç¼–号的路径，一定要从最顶层节点开始，格式为xxx/yyy/zz è¿™æ ·
@@ -1021,4 +1036,32 @@
        }
        return oidList;
    }

    /**
     * ä½¿ç”¨åˆ†ç±»ä¸»é”®èŽ·å–分类相关的所有信息
     *
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @return åˆ†ç±»ä¸Šçº§ï¼Œä¸‹çº§çš„信息
     */
    @Override
    public CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid) {
        VciBaseUtil.alertNotNull(codeClassifyOid,"分类的主键");
        CodeClassifyFullInfoBO fullInfo = new CodeClassifyFullInfoBO();
        CodeClassify classifyDO = selectByOid(codeClassifyOid);
        //查询上级
        fullInfo.setCurrentClassifyVO(codeClassifyDO2VO(classifyDO));
        List<Map<String, Object>> maps = codeClassifyMapper.selectAllLevelParentByOid(codeClassifyOid);
        List<CodeClassify> codeClassifyList = new ArrayList<>();
        for (Map<String, Object> map : maps) {
            CodeClassify codeClassify = new CodeClassify();
            codeClassify.setOid(String.valueOf(map.get("OID")));
            codeClassify.setOid(String.valueOf(map.get("LEVEL")));
            codeClassifyList.add(codeClassify);
        }
        fullInfo.setParentClassifyVOs(codeClassifyDO2VOs(codeClassifyList));
        if(!CollectionUtils.isEmpty(fullInfo.getParentClassifyVOs())){
            fullInfo.setTopClassifyVO(fullInfo.getParentClassifyVOs().stream().filter(s->StringUtils.isBlank(s.getParentcodeclassifyoid())).findFirst().orElseGet(()->null));
        }
        return fullInfo;
    }
}

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

@@ -1,17 +1,11 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr;
import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.mapper.CodeClassifyTemplateButtonMapper;
import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
import com.vci.ubcs.code.service.ICodeTempphaseService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
@@ -21,12 +15,10 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.sql.Wrapper;
import java.util.*;

/**

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

@@ -17,8 +17,10 @@
package com.vci.ubcs.code.service.impl;

import com.alibaba.nacos.api.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
import com.vci.ubcs.code.dto.CodeClstemplateDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.CodeClassifyTemplateLC;
@@ -91,7 +93,9 @@
    @Autowired(required = false)
    private CodeClassifyTemplateButtonMapper codeTempbuttonMapper;
    @Autowired(required = false)
    private CodePhaseAttrMapper codePhaseattrMapper;
    private CodePhaseattrMapper codePhaseattrMapper;
    @Autowired(required = false)
    private CodeClassifyMapper codeClassifyMapper;
    @Autowired(required = false)
    private ICodeClassifyService codeClassifyService;
    @Autowired(required = false)
@@ -548,15 +552,15 @@
        //复制模板阶段，阶段属性
        Map phase_attrMap = copyTemplatePhase_attr(templateOldOid,templateNewOid);

        List<CodeTemplatePhase> codeClassifyPhaseDOList = (ArrayList<CodeTemplatePhase>)phase_attrMap.get("phase");//模板阶段
        List<CodePhaseAttr> codePhaseAttrDOList = (ArrayList<CodePhaseAttr>)phase_attrMap.get("phaseAttr");//阶段属性
        List<CodeTempphaseEntity> codeClassifyPhaseDOList = (ArrayList<CodeTempphaseEntity>)phase_attrMap.get("phase");//模板阶段
        List<CodePhaseattrEntity> codePhaseAttrDOList = (ArrayList<CodePhaseattrEntity>)phase_attrMap.get("phaseAttr");//阶段属性

        //复制模板按钮
        List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);

        //一起保存数据
//        WebUtil.setPersistence(false);//不执行保存
        //保存模板
        //保存模板——
//        BatchCBO batchCBOTemplate = new BatchCBO();
        //batchCBO保存的时候没有能够自动update源数据的isLastR
        //batchCBOTemplate.getCreateCbos().add(clientBusinessObject_template_insert);
@@ -651,8 +655,8 @@
        //复制模板阶段，阶段属性
        Map  phase_attrMap = copyTemplatePhase_attr(oldOid,newOid);

        List<CodeTemplatePhase> codeClassifyPhaseDOList = (ArrayList<CodeTemplatePhase>)phase_attrMap.get("phase");//模板阶段
        List<CodePhaseAttr> codePhaseAttrDOList = (ArrayList<CodePhaseAttr>)phase_attrMap.get("phaseAttr");//阶段属性
        List<CodeTempphaseEntity> codeClassifyPhaseDOList = (ArrayList<CodeTempphaseEntity>)phase_attrMap.get("phase");//模板阶段
        List<CodePhaseattrEntity> codePhaseAttrDOList = (ArrayList<CodePhaseattrEntity>)phase_attrMap.get("phaseAttr");//阶段属性

        //复制模板按钮
        List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(oldOid,newOid);
@@ -754,11 +758,11 @@
//        phaseWrapper.addQueryMap("codeClassifyTemplateOid",templateOldOid);
        Map<String,Object> condition = new HashMap<>(1);
        condition.put("codeclassifyTemplateOid",templateOldOid);
        List<CodeTemplatePhase> codeTempphaseEntities = codeTempphaseMapper.selectByMap(condition);
        List<CodeTempphaseEntity> codeTempphaseEntities = codeTempphaseMapper.selectByMap(condition);
//        List<CodeTemplatePhaseDO>  codeClassifyPhaseDOList = codeTemplatePhaseDaoI.selectByWrapper(phaseWrapper);//要保存的新的模板流程
        Map<String,String> phaseKeyMap = new HashMap<String,String>();//需要复制的模板阶段属性,key:value,模板阶段老oid:模板属性新oid
        List<String> phaseOidList = new ArrayList<String>();
        for (CodeTemplatePhase codeTemplatePhaseDO:codeTempphaseEntities){
        for (CodeTempphaseEntity codeTemplatePhaseDO:codeTempphaseEntities){
            String oldoid = codeTemplatePhaseDO.getOid();
            String newOid = VciBaseUtil.getPk();
            codeTemplatePhaseDO.setOid(newOid);
@@ -768,7 +772,7 @@
        }

        //模板阶段的属性
        List<CodePhaseAttr> codePhaseAttrDOList = new ArrayList<CodePhaseAttr>();
        List<CodePhaseattrEntity> codePhaseAttrDOList = new ArrayList<CodePhaseattrEntity>();

        if(!CollectionUtils.isEmpty(phaseOidList)){//size()==0下边方法会报错
//            Map<String,String> conditionMap =  new HashMap<>();
@@ -776,7 +780,7 @@
//            codePhaseAttrDOList = codePhaseAttrDaoI.selectByCondition(conditionMap,new PageHelper(-1));
            codePhaseAttrDOList = codePhaseattrMapper.selectByPhaseaIds(VciBaseUtil.toInSql(phaseOidList.toArray(new String[0])));
        }
        for (CodePhaseAttr codePhaseAttrDO:codePhaseAttrDOList){
        for (CodePhaseattrEntity codePhaseAttrDO:codePhaseAttrDOList){
            String oldPhaseoid = codePhaseAttrDO.getCodePhaseOid();
//            String newOid = VciBaseUtil.getPk();
            codePhaseAttrDO.setOid(null);
@@ -817,11 +821,13 @@
//        VciQueryWrapperForDO codeClassifyTemplateAttrQuery = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
//        codeClassifyTemplateAttrQuery.addQueryMap("classifyTemplateOid",templateOldOid);

        Map<String,Object> condition = new HashMap<>(1);
        condition.put("classifyTemplateOid",templateOldOid);
//        Map<String,Object> condition = new HashMap<>(1);
//        condition.put("classifyTemplateOid",templateOldOid);
        QueryWrapper<CodeClstempattrEntity> wrapper=new QueryWrapper<>();
        wrapper.eq("classifyTemplateOid",templateOldOid);

//        List<CodeClstempattrEntity> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrDaoI.selectByWrapper(codeClassifyTemplateAttrQuery);
        List<CodeClstempattrEntity> codeClstempattrEntities = codeClstempattrMapper.selectByMap(condition);
        List<CodeClstempattrEntity> codeClstempattrEntities = codeClstempattrMapper.selectList(wrapper);

        for (CodeClstempattrEntity codeClassifyTemplateAttrDO :codeClstempattrEntities){
//            String attrOid = VciBaseUtil.getPk();
@@ -1029,4 +1035,120 @@
        return R.data(codeClassifyTemplateDO2VO(codeClassifyTemplateDO));
    }

    /**
     *根据父分类id去查找叶子节点的模板，如果没查到则认为模板在上层建立，则根据分类去查当前模板
     * @param codeClassifyOid çˆ¶åˆ†ç±»çš„主键
     * @return
     */
    @Override
    public List<CodeClstemplateVO> childTemplates(String codeClassifyOid){
        List<CodeClstemplateVO> codeClassifyTemplateVOList=new ArrayList<>();
//        Map<String/**模板的主键**/,String/**分类的主键**/> childHasTemplateMap =baseMapper
//            .selectChildHasReleaseTemplate(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED,
//                codeClassifyOid,CodeClassifyTemplateLC.RELEASED.getValue());
        List<Map<String,String>> childHasTemplateList =baseMapper
            .selectChildHasReleaseTemplate(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED,
                codeClassifyOid,CodeClassifyTemplateLC.RELEASED.getValue());
        Map<String/**模板的主键**/,String/**分类的主键**/> childHasTemplateMap = new HashMap<>();
        if(!CollectionUtils.isEmpty(childHasTemplateList)){
            childHasTemplateList.stream().forEach(cbo->{
                childHasTemplateMap.put(cbo.get("OID"),cbo.get("CLSOID"));
            });
        }

        Set<String> templateOid = childHasTemplateMap.keySet();
        List<CodeClstemplateEntity>  classifyTemplateDOS=new ArrayList<>();
        if(!CollectionUtils.isEmpty(templateOid)) {
            classifyTemplateDOS= this.listCodeClassifyTemplateDOByOidCollections(templateOid);
        }else{
            classifyTemplateDOS=selectOnlyTemplateByClassifyOid(codeClassifyOid);
        }
        List<CodeClstemplateVO> templateVOList = codeClassifyTemplateDO2VOs(classifyTemplateDOS, true);
        if(!CollectionUtils.isEmpty(templateVOList)){
            codeClassifyTemplateVOList.addAll(templateVOList);
        }
        return codeClassifyTemplateVOList;
    }


    /**
     * ä½¿ç”¨åˆ†ç±»ä¸»é”®é€’归查询
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @return æ¨¡æ¿çš„数据对象
     */
    private List<CodeClstemplateEntity> selectOnlyTemplateByClassifyOid(String codeClassifyOid){
        //1.直接查询，看看这个分类下面有没有发布状态的模板
        //2.如果没有，则往上找分类的内容，这个分类层级不会太多，所以直接递归即可
        //3.如果分类下面添加了模板，但是没有发布，则说明模板可能还在编辑的状态，依然使用上级分类

//        Map<String,String> conditionMap = new HashMap<>();
//        conditionMap.put("codeClassifyOid",codeClassifyOid);
//        conditionMap.put("lcstatus",CodeClassifyTemplateLC.RELEASED.getValue());
        QueryWrapper<CodeClstemplateEntity> wrapper=new QueryWrapper<>();
        wrapper.eq("codeClassifyOid",codeClassifyOid)
            .eq("lcstatus",CodeClassifyTemplateLC.RELEASED.getValue());

        List<CodeClstemplateEntity> templateDOS = baseMapper.selectList(wrapper);
        if(CollectionUtils.isEmpty(templateDOS)){
            //递归找上级的模板
            CodeClassify classifyDO = codeClassifyMapper.selectById(codeClassifyOid);
//                codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
            if(StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
                //说明已经是顶了，也没找到的话，那就返回了
                return null;
            }
            return selectOnlyTemplateByClassifyOid(classifyDO.getParentCodeClassifyOid());
        }else{
            return templateDOS;
        }
    }

    /**
     * ä½¿ç”¨ä¸»é¢˜åº“的分类主键，获取生效的模板
     *
     * @param codeClassifyOid ä¸»é¢˜åº“分类主键
     * @param hasAttribute    æ˜¯å¦åŒ…含属性
     * @return æ¨¡æ¿çš„信息
     */
    @Override
    public List<CodeClstemplateVO> listReleaseTemplateByClassifyOid(String codeClassifyOid, boolean hasAttribute) {
        VciBaseUtil.alertNotNull(codeClassifyOid,"主题库分类主键");
        List<CodeClstemplateEntity> templateDOS = selectOnlyTemplateByClassifyOid(codeClassifyOid);
        if(CollectionUtils.isEmpty(templateDOS)){
            throw new VciBaseException("当前分类，以及其上级分类都没有设置模板");
        }
        List<CodeClstemplateVO> templateVOList = codeClassifyTemplateDO2VOs(templateDOS, true);
        return sortTemplateByRevision(templateVOList);
    }

    /**
     * ç”¨æ¨¡æ¿çš„版本来排序
     * @param templateVOList æ¨¡æ¿çš„显示对象
     * @return æŽ’序后的列表
     */
    @Override
    public List<CodeClstemplateVO> sortTemplateByRevision(List<CodeClstemplateVO> templateVOList){
        if(!CollectionUtils.isEmpty(templateVOList) && templateVOList.size() >1){
            //获取版本号最大的那个
            templateVOList = templateVOList.stream().sorted((o1,o2)->
                Integer.valueOf(o1.getRevisionSeq()).compareTo(Integer.valueOf(o2.getRevisionValue()))
            ).collect(Collectors.toList());
        }
        return templateVOList;
    }

    /**
     * ä¸»é”®èŽ·å–分类模板对象(包含属性）
     *
     * @param oid ä¸»é”®
     * @return åˆ†ç±»æ¨¡æ¿å¯¹è±¡æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException å‚数为空，数据不存在时会抛出异常
     */
    @Override
    public CodeClstemplateVO getObjectHasAttrByOid(String oid) throws VciBaseException {
        List<CodeClstemplateEntity> doList = new ArrayList<>();
        doList.add(selectByOid(oid));
        List<CodeClstemplateVO> templateVOS = codeClassifyTemplateDO2VOs(doList, true);
        return CollectionUtils.isEmpty(templateVOS)?null:templateVOS.get(0);
    }
}

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

@@ -16,14 +16,19 @@
 */
package com.vci.ubcs.code.service.impl;

import com.alibaba.nacos.common.utils.StringUtils;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeKeyattrrepeatEntity;
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
import com.vci.ubcs.code.vo.CodeKeyattrrepeatVO;
import com.vci.ubcs.code.mapper.CodeKeyattrrepeatMapper;
import com.vci.ubcs.code.service.ICodeKeyattrrepeatService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,6 +37,9 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;

import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST;

/**
 * å…³é”®å±žæ€§æŸ¥é‡è§„则 æœåŠ¡å®žçŽ°ç±»
@@ -117,4 +125,68 @@
        }
        return vo;
    }

    /**
     * ä½¿ç”¨åˆ†ç±»çš„全部信息来获取关键属性判断规则的内容
     *
     * @param classifyFullInfo ä¸»é¢˜åº“分类的全部信息
     * @return è§„则的显示对象
     */
    @Override
    public CodeKeyattrrepeatVO getRuleByClassifyFullInfo(CodeClassifyFullInfoBO classifyFullInfo) {
        VciBaseUtil.alertNotNull(classifyFullInfo,"主题库分类的信息");
        String keyAttrRuleOid = classifyFullInfo.getCurrentClassifyVO().getCodekeyattrrepeatoid();
        if(StringUtils.isBlank(keyAttrRuleOid)){
            //我们根据上级的分类，按照层级倒序排列
            if(!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())){
                //有上级分类的情况下才去查询
                List<CodeClassifyVO> sortedClassifyVO = classifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList());
                for(int i = sortedClassifyVO.size() -1;i>=0;i--){
                    CodeClassifyVO record = sortedClassifyVO.get(i);

                    if(StringUtils.isNotBlank(record.getCodekeyattrrepeatoid())){
                        keyAttrRuleOid = record.getCodekeyattrrepeatoid();
                        break;
                    }
                }
            }
        }
        if(StringUtils.isNotBlank(keyAttrRuleOid)){
            CodeKeyAttrRepeatRuleVO objectByOid = getObjectByOid(keyAttrRuleOid);
            CodeKeyattrrepeatVO codeKeyattrrepeatVO = new CodeKeyattrrepeatVO();
            BeanUtils.copyProperties(objectByOid,codeKeyattrrepeatVO);
            return codeKeyattrrepeatVO;
        }
        //关键属性的规则可以为空，为空的时候就代表不控制，
        return null;
    }

    /**
     * ä¸»é”®èŽ·å–关键数据查重规则
     * @param oid ä¸»é”®
     * @return å…³é”®æ•°æ®æŸ¥é‡è§„则显示对象
     */
    @Override
    public  CodeKeyAttrRepeatRuleVO getObjectByOid(String oid){
        CodeKeyAttrRepeatRuleVO codeKeyAttrRepeatRuleVO = codeKeyAttrRepeatRuleDO2VO(selectByOid(oid));
        CodeKeyattrrepeatVO codeKeyattrrepeatVO = new CodeKeyattrrepeatVO();
        BeanUtils.copyProperties(codeKeyAttrRepeatRuleVO,codeKeyattrrepeatVO);
        return codeKeyAttrRepeatRuleVO;
    }
    /**
     * ä¸»é”®æŸ¥è¯¢æ•°æ®å¯¹è±¡
     * @param oid ä¸»é”®
     * @return  æ•°æ®å¯¹è±¡
     * @throws VciBaseException å‚数为空，并且数据不存在的时候会抛出异常
     */
    private CodeKeyattrrepeatEntity selectByOid(String oid) {
        VciBaseUtil.alertNotNull(oid,"主键");

        CodeKeyattrrepeatEntity codeKeyAttrRepeatRuleDO = codeKeyattrrepeatMapper.selectById(oid.trim());
//            .selectByPrimaryKey(oid.trim());
        if(codeKeyAttrRepeatRuleDO == null || StringUtils.isBlank(codeKeyAttrRepeatRuleDO.getOid())){
            throw new VciBaseException(DATA_OID_NOT_EXIST);
        }
        return codeKeyAttrRepeatRuleDO;
    }
}

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

@@ -18,8 +18,8 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
import com.vci.ubcs.code.service.ICodePhaseattrService;
import com.vci.ubcs.code.vo.CodePhaseattrVO;
import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@
 * @since 2023-04-20
 */
@Service
public class CodePhaseattrServiceImpl extends ServiceImpl<CodePhaseAttrMapper, CodePhaseAttr> implements ICodePhaseattrService {
public class CodePhaseattrServiceImpl extends ServiceImpl<CodePhaseattrMapper, CodePhaseattrEntity> implements ICodePhaseattrService {

    @Override
    public IPage<CodePhaseattrVO> selectCodePhaseattrPage(IPage<CodePhaseattrVO> page, CodePhaseattrVO CodePhaseattr) {

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

@@ -430,4 +430,38 @@
    }


    /**
     * ä½¿ç”¨ä¸»é”®èŽ·å–编码规则的内容
     *
     * @param oid ä¸»é”®
     * @return è§„则的显示对象
     */
    @Override
    public CodeRuleVO getObjectHasSecByOid(String oid) {
        CodeRule ruleDO = selectByOid(oid);
        return codeRuleDO2VO(ruleDO, true);
    }

    /**
     * æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     *
     * @param codeRuleDO è§„则的数据对象
     * @param hasSec     æ˜¯å¦æŸ¥è¯¢ç æ®µ
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException æ‹·è´å±žæ€§å‡ºé”™çš„时候会抛出异常
     */
    public CodeRuleVO codeRuleDO2VO(CodeRule codeRuleDO, boolean hasSec) throws VciBaseException {
        CodeRuleVO vo = new CodeRuleVO();
        if (codeRuleDO != null) {
            BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDO, vo);
            //如果有lcstatus的类的话
            vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
            if (hasSec) {
                //查询码段
                vo.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid()));
            }
        }
        return vo;
    }

}

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

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

import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

@@ -27,24 +26,21 @@
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
import com.vci.ubcs.code.service.ICodePhaseattrService;
import com.vci.ubcs.code.service.ICodeTempphaseService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.MybatisParameterUtils;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.util.MybatisParameterUtil;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
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.WebUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -66,10 +62,10 @@
 * @since 2023-04-20
 */
@Service
public class CodeTempphaseServiceImpl extends ServiceImpl<CodeTemplatePhaseMapper, CodeTemplatePhase> implements ICodeTempphaseService {
public class CodeTempphaseServiceImpl extends ServiceImpl<CodeTemplatePhaseMapper, CodeTempphaseEntity> implements ICodeTempphaseService {

    @Autowired(required = false)
    private CodePhaseAttrMapper codePhaseAttrMapper;
    private CodePhaseattrMapper codePhaseAttrMapper;

    @Autowired(required = false)
    private CodeTemplatePhaseMapper codeTemplatePhaseMapper;
@@ -92,7 +88,6 @@
    @Autowired
    private ICodeClassifyTemplateAttrService tempAttrService;


    /**
     * æŸ¥è¯¢æ‰€æœ‰çš„模板阶段
     * @param codeTemplatePhaseVO æŸ¥è¯¢æ¡ä»¶
@@ -101,12 +96,12 @@
     * @throws VciBaseException æŸ¥è¯¢æ¡ä»¶å’Œåˆ†é¡µå‡ºé”™çš„时候会抛出异常
     */
    @Override
    public DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(CodeTemplatePhaseVO codeTemplatePhaseVO, Query query) throws VciBaseException {
    public DataGrid<CodeTemplatePhaseEntityVO> gridCodeTemplatePhase(CodeTemplatePhaseEntityVO codeTemplatePhaseVO, Query query) throws VciBaseException {
        query.setDescs("createTime");
        query.setSize(-1);

        IPage<CodeTemplatePhase> doList = codeTemplatePhaseMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeTemplatePhaseVO));
        DataGrid<CodeTemplatePhaseVO> dataGrid=new DataGrid<CodeTemplatePhaseVO>();
        IPage<CodeTempphaseEntity> doList = codeTemplatePhaseMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeTemplatePhaseVO));
        DataGrid<CodeTemplatePhaseEntityVO> dataGrid=new DataGrid<CodeTemplatePhaseEntityVO>();
        if (!CollectionUtils.isEmpty(doList.getRecords())) {
            dataGrid.setData(codeTemplatePhaseDO2VOs(doList.getRecords()));
            dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeTemplatePhaseMapper.selectCount(Condition.getQueryWrapper(codeTemplatePhaseVO)))));
@@ -116,16 +111,16 @@

    /**
     * æ‰¹é‡æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     * @param codeTemplatePhaseDOs æ•°æ®å¯¹è±¡åˆ—表
     * @param codeTemplatePhaseEntityDOS æ•°æ®å¯¹è±¡åˆ—表
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException å‚数为空或者不存在的时候会抛出异常
     */
    @Override
    public List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhase> codeTemplatePhaseDOs) throws VciBaseException{
        List<CodeTemplatePhaseVO> voList = new ArrayList<CodeTemplatePhaseVO>();
        if(!CollectionUtils.isEmpty(codeTemplatePhaseDOs)){
            for(CodeTemplatePhase s: codeTemplatePhaseDOs){
                CodeTemplatePhaseVO vo =  codeTemplatePhaseDO2VO(s);
    public List<CodeTemplatePhaseEntityVO> codeTemplatePhaseDO2VOs(Collection<CodeTempphaseEntity> codeTemplatePhaseEntityDOS) throws VciBaseException{
        List<CodeTemplatePhaseEntityVO> voList = new ArrayList<CodeTemplatePhaseEntityVO>();
        if(!CollectionUtils.isEmpty(codeTemplatePhaseEntityDOS)){
            for(CodeTempphaseEntity s: codeTemplatePhaseEntityDOS){
                CodeTemplatePhaseEntityVO vo =  codeTemplatePhaseDO2VO(s);
                if(vo != null){
                    voList.add(vo);
                }
@@ -136,15 +131,15 @@

    /**
     * æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     * @param  codeTemplatePhaseDO æ•°æ®å¯¹è±¡
     * @param  codeTemplatePhaseEntityDO æ•°æ®å¯¹è±¡
     * @return æ˜¾ç¤ºå¯¹è±¡
     * @throws VciBaseException æ‹·è´å±žæ€§å‡ºé”™çš„时候会抛出异常
     */
    @Override
    public  CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhase codeTemplatePhaseDO) throws VciBaseException{
        CodeTemplatePhaseVO vo = new CodeTemplatePhaseVO();
        if(codeTemplatePhaseDO != null){
            BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDO,vo);
    public CodeTemplatePhaseEntityVO codeTemplatePhaseDO2VO(CodeTempphaseEntity codeTemplatePhaseEntityDO) throws VciBaseException{
        CodeTemplatePhaseEntityVO vo = new CodeTemplatePhaseEntityVO();
        if(codeTemplatePhaseEntityDO != null){
            BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseEntityDO,vo);
            //如果有lcstatus的类的话
        }
        return vo;
@@ -161,14 +156,14 @@
        int updateCount = 0;
        Map<String,Object> condition = new HashMap<>(1);
        condition.put("codeclassifytemplateoid",templateOid);
        List<CodeTemplatePhase> codeTempphaseEntities = baseMapper.selectByMap(condition);
        List<CodeTempphaseEntity> codeTempphaseEntities = baseMapper.selectByMap(condition);
        if(!CollectionUtils.isEmpty(codeTempphaseEntities)) {
            updateCount += baseMapper.deleteBatchIds(codeTempphaseEntities.stream().map(CodeTemplatePhase::getOid).collect(Collectors.toList()));
            updateCount += baseMapper.deleteBatchIds(codeTempphaseEntities.stream().map(CodeTempphaseEntity::getOid).collect(Collectors.toList()));
//            batchCBO.copyFromOther(codeTemplatePhaseMapper.batchDeleteByOids(templatePhaseDOS.stream().map(CodeTemplatePhaseDO::getOid).collect(Collectors.toList())));
//            conditionMap.put("codePhaseOid", QueryOptionConstant.IN + "(select oid from " + getPhaseTable() + " where codeClassifyTemplateOid='" + classifyTemplateOid + "')");
            List<CodePhaseAttr> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(templateOid);
            List<CodePhaseattrEntity> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(templateOid);
            if(!CollectionUtils.isEmpty(phaseAttrDOS)){
                updateCount += codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseAttr::getOid).collect(Collectors.toList()));
                updateCount += codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseattrEntity::getOid).collect(Collectors.toList()));
            }
        }
        return updateCount;
@@ -184,7 +179,7 @@
    public List<CodeClstempattrEntity> codeTemplateAttrModifyTrigger(List<CodeClstempattrEntity> attrDOList){
        //属性修改的时候，需要同步修改对应属性的名称
//        BatchCBO batchCBO = new BatchCBO();
        List<CodePhaseAttr> phaseAttrDOS =codePhaseAttrMapper.listLinkAttrDOByTemplateAttrDOS(VciBaseUtil.toInSql(attrDOList.stream()
        List<CodePhaseattrEntity> phaseAttrDOS =codePhaseAttrMapper.listLinkAttrDOByTemplateAttrDOS(VciBaseUtil.toInSql(attrDOList.stream()
            .map(CodeClstempattrEntity::getId).collect(Collectors.toList()).toArray(new String[0])),attrDOList.get(0).getClassifytemplateoid());
        if(!CollectionUtils.isEmpty(phaseAttrDOS)){
            //说明有属性,我们去替换一下
@@ -214,25 +209,25 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public CodeTemplatePhaseVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
    public CodeTemplatePhaseEntityVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
        VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"需要添加的数据对象",codeTemplatePhaseDTO.getAttributes(),"包含的属性");
        //将DTO转换为DO
        CodeTemplatePhase codeTemplatePhaseDO = new CodeTemplatePhase();
        codeTemplatePhaseDO.setOid(VciBaseUtil.getPk());
        BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDTO,codeTemplatePhaseDO);
        CodeTempphaseEntity codeTemplatePhaseEntityDO = new CodeTempphaseEntity();
        codeTemplatePhaseEntityDO.setOid(VciBaseUtil.getPk());
        BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDTO, codeTemplatePhaseEntityDO);
        //WebUtil.setPersistence(false);
        boolean resBoolean = codeTemplatePhaseMapper.insert(codeTemplatePhaseDO) > 0;
        List<CodePhaseAttr> attrDOList = new ArrayList<>();
        boolean resBoolean = codeTemplatePhaseMapper.insert(codeTemplatePhaseEntityDO) > 0;
        List<CodePhaseattrEntity> attrDOList = new ArrayList<>();
        codeTemplatePhaseDTO.getAttributes().stream().forEach(attrDTO->{
            CodePhaseAttr attrDO = new CodePhaseAttr();
            CodePhaseattrEntity attrDO = new CodePhaseattrEntity();
            BeanUtilForVCI.copyPropertiesIgnoreCase(attrDTO,attrDO);
            attrDO.setOid(VciBaseUtil.getPk());
            attrDO.setCodePhaseOid(codeTemplatePhaseDO.getOid());
            attrDO.setCodePhaseOid(codeTemplatePhaseEntityDO.getOid());
            attrDOList.add(attrDO);
        });
        codePhaseattrService.saveBatch(attrDOList);
        //WebUtil.setPersistence(true);
        return codeTemplatePhaseDO2VO(codeTemplatePhaseDO);
        return codeTemplatePhaseDO2VO(codeTemplatePhaseEntityDO);
    }

    /**
@@ -243,29 +238,29 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
    public CodeTemplatePhaseEntityVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
        VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"数据对象",codeTemplatePhaseDTO.getOid(),"模板阶段主键",codeTemplatePhaseDTO.getAttributes(),"包含的属性");
        //将DTO转换为DO
        CodeTemplatePhase codeTemplatePhaseDO = selectByOid(codeTemplatePhaseDTO.getOid());
        revisionModelUtil.copyFromDTOIgnore(codeTemplatePhaseDTO,codeTemplatePhaseDO);
        CodeTempphaseEntity codeTemplatePhaseEntityDO = selectByOid(codeTemplatePhaseDTO.getOid());
        revisionModelUtil.copyFromDTOIgnore(codeTemplatePhaseDTO, codeTemplatePhaseEntityDO);
        //WebUtil.setPersistence(false);
        codeTemplatePhaseMapper.updateById(codeTemplatePhaseDO);
        codeTemplatePhaseMapper.updateById(codeTemplatePhaseEntityDO);
        //把以前的删除
        List<CodePhaseAttr> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseDO.getOid());
        List<CodePhaseattrEntity> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseEntityDO.getOid());
        if(!CollectionUtils.isEmpty(phaseAttrDOS)){
            codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseAttr::getOid).collect(Collectors.toList()));
            codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseattrEntity::getOid).collect(Collectors.toList()));
        }
        List<CodePhaseAttr> attrDOList = new ArrayList<>();
        List<CodePhaseattrEntity> attrDOList = new ArrayList<>();
        codeTemplatePhaseDTO.getAttributes().stream().forEach(attrDTO->{
            CodePhaseAttr attrDO = new CodePhaseAttr();
            CodePhaseattrEntity attrDO = new CodePhaseattrEntity();
            BeanUtilForVCI.copyPropertiesIgnoreCase(attrDTO,attrDO);
            attrDO.setOid(VciBaseUtil.getPk());
            attrDO.setCodePhaseOid(codeTemplatePhaseDO.getOid());
            attrDO.setCodePhaseOid(codeTemplatePhaseEntityDO.getOid());
            attrDOList.add(attrDO);
        });
        codePhaseattrService.saveBatch(attrDOList);
        //WebUtil.setPersistence(true);
        return codeTemplatePhaseDO2VO(codeTemplatePhaseDO);
        return codeTemplatePhaseDO2VO(codeTemplatePhaseEntityDO);
    }

    /**
@@ -278,20 +273,20 @@
    @Transactional(rollbackFor = Exception.class)
    public R deleteCodeTemplatePhase(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
        VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"模板阶段数据对象",codeTemplatePhaseDTO.getOid(),"模板阶段的主键");
        CodeTemplatePhase codeTemplatePhaseDO = selectByOid(codeTemplatePhaseDTO.getOid());
        R baseResult = checkIsCanDeleteForDO(codeTemplatePhaseDTO,codeTemplatePhaseDO);
        CodeTempphaseEntity codeTemplatePhaseEntityDO = selectByOid(codeTemplatePhaseDTO.getOid());
        R baseResult = checkIsCanDeleteForDO(codeTemplatePhaseDTO, codeTemplatePhaseEntityDO);
        if(!baseResult.isSuccess()) {
        }else{
            return baseResult;
        }
        //执行删除操作
        //WebUtil.setPersistence(false);
        boolean batchCBO = codeTemplatePhaseMapper.deleteById(codeTemplatePhaseDO.getOid())>0;
        boolean batchCBO = codeTemplatePhaseMapper.deleteById(codeTemplatePhaseEntityDO.getOid())>0;
        //需要删除属性
        List<CodePhaseAttr> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseDO.getOid());
        List<CodePhaseattrEntity> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseEntityDO.getOid());
        boolean deleteCBO = false;
        if(!CollectionUtils.isEmpty(phaseAttrDOS)) {
            deleteCBO = codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseAttr::getOid).collect(Collectors.toList()))>0;
            deleteCBO = codePhaseAttrMapper.deleteBatchIds(phaseAttrDOS.stream().map(CodePhaseattrEntity::getOid).collect(Collectors.toList()))>0;
        }
        //WebUtil.setPersistence(true);
        return (batchCBO || deleteCBO)?R.success(DELETE_SUCCESS):R.fail(DELETE_FAIL);
@@ -304,7 +299,7 @@
     * @throws VciBaseException å‚数为空，数据不存在时会抛出异常
     */
    @Override
    public  CodeTemplatePhaseVO getObjectByOid(String oid) throws VciBaseException{
    public CodeTemplatePhaseEntityVO getObjectByOid(String oid) throws VciBaseException{
        return codeTemplatePhaseDO2VO(selectByOid(oid));
    }

@@ -315,10 +310,10 @@
     * @throws VciBaseException æŸ¥è¯¢å‡ºçŽ°å¼‚常时会抛出
     */
    @Override
    public Collection<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException{
    public Collection<CodeTemplatePhaseEntityVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException{
        VciBaseUtil.alertNotNull(oidCollections,"数据对象主键集合");
        List<CodeTemplatePhase> codeTemplatePhaseDOList = listCodeTemplatePhaseDOByOidCollections(oidCollections);
        return codeTemplatePhaseDO2VOs(codeTemplatePhaseDOList);
        List<CodeTempphaseEntity> codeTemplatePhaseEntityDOList = listCodeTemplatePhaseDOByOidCollections(oidCollections);
        return codeTemplatePhaseDO2VOs(codeTemplatePhaseEntityDOList);
    }

    /**
@@ -329,11 +324,11 @@
     * @throws VciBaseException æŸ¥è¯¢æ¡ä»¶å’Œåˆ†é¡µå‡ºé”™çš„时候会抛出异常
     */
    @Override
    public DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
    public DataGrid<CodeTemplatePhaseEntityVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
        if(conditionMap == null){
            conditionMap = new HashMap<String, String>();
        }
        CodeTemplatePhaseVO codeTemplatePhaseVO = new CodeTemplatePhaseVO();
        CodeTemplatePhaseEntityVO codeTemplatePhaseVO = new CodeTemplatePhaseEntityVO();
        BeanMap beanMap = BeanMap.create(codeTemplatePhaseVO);
        beanMap.putAll(conditionMap);
        Query query = new Query();
@@ -368,7 +363,7 @@
            if(ids.size()<=1000){
                queryWrapper = Wrappers.<CodeClassifyTemplateAttr>query().lambda().notIn(CodeClassifyTemplateAttr::getId, ids);
            }else {
                queryWrapper = MybatisParameterUtils.cutNotInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
                queryWrapper = MybatisParameterUtil.cutNotInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
            }
            //conditionMap.put("id", QueryOptionConstant.NOTIN + ids);
        }
@@ -392,7 +387,7 @@
            return new DataGrid<>();
        }
        conditionMap.remove("codePhaseOid");
        CodeTemplatePhase phaseDO = selectByOid(codePhaseOid);
        CodeTempphaseEntity phaseDO = selectByOid(codePhaseOid);
        List<String> ids = commonsMapper.selectById("(select id from " + getPhaseAttrTable() + " where codePhaseOid ='" +codePhaseOid + "')");
        LambdaQueryWrapper<CodeClassifyTemplateAttr> queryWrapper = null;
        //            Wrappers.<CodeClassifyTemplateAttrVO>query()
@@ -400,7 +395,7 @@
        if(ids.size()<=1000){
            queryWrapper = Wrappers.<CodeClassifyTemplateAttr>query().lambda().in(CodeClassifyTemplateAttr::getId, ids);
        }else {
            queryWrapper = MybatisParameterUtils.cutInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
            queryWrapper = MybatisParameterUtil.cutInParameter(queryWrapper,CodeClassifyTemplateAttr::getId,ids);
        }
        queryWrapper.eq(CodeClassifyTemplateAttr::getClassifyTemplateOid,phaseDO.getCodeClassifyTemplateOid());
        return tempAttrService.gridCodeClassifyTemplateAttr(queryWrapper,pageHelper);
@@ -419,33 +414,33 @@
     * @param oidCollections ä¸»é”®çš„集合
     * @return æ•°æ®å¯¹è±¡åˆ—表
     */
    private List<CodeTemplatePhase> listCodeTemplatePhaseDOByOidCollections(Collection<String> oidCollections){
        List<CodeTemplatePhase> codeTemplatePhaseDOList = new ArrayList<CodeTemplatePhase>();
    private List<CodeTempphaseEntity> listCodeTemplatePhaseDOByOidCollections(Collection<String> oidCollections){
        List<CodeTempphaseEntity> codeTemplatePhaseEntityDOList = new ArrayList<CodeTempphaseEntity>();
        if(!CollectionUtils.isEmpty(oidCollections)){
            Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
            for(Collection<String> oids: oidCollectionsList){
                List<CodeTemplatePhase> tempDOList =  codeTemplatePhaseMapper.selectBatchIds(oids);
                List<CodeTempphaseEntity> tempDOList =  codeTemplatePhaseMapper.selectBatchIds(oids);
                if(!CollectionUtils.isEmpty(tempDOList)){
                    codeTemplatePhaseDOList.addAll(tempDOList);
                    codeTemplatePhaseEntityDOList.addAll(tempDOList);
                }
            }
        }
        return  codeTemplatePhaseDOList;
        return codeTemplatePhaseEntityDOList;
    }

    /**
     * æ ¡éªŒæ˜¯å¦å¯ä»¥åˆ é™¤ï¼Œå¦‚果存在下级，并且下级有数据引用则不能删除
     * @param codeTemplatePhaseDTO æ•°æ®ä¼ è¾“对象
     * @param codeTemplatePhaseDO æ•°æ®åº“中的数据对象
     * @param codeTemplatePhaseEntityDO æ•°æ®åº“中的数据对象
     * @return success为true为可以删除，false表示有数据引用，obj为true表示有下级
     */
    private R checkIsCanDeleteForDO(CodeTemplatePhaseDTO codeTemplatePhaseDTO, CodeTemplatePhase codeTemplatePhaseDO) {
        CodeTemplatePhase tsDO = new CodeTemplatePhase();
    private R checkIsCanDeleteForDO(CodeTemplatePhaseDTO codeTemplatePhaseDTO, CodeTempphaseEntity codeTemplatePhaseEntityDO) {
        CodeTempphaseEntity tsDO = new CodeTempphaseEntity();
        BeanUtil.convert(codeTemplatePhaseDTO,tsDO);
        if (checkTs(tsDO)) {
            return R.fail(TS_NOT_PROCESS);
        }
        if(!checkIsLinked(codeTemplatePhaseDO.getOid())) {
        if(!checkIsLinked(codeTemplatePhaseEntityDO.getOid())) {
            return R.success("succcess");
        }else{
            return R.fail(DATA_LINKED_NOT_DELETE);
@@ -457,9 +452,9 @@
     * @param tempDO
     * @return
     */
    private boolean checkTs(CodeTemplatePhase tempDO){
        LambdaQueryWrapper<CodeTemplatePhase> wrapper = Wrappers.<CodeTemplatePhase>query()
            .lambda().eq(CodeTemplatePhase::getOid,tempDO.getOid()).select(CodeTemplatePhase::getTs);
    private boolean checkTs(CodeTempphaseEntity tempDO){
        LambdaQueryWrapper<CodeTempphaseEntity> wrapper = Wrappers.<CodeTempphaseEntity>query()
            .lambda().eq(CodeTempphaseEntity::getOid,tempDO.getOid()).select(CodeTempphaseEntity::getTs);
        long dbTs = codePhaseAttrMapper.selectById(wrapper).getTs().getTime();
        long currentTs = tempDO.getTs().getTime();
        if(dbTs == currentTs){
@@ -483,11 +478,11 @@
     * @param codePhaseOid é˜¶æ®µçš„主键
     * @return åŒ…含属性的数据对象
     */
    private List<CodePhaseAttr> listPhaseAttrDOByPhaseOid(String codePhaseOid){
    private List<CodePhaseattrEntity> listPhaseAttrDOByPhaseOid(String codePhaseOid){
        if(StringUtils.isBlank(codePhaseOid)||StringUtils.isEmpty(codePhaseOid)){
            return null;
        }
        List<CodePhaseAttr> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(codePhaseOid);
        List<CodePhaseattrEntity> phaseAttrDOS = codePhaseAttrMapper.selectByPhasea(codePhaseOid);
        return phaseAttrDOS;
    }

@@ -497,13 +492,13 @@
     * @return  æ•°æ®å¯¹è±¡
     * @throws VciBaseException å‚数为空，并且数据不存在的时候会抛出异常
     */
    private CodeTemplatePhase selectByOid(String oid) throws VciBaseException{
    private CodeTempphaseEntity selectByOid(String oid) throws VciBaseException{
        VciBaseUtil.alertNotNull(oid,"主键");
        CodeTemplatePhase codeTemplatePhaseDO = codeTemplatePhaseMapper.selectById(oid.trim());
        if(codeTemplatePhaseDO == null || StringUtils.isBlank(codeTemplatePhaseDO.getOid())){
        CodeTempphaseEntity codeTemplatePhaseEntityDO = codeTemplatePhaseMapper.selectById(oid.trim());
        if(codeTemplatePhaseEntityDO == null || StringUtils.isBlank(codeTemplatePhaseEntityDO.getOid())){
            throw new VciBaseException(DATA_OID_NOT_EXIST);
        }
        return codeTemplatePhaseDO;
        return codeTemplatePhaseEntityDO;
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.vci.ubcs.code.mapper.CodeWupinMapper;
import com.vci.ubcs.code.service.ICodeWupinService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**
 * ç¼–码信息 æœåŠ¡å®žçŽ°ç±»
 *
 * @author yuxc
 * @since 2023-05-05
 */
@Service
public class CodeWupinServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupinEntity> implements ICodeWupinService {

    @Override
    public IPage<CodeWupinVO> selectCodeWupinPage(IPage<CodeWupinVO> page, CodeWupinVO codeWupin) {
        return page.setRecords(baseMapper.selectCodeWupinPage(page, codeWupin));
    }


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,779 @@
package com.vci.ubcs.code.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sun.corba.se.impl.orbutil.ObjectUtility;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeOsbtmtypeEntity;
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.enumpack.CodeDefaultLC;
import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.mapper.CodeOsbtmtypeMapper;
import com.vci.ubcs.code.mapper.CodeRuleMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.CodeClstempattrVO;
import com.vci.ubcs.code.vo.CodeClstemplateVO;
import com.vci.ubcs.code.vo.CodeKeyattrrepeatVO;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.omd.entity.Dict;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.toolmodel.DateConverter;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.starter.web.util.VciQueryWrapperForDO;
import com.vci.ubcs.starter.web.util.WebUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;

/**
 * ä¸»æ•°æ®å¼•æ“ŽæœåŠ¡
 *
 * @author weidy
 * @date 2022-2-22
 */
@Service
public class MdmEngineServiceImpl extends ServiceImpl<CodeAllCodeMapper, CodeAllCode> implements MdmEngineService {


    /**
     * æ¨¡æ¿çš„服务
     */
    @Resource
    private CodeClstemplateServiceImpl templateService;
    /**
     * æ¨¡æ¿çš„服务
     */
    @Resource
    private CodeOsbtmtypeMapper codeOsbtmtypeMapper;
    /**
     * ç”Ÿæˆç¼–码的服务
     */
    @Resource
    private MdmProductCodeService productCodeService;
    /**
     * å­—典的服务
     */
    @Resource
    IDictBizClient iDictBizClient;

    /**
     * ç¼–码规则的服务
     */
    @Autowired
    private ICodeRuleService ruleService;

    /**
     * åˆ†ç±»çš„服务
     */
    @Resource
    private ICodeClassifyService classifyService;

    /**
     * å…³é”®å±žæ€§çš„配置
     */
    @Autowired
    private ICodeKeyattrrepeatService keyRuleService;
    /**
     * æ—¥å¿—
     */
    private Logger logger = LoggerFactory.getLogger(getClass());

//    @Autowired
//    private CodeOsbtmtypeMapper codeOsbtmtypeMapper;



    /**
     * ä½¿ç”¨åˆ†ç±»çš„主键获取可以使用的模板对象
     *
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @return æ¨¡æ¿çš„显示对象
     */
    @Override
    public CodeClstemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid) {
        return getUsedTemplateByClassifyOid(codeClassifyOid, true);
    }

    /**
     * ä½¿ç”¨åˆ†ç±»çš„主键获取可以使用的模板对象
     *
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @param hasAttr         åŒ…含属性
     * @return æ¨¡æ¿çš„显示对象
     */
    @Override
    public CodeClstemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid, boolean hasAttr) {
        List<CodeClstemplateVO> templateVOs = templateService.listReleaseTemplateByClassifyOid(codeClassifyOid, hasAttr);
        return templateVOs.get(templateVOs.size() - 1);
    }

    /**
     * èŽ·å–枚举的下拉选项
     *
     * @param attrVO æ¨¡æ¿å±žæ€§çš„对象
     * @return ä¸‹æ‹‰é€‰é¡¹
     */
    @Override
    public List<KeyValue> listComboboxItems(CodeClstempattrVO attrVO) {
        List<KeyValue> comboboxKVs = null;
        if (StringUtils.isNotBlank(attrVO.getEnumstring())) {
            comboboxKVs = JSONObject.parseArray(attrVO.getEnumstring(), KeyValue.class);
        } else {
//            comboboxKVs = enumService.getEnum(attrVO.getEnumid());
//             Dict dict = new Dict();
//            dict.setParentId(Long.valueOf(attrVO.getEnumid()));
            R<List<DictBiz>> list = iDictBizClient.getList(attrVO.getEnumid());
            if(list.isSuccess()){
                for (DictBiz datum : list.getData()) {
                    KeyValue keyValue = new KeyValue();
                    keyValue.setKey(datum.getDictKey());
                    keyValue.setValue(datum.getDictValue());
                    comboboxKVs.add(keyValue);
                }
            }
        }
        return comboboxKVs;
    }
    /**
     * ä¿®æ”¹çŠ¶æ€
     *
     * @param baseModelDTO æ•°æ®ä¼ è¾“对象
     */
    @Override
    public void changeStatus(BaseModelDTO baseModelDTO) {
        VciBaseUtil.alertNotNull(baseModelDTO, "数据信息", baseModelDTO.getOid(), "主键", baseModelDTO.getBtmname(), "业务类型", baseModelDTO.getLcStatus(), "目标状态");
        List<String> oids = VciBaseUtil.str2List(baseModelDTO.getOid());
//        List<ClientBusinessObject> cboList = boService.selectCBOByOidCollection(oids, baseModelDTO.getBtmname());
        //插个点 ä¸šåŠ¡ç±»åž‹å®ŒæˆåŽéœ€è¦ä¿®æ”¹
        QueryWrapper<CodeOsbtmtypeEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("BTMNAME",baseModelDTO.getBtmname());
        wrapper.in("OID",oids);
        List<CodeOsbtmtypeEntity> cboList = codeOsbtmtypeMapper.selectList(wrapper);
        //还需要修改allCode的生命周期
//        Map<String, String> conditionMap = new HashMap<>();
        QueryWrapper<CodeAllCode> allCodeWrapper = new QueryWrapper<>();
        allCodeWrapper.eq("createcodebtm",baseModelDTO.getBtmname());
        allCodeWrapper.in("createcodeoid",oids);
//        conditionMap.put("createcodeoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oids.toArray(new String[0])) + ")");
//        conditionMap.put("createcodebtm", baseModelDTO.getBtmname());
        List<CodeAllCode> codeCbos = baseMapper.selectList(allCodeWrapper);
//        List<ClientBusinessObject> codeCbos = boService.queryCBO(MdmBtmTypeConstant.CODE_ALL_CODE, conditionMap);
        // å›žæ”¶éœ€è¦ä¸šåŠ¡æ•°æ®åˆ é™¤
//        if (CodeDefaultLC.TASK_BACK.getValue().equals(baseModelDTO.getLcStatus())) {
////            BatchCBO batchCBO = new BatchCBO();
////            batchCBO.getDeleteCbos().addAll(cboList);
//            codeOsbtmtypeMapper.deleteBatchIds(cboList);
////            boService.persistenceBatch(batchCBO);
//        } else {
//            lifeCycleService.transCboStatus(cboList, baseModelDTO.getLcStatus());
//        }
//        lifeCycleService.transCboStatus(codeCbos, baseModelDTO.getLcStatus());
    }


    /**
     * ç”³è¯·å•ä¸€ç¼–码
     *
     * @param orderDTO ç”³è¯·çš„信息，需要包含属性的内容和码段相关的内容
     * @return è¿”回编码的内容
     */
    @Override
    public String addSaveCode(CodeOrderDTO orderDTO) {
        VciBaseUtil.alertNotNull(orderDTO, "编码申请相关的属性和码段的内容都为空", orderDTO.getCodeClassifyOid(), "主题库分类的主键",
            orderDTO.getTemplateOid(), "模板的主键", orderDTO.getCodeRuleOid(), "编码规则的主键");
        CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
        CodeClstemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
        CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());
        //1.判断规则中除了流水码段，是否有其他码段
        checkSecValueOnOrder(ruleVO, orderDTO);
        //2.判断必输项
        checkRequiredAttrOnOrder(templateVO, orderDTO);
        //3.先注入，再组合，最后校验
        switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
        //4.处理组合规则。组合规则不能使用编码的属性，因为编码的生成可能是需要属性的
        switchComponentAttrOnOrder(templateVO, orderDTO);
        //5.校验规则
        checkVerifyOnOrder(templateVO, orderDTO);
        //6.关键属性
        checkKeyAttrOnOrder(classifyFullInfo, templateVO, orderDTO);
        //7.枚举转换
        checkEnumOnOrder(templateVO, orderDTO);
        //8.处理时间格式，在数据库里面不论是字符串还是日期格式，都使用相同的格式存储
        switchDateAttrOnOrder(templateVO, orderDTO);
        //9.生成编码的信息
//        ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
//        CodeWupinEntity cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
//        //默认的属性都不用从前端拷贝
//        //设置编码需要的默认属性的内容
//        copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
//        //TODO:因为默认的属性都不拷贝，目前集团码叫name，并没有从DTO拷贝到cbo里。增加一个单独处理，以后再看要不要调整
//        cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
//        //end -- modify by lihang @20220407
//        List<CodeWupinEntity> cboList = new ArrayList<>();
//
//        //备注
//        cbo.setDescription(orderDTO.getDescription());
//
//        cboList.add(cbo);
//        List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(),cboList);
////        batchSaveSelectChar(templateVO, cboList);
//        return codeList.size() > 0 ? codeList.get(0) : "";
        return null;
    }

    /**
     * å¤„理分类注入的信息
     *
     * @param templateVO         æ¨¡æ¿çš„显示对象，必须要后模板的属性
     * @param classifyFullInfoBO åˆ†ç±»çš„全路径
     * @param orderDTO           ç¼–码申请的信息
     */
    private void switchClassifyLevelOnOrder(CodeClstemplateVO templateVO, CodeClassifyFullInfoBO classifyFullInfoBO, CodeOrderDTO orderDTO) {
        Map<String,CodeClstempattrVO> classifyAttrVOMap = templateVO.getAttributes().stream().filter(
            s -> StringUtils.isNotBlank(s.getClassifyinvokeattr()) && StringUtils.isNotBlank(s.getClassifyinvokelevel())
        ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
        if (classifyFullInfoBO.getTopClassifyVO() == null) {
            //需要重新查询一下，因为这个是指定的分类进来的

        }
        if (!CollectionUtils.isEmpty(classifyAttrVOMap)) {
            classifyAttrVOMap.forEach((attrId, attrVO) -> {
                //分类注入的编号或者名称，
                //层级包含指定层和最小层
                CodeClassifyVO classifyVO = null;
                if (!CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(attrVO.getClassifyinvokelevel()) && !"min".equalsIgnoreCase(attrVO.getClassifyinvokelevel())) {
                    //指定了层级的
                    //注意，因为查询上级分类出来的层级是倒序的，即顶层节点是最大的值
                    List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
                    int level = VciBaseUtil.getInt(attrVO.getClassifyinvokelevel());
                    if (classifyVOS.size() >= level && level > 0) {
                        classifyVO = classifyVOS.get(level - 1);
                    }
                } else {
                    //当前的分类
                    classifyVO = classifyFullInfoBO.getCurrentClassifyVO();
                }
                if (classifyVO == null) {
                    //说明层级有误
                    orderDTO.getData().put(attrId, "分类树上没有层级[" + attrVO.getClassifyinvokelevel() + "]");
                    // classifyVO = classifyFullInfoBO.getCurrentClassifyVO();
                } else {
                    Map<String, String> classifyDataMap = VciBaseUtil.objectToMapString(classifyVO);
                    String value = classifyDataMap.getOrDefault(attrVO.getClassifyinvokeattr(), "");
                    orderDTO.getData().put(attrId, value);
                }
            });
        }
    }


    /**
     * åˆ¤æ–­ç¼–码的码段是否输入或者选择了码值
     *
     * @param ruleVO   è§„则的显示对象
     * @param orderDTO ç¼–码申请的内容
     */
    @Override
    public void checkSecValueOnOrder(CodeRuleVO ruleVO, CodeOrderDTO orderDTO) {
        List<String> unSerialSecOidList = ruleVO.getSecVOList().stream().filter(
            s -> !(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(s.getSecType())
                || CodeSecTypeEnum.CODE_ATTR_SEC.getValue().equalsIgnoreCase(s.getSecType())
                || CodeSecTypeEnum.CODE_DATE_SEC.getValue().equalsIgnoreCase(s.getSecType())
                || CodeSecTypeEnum.CODE_LEVEL_SEC.getValue().equalsIgnoreCase(s.getSecType())
                || VciBaseUtil.getBoolean(s.getNullableFlag()))
        ).map(CodeBasicSecVO::getOid).collect(Collectors.toList());
        if (!CollectionUtils.isEmpty(unSerialSecOidList)) {
            if (CollectionUtils.isEmpty(orderDTO.getSecDTOList())) {
                throw new VciBaseException("非流水码段(或者必输码段）必须要输入(或选择)码值");
            }
            if (orderDTO.getSecDTOList().stream().anyMatch(s -> !unSerialSecOidList.contains(s.getSecOid())
                && StringUtils.isBlank(s.getSecValue()))) {
                throw new VciBaseException("非流水码段(或者必输码段）必须要输入(或选择)码值");
            }
        }
    }

    /**
     * æ ¡éªŒå±žæ€§æ˜¯å¦ä¸ºå¿…输
     *
     * @param templateVO æ¨¡æ¿çš„显示对象，需要包含模板属性
     * @param orderDTO   ç¼–码申请的信息
     */
    private void checkRequiredAttrOnOrder(CodeClstemplateVO templateVO, CodeOrderDTO orderDTO) {
        Map<String, CodeClstempattrVO> requiredAttrMap = templateVO.getAttributes().stream().filter(
                s -> VciBaseUtil.getBoolean(s.getRequireflag()) && StringUtils.isBlank(s.getComponentrule())
                    && StringUtils.isBlank(s.getClassifyinvokeattr()))
            .collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
        if (!CollectionUtils.isEmpty(requiredAttrMap)) {
            requiredAttrMap.forEach((attrId, attrVO) -> {
                //只有企业编码，状态，备注，模板主键，分类主键这几个是固定的，其余都是自行配置的
                if (StringUtils.isBlank(getValueFromOrderDTO(orderDTO, attrId))) {
                    throw new VciBaseException("属性【{0}】必须要输入(选择)内容", new String[]{attrVO.getName()});
                }
            });
        }
    }

    /**
     * ä»Žç¼–码申请信息对象上获取某个属性的值
     *
     * @param orderDTO ç¼–码申请对象
     * @param attrId   å±žæ€§çš„编号
     * @return å€¼
     */
    private String getValueFromOrderDTO(CodeOrderDTO orderDTO, String attrId) {
        attrId = attrId.toLowerCase(Locale.ROOT);
        String value = null;
        if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)) {
            value = WebUtil.getStringValueFromObject(WebUtil.getValueFromField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO));
        } else {
            //说明是自行配置的
            //前端必须要传递小写的属性
            value = orderDTO.getData().getOrDefault(attrId, "");
        }
        return value;
    }

    /**
     * è½¬æ¢ç»„合规则的值
     *
     * @param templateVO æ¨¡æ¿çš„显示对象，需要包含模板属性
     * @param orderDTO   ç¼–码申请的信息
     */
    private void switchComponentAttrOnOrder(CodeClstemplateVO templateVO, CodeOrderDTO orderDTO) {
        Map<String, CodeClstempattrVO> compAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getComponentrule())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
        if (!CollectionUtils.isEmpty(compAttrVOMap)) {
            Map<String, String> dataMap = WebUtil.objectToMapString(orderDTO);

            Map<String, String> dataLowMap = new HashMap<>();
            if (!CollectionUtils.isEmpty(dataMap)) {
                dataMap.forEach((key, value) -> {
                    dataLowMap.put(key.toLowerCase(Locale.ROOT), value);
                });
            }
            dataLowMap.putAll(orderDTO.getData());
            compAttrVOMap.forEach((attrId, attrVO) -> {
//                dataLowMap.put(attrId, formulaService.getValueByFormula(dataLowMap, attrVO.getComponentrule()));
            });
            dataLowMap.forEach((key, value) -> {
                setValueToOrderDTO(orderDTO, key, value);
            });
        }
    }


    /**
     * è®¾ç½®æ–°çš„值到申请对象上
     *
     * @param orderDTO ç¼–码申请对象
     * @param attrId   å±žæ€§çš„编号
     * @param value    å€¼
     */
    private void setValueToOrderDTO(CodeOrderDTO orderDTO, String attrId, String value) {
        attrId = attrId.toLowerCase(Locale.ROOT);
        if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)) {
            WebUtil.setValueToField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO, value);
        } else {
            orderDTO.getData().put(attrId, value);
        }
    }

    /**
     * æ ¡éªŒæ­£åˆ™è¡¨è¾¾å¼æ˜¯å¦æ­£ç¡®
     *
     * @param templateVO æ¨¡æ¿çš„信息，必须包含属性的内容
     * @param orderDTO   ç¼–码申请的相关的信息
     */
    private void checkVerifyOnOrder(CodeClstemplateVO templateVO, CodeOrderDTO orderDTO) {
        Map<String, CodeClstempattrVO> verifyAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getVerifyrule())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
        if (!CollectionUtils.isEmpty(verifyAttrVOMap)) {
            verifyAttrVOMap.forEach((attrId, attrVO) -> {
                String value = getValueFromOrderDTO(orderDTO, attrId);
                if (StringUtils.isNotBlank(value) && !value.matches(attrVO.getVerifyrule())) {
                    //校验正则表达式
                    throw new VciBaseException("属性[{0}]的值不符合校验规则的要求", new String[]{attrVO.getName()});
                }
            });
        }
    }

    /**
     * æ ¡éªŒå…³é”®å±žæ€§
     *
     * @param classifyFullInfo åˆ†ç±»çš„全部信息
     * @param templateVO       æ¨¡æ¿çš„内容，必须包含模板属性
     * @param orderDTO         ç¼–码申请的相关的信息
     */
    private void checkKeyAttrOnOrder(CodeClassifyFullInfoBO classifyFullInfo, CodeClstemplateVO templateVO, CodeOrderDTO orderDTO) {
        //先获取关键属性的规则，也利用继承的方式
        CodeKeyattrrepeatVO keyRuleVO = keyRuleService.getRuleByClassifyFullInfo(classifyFullInfo);
        //注意的是keyRuleVO可能为空，表示不使用规则控制
        //获取所有的关键属性
        Map<String, CodeClstempattrVO> ketAttrMap = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getKeyattrflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
        Map<String, String> conditionMap = new HashMap<>();
        boolean trimAll = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
        //全部去空的优先级大于去空
        boolean trim = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
        boolean ignoreCase = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorecaseflag());
        boolean ignoreWidth = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorewidthflag());
        ketAttrMap.forEach((attrId, attrVO) -> {
            String value = getValueFromOrderDTO(orderDTO, attrId);
            if (value == null) {
                value = "";
            }
//            wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
        });

        //没有限制分类，但是一个模板只可能在一个业务类型里面，所以直接查询这个业务类型即可

//        if (!CollectionUtils.isEmpty(conditionMap)) {
//            final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
//            conditionMap.forEach((key, value) -> {
//                sql[0] += " and " + key + " = " + value;
//            });
//            if (StringUtils.isNotBlank(orderDTO.getOid())) {
//                //修改的时候，需要排除自己
//                sql[0] += " and oid != '" + orderDTO.getOid() + "'";
//            } else if (StringUtils.isNotBlank(orderDTO.getCopyFromVersion())) {
//                sql[0] += " and oid != '" + orderDTO.getCopyFromVersion() + "'";
//            }
//            sql[0] += " and islastR = '1' and islastV = '1' ";
//            if (boService.queryCountBySql(sql[0], new HashMap<>()) > 0) {
//                String ruleInfoMsg = keyRuleVO == null ? "" : "查询规则：去除空格--{0},忽略大小写--{1},忽略全半角--{2},忽略全部空格--{3}";
//                String[] objs = new String[]{trim ? "是" : "否", ignoreCase ? "是" : "否", ignoreWidth ? "是" : "否", trimAll ? "是" : "否"};
//                throw new VciBaseException("根据您填写的关键属性的内容，结合关键属性查询规则，发现这个数据已经在系统中存在了。请修正!。" + ruleInfoMsg, objs);
//            }
//        }
    }

    /**
     * å°è£…关键属性的查询语句
     *
     * @param value        å½“前的值
     * @param keyRuleVO    å…³é”®å±žæ€§çš„控制规则，可以为空
     * @param attrId       å±žæ€§çš„编号
     * @param trim         æ˜¯å¦åŽ»é™¤ç©ºæ ¼
     * @param ignoreCase   æ˜¯å¦ä¸åŒºåˆ†å¤§å°å†™
     * @param ignoreWidth  æ˜¯å¦å¿½ç•¥å…¨åŠè§’
     * @param trimAll      æ˜¯å¦å¿½ç•¥å…¨éƒ¨ç©ºæ ¼
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     */
//    @Override
//    public void wrapperKeyAttrConditionMap(String value, CodeKeyattrrepeatVO keyRuleVO, String attrId,
//                                           boolean trim, boolean ignoreCase, boolean ignoreWidth,
//                                           boolean trimAll, Map<String, String> conditionMap) {
//        boolean ignoreSpace = trim || trimAll;
//        if (StringUtils.isBlank(value)) {
//            //为空的时候，不能用QueryOperation.ISNULL，平台不知道啥时候不处理这种了
//            conditionMap.put("t."+attrId, "null");
//        } else {
//            if (keyRuleVO != null) {
//                String queryKey = "";
//                String queryValue = "";
//
//                String temp = "";
//                if (ignoreCase && ignoreSpace && ignoreWidth) {
//                    //忽略大小写，且去空，忽略全半角
//                    temp = (trimAll ? "REPLACE" : "TRIM") + "(UPPER(to_single_byte(%s)) " + (trimAll ? ",' ','')" : ")");
//                } else if (ignoreCase && ignoreSpace && !ignoreWidth) {
//                    //忽略大小写、去空、不忽略全半角
//                    temp = (trimAll ? "REPLACE" : "TRIM") + "(UPPER(%s) " + (trimAll ? ",' ','')" : ")");
//                } else if (ignoreCase && !ignoreSpace && ignoreWidth) {
//                    //忽略大小写、不去空、忽略全半角
//                    temp = "UPPER(to_single_byte(%s))";
//                } else if (!ignoreCase && ignoreSpace && ignoreWidth) {
//                    //不忽略大小写、去空、忽略全半角
//                    temp = (trimAll ? "REPLACE" : "TRIM") + "(to_single_byte(%s) " + (trimAll ? ",' ','')" : ")");
//                } else if (ignoreCase && !ignoreSpace && !ignoreWidth) {
//                    //忽略大小写、不去空、不忽略全半角
//                    temp = "UPPER(%s)";
//                } else if (!ignoreCase && !ignoreCase && ignoreWidth) {
//                    //不忽略大小写、不去空、忽略全半角
//                    temp = "to_single_byte(%s)";
//                } else if (!ignoreCase && ignoreSpace && !ignoreWidth) {
//                    //不忽略大小写、去空、不忽略全半角
//                    temp = (trimAll ? "REPLACE" : "TRIM") + "(%s " + (trimAll ? ",' ','')" : ")");
//                } else if (!ignoreCase && !ignoreSpace && !ignoreWidth) {
//                    //不忽略大小写、不去空、不忽略全半角
//                    temp = "%s";
//                }
//                queryKey = String.format(temp, "t."+attrId);
//                queryValue = String.format(temp, "'" + (trim ? value.trim() : value) + "'");
//                conditionMap.put(queryKey, queryValue);
//            } else {
//                //为空的时候不代表不校验，只是不去除相关的信息
//                conditionMap.put("t."+attrId, value);
//            }
//        }
//    }

    /**
     * æ ¡éªŒæžšä¸¾çš„内容
     *
     * @param templateVO æ¨¡æ¿çš„显示对象，需要包含属性
     * @param orderDTO   ç¼–码申请的信息
     */
    private void checkEnumOnOrder(CodeClstemplateVO templateVO, CodeOrderDTO orderDTO) {
        //如果枚举可以修改，则不需要校验是否符合枚举的选项

        Map<String, CodeClstempattrVO> enumAttrVOMap = templateVO.getAttributes().stream().filter(s -> (StringUtils.isNotBlank(s.getEnumstring()) || StringUtils.isNotBlank(s.getEnumid())) && !VciBaseUtil.getBoolean(s.getEnumeditflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
        if (!CollectionUtils.isEmpty(enumAttrVOMap)) {
            enumAttrVOMap.forEach((attrId, attrVO) -> {
                String value = getValueFromOrderDTO(orderDTO, attrId);
                if (StringUtils.isNotBlank(value)) {
                    //有值才能校验
                    List<KeyValue> comboboxKVs = listComboboxItems(attrVO);
                    if (!comboboxKVs.stream().anyMatch(s -> value.equalsIgnoreCase(s.getKey()))) {
                        throw new VciBaseException("属性【{0}】的值不符合枚举的要求", new String[]{attrVO.getName()});
                    }
                }
            });
        }
    }

    /**
     * è½¬æ¢æ—¶é—´çš„格式
     *
     * @param templateVO æ¨¡æ¿çš„显示对象，需要包含属性
     * @param orderDTO   ç¼–码申请的信息
     */
    private void switchDateAttrOnOrder(CodeClstemplateVO templateVO, CodeOrderDTO orderDTO) {
        Map<String, CodeClstempattrVO> dateAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getCodedateformat())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
        if (!CollectionUtils.isEmpty(dateAttrVOMap)) {
            dateAttrVOMap.forEach((attrId, attrVO) -> {
                String value = getValueFromOrderDTO(orderDTO, attrId);
                if (StringUtils.isNotBlank(value)) {
                    DateConverter dateConverter = new DateConverter();
                    dateConverter.setAsText(value);
                    value = VciDateUtil.date2Str(dateConverter.getValue(), VciDateUtil.DateTimeMillFormat);
                    setValueToOrderDTO(orderDTO, attrId, value);
                }
            });
        }
    }

    /**
     * æ‹·è´æ•°æ®åˆ°cbo对象上
     *
     * @param classifyFullInfo åˆ†ç±»çš„全部信息
     * @param cbo              ä¸šåŠ¡æ•°æ®
     * @param orderDTO         ç¼–码申请的信息
     * @param templateVO       æ¨¡æ¿çš„显示对象
     * @param edit             æ˜¯å¦ä¸ºä¿®æ”¹
     */
    private void copyValueToCBO(CodeClassifyFullInfoBO classifyFullInfo, CodeWupinEntity cbo,
                                CodeOrderDTO orderDTO, CodeClstemplateVO templateVO,
                                boolean edit) {
        String fullPath = "";
        if (!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())) {
            fullPath = classifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel())))
                .map(CodeClassifyVO::getOid).collect(Collectors.joining("##"));
        } else {
            fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
        }

//        BeanUtils.
        BeanUtils.copyProperties(orderDTO.getData(),cbo);
        cbo.setMaterialtype(Short.valueOf("1001"));
//        orderDTO.getData().forEach((key, value) -> {
//            if (!edit || (!checkUnAttrUnEdit(key) &&
//                !VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
//                try {
//                    cbo.setAttributeValue(key, value);
//                } catch (Exception e) {
//                    logger.error("设置属性的值错误", e);
//                }
//            }
//        });
        try {

            cbo.setCodeclsfid(classifyFullInfo.getCurrentClassifyVO().getOid());
            cbo.setCodetemplateoid(templateVO.getOid());
            cbo.setCodeclsfpath(fullPath);
//            cbo.setMaterialclassify("model_type");
//            cbo.setMaterialname(orderDTO.getData().get("materialname"));
//            cbo.setShifoupihaoguanli("true");
//            cbo.setKucunwl("true");
//            cbo.setXiaoshouwl("false");
            if (!edit && StringUtils.isBlank(orderDTO.getLcStatus())) {
                //找生命周期的起始状态，插个点，看生命周期是否需要创建
                if (StringUtils.isNotBlank(cbo.getLctid())) {
//                    OsLifeCycleVO lifeCycleVO = lifeCycleService.getLifeCycleById(cbo.getLctid());
//                    if (lifeCycleVO != null) {
//                        cbo.setLcStatus("Editing");
////                        cbo.setLcStatus(lifeCycleVO.getStartStatus());
//                    } else {
                        cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
//                    }
                } else {
                    cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
                }

            }

            int secret = VciBaseUtil.getInt(cbo.getSecretGrade().toString());
            //插个点，后续看密级服务是否可用
//            if (secret == 0 || !secretService.checkDataSecret(secret)) {
            if (secret == 0 ) {
                Integer userSecret = VciBaseUtil.getCurrentUserSecret();
//                cbo.setAttributeValue(SECRET_FIELD, String.valueOf((userSecret == null || userSecret == 0) ? UserSecretEnum.NONE.getValue() : userSecret));
                cbo.setSecretGrade(userSecret == null || userSecret == 0 ? UserSecretEnum.NONE.getValue() : userSecret);
            }
        } catch (Throwable e) {
            logger.error("设置默认的属性的值错误", e);
        }
    }


    /**
     * åˆå§‹åŒ–业务类型
     * --创建人默认为当前用户，如果需要修改，可以在获取后自行处理
     * @param btmName ä¸šåŠ¡ç±»åž‹çš„名称，会自动变成小写
     * @return CodeWupinEntity
     * @throws VciBaseException åˆå§‹åŒ–出错的是会抛出异常
     */
//    @Override
//    public CodeWupinEntity createCBOByBtmName(String btmName)
//        throws VciBaseException {
//        if(btmName!=null){
//            btmName = btmName.trim().toLowerCase();
//        }
//        String userid = AuthUtil.getUser().getUserName();
////        if(!hasCreatedCbos.containsKey(btmName)){
////            if(StringUtils.isEmpty(userid)){
////                throw new VciBaseException(msgCodePrefix +"noHasUserid");
////            }
////            try {
////                hasCreatedCbos.put(btmName, createBusinessObject(btmName));
////            } catch (Exception e) {
////                logger.error("创建业务类型对象",e);
////                throw new VciBaseException(msgCodePrefix + "initBoError",new String[]{btmName});
////            }
////        }
////        ClientBusinessObject cbo = cloneClientBusinessObject(hasCreatedCbos.get(btmName));
//
//        QueryWrapper<CodeOsbtmtypeEntity> btmWrapper = new QueryWrapper<>();
//        btmWrapper.eq("ID",btmName);
//        CodeOsbtmtypeEntity btmTypeVO = codeOsbtmtypeMapper.selectOne(btmWrapper);
////        OsBtmTypeVO btmTypeVO = btmService.getBtmById(boName);
//        String userName = AuthUtil.getUser().getUserName();
//        CodeWupinEntity wupinEntity = new CodeWupinEntity();
//        wupinEntity.setOid(null);
////        bo.setRevisionid((new ObjectUtility()).getNewObjectID36());
////        bo.setNameoid((new ObjectUtility()).getNewObjectID36());
//        wupinEntity.setBtmname(btmName);
//        wupinEntity.setLastR(String.valueOf(1));
//        wupinEntity.setFirstR(String.valueOf(1));
//        wupinEntity.setFirstV(String.valueOf(1));
//        wupinEntity.setLastV(String.valueOf(1));
//        wupinEntity.setCreator(userName);
//        wupinEntity.setCreateTime(new Date());
//        wupinEntity.setLastModifier(userName);
//        wupinEntity.setLastModifyTime(new Date());
//        wupinEntity.setRevisionRule(btmTypeVO.getRevisionruleid());
//        wupinEntity.setVersionRule(String.valueOf(btmTypeVO.getVersionRule()));
//        if(StringUtils.isNotBlank(btmTypeVO.getRevisionruleid())){
//            //插个点，需要问勇哥版本问题，展示默认为1
////            OsRevisionRuleVO revisionRuleVO = revisionRuleService.getRevisionRuleById(btmTypeVO.getRevisionruleid());
//            wupinEntity.setRevisionValue("1");
//        }
//
//        wupinEntity.setRevisionSeq(1);
//        wupinEntity.setVersionSeq(1);
//        //插个点，需要问勇哥版本问题，展示默认为1
//        wupinEntity.setVersionValue("1");
//        wupinEntity.setLctid("wupinLC");
//        wupinEntity.setLcStatus("Editing");
//        wupinEntity.setId("");
//        wupinEntity.setName("");
//        wupinEntity.setDescription("");
//        wupinEntity.setOwner(userName);
//        wupinEntity.setCheckinby(userName);
//        wupinEntity.setCopyFromVersion("");
//        wupinEntity.setMaterialtype((short) 1001);
//        wupinEntity.setCaigouwl("true");
//        wupinEntity.setShifoupihaoguanli("true");
//        wupinEntity.setKucunwl("true");
//        wupinEntity.setXiaoshouwl("false");
//        wupinEntity.setPassing("true");
//
////        this.initTypeAttributeValue(wupinEntity,btmTypeVO);
//        return wupinEntity;
//
//
////        return cbo;
//    }

    /**
     * æ˜¯å¦ä¸ºä¿®æ”¹å¿½ç•¥çš„属性
     * @param attrName å±žæ€§çš„名字
     * @return true è¡¨ç¤ºåº”该忽略
     */
    boolean checkUnAttrUnEdit(String attrName){
        return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
            ||"ts".equalsIgnoreCase(attrName)
            || "lastmodifier".equalsIgnoreCase(attrName)
            || "lastmodifytime".equalsIgnoreCase(attrName)
            || "createtime".equalsIgnoreCase(attrName)
            || "checkintime".equalsIgnoreCase(attrName)
            ||"checkouttime".equalsIgnoreCase(attrName));
    }

    /**
     * ä¿å­˜å¯è¾“可选的信息
     *
     * @param templateVO æ¨¡æ¿çš„对象
     * @param cboList    æ•°æ®çš„内容
     */
//    @Override
//    public void batchSaveSelectChar(CodeClstemplateVO templateVO, List<ClientBusinessObject> cboList) {
//        if (templateVO != null && !CollectionUtils.isEmpty(cboList)) {
//            //是异步的，所以直接循环
//            List<CodeClstempattrVO> selectAttrVOs = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getLibraryidentification())).collect(Collectors.toList());
//
//            if (!CollectionUtils.isEmpty(selectAttrVOs)) {
////                SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
//                selectAttrVOs.parallelStream().forEach(attrVO -> {
//                    List<String> valuesList = new CopyOnWriteArrayList<>();
//                    cboList.parallelStream().forEach(cbo -> {
//                        String value = cbo.getAttributeValue(attrVO.getId());
//                        if (StringUtils.isNotBlank(value)) {
//                            valuesList.add(value);
//                        }
//                    });
//                    if (!CollectionUtils.isEmpty(valuesList)) {
//                        charService.saveBySameNamespaceAndFlag(templateVO.getBtmTypeId(), attrVO.getLibraryIdentification(), valuesList, sessionInfo);
//                    }
//                });
//            }
//        }
//    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,419 @@
package com.vci.ubcs.code.service.impl;

import com.alibaba.nacos.common.utils.StringUtils;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.MdmEngineService;
import com.vci.ubcs.code.service.MdmIOService;
import com.vci.ubcs.code.vo.CodeClstempattrVO;
import com.vci.ubcs.code.vo.CodeClstemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.poi.bo.ReadExcelOption;
import com.vci.ubcs.starter.poi.bo.SheetDataSet;
import com.vci.ubcs.starter.poi.bo.SheetRowData;
import com.vci.ubcs.starter.poi.bo.WriteExcelOption;
import com.vci.ubcs.starter.poi.util.ExcelUtil;
import com.vci.ubcs.starter.util.LocalFileUtil;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;

import static com.alibaba.druid.util.FnvHash.Constants.LIMIT;
import static com.vci.ubcs.code.constant.MdmEngineConstant.CODE_FIELD;
import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_ATTR_LIST;
import static com.vci.ubcs.starter.poi.util.ExcelUtil.KEY_ATTR_CHAR;
import static com.vci.ubcs.starter.poi.util.ExcelUtil.REQUIRED_CHAR;

@Service
public class MdmIOServiceImpl implements MdmIOService {


    /**
     * ä¸»é¢˜åº“分类的服务
     */
    @Resource
    private ICodeClassifyService classifyService;

    /**
     * æ¨¡æ¿çš„服务
     */
    @Resource
    private CodeClstemplateServiceImpl templateService;

    /**
     * ä¸»æ•°æ®å¼•æ“Žçš„服务
     */
    @Resource
    private MdmEngineService engineService;

    /**
     * ç”Ÿæˆå¯¼å…¥çš„文件
     *
     * @param codeClassifyOid åˆ†ç±»çš„主键
     * @param isHistory æ˜¯å¦åŽ†å²æ•°æ®å¯¼å…¥
     * @return excel的文件地址
     */
    @Override
    public String createImportExcel(String codeClassifyOid, boolean isHistory) {
        List<CodeClstemplateVO> templateVOList=new ArrayList<>();

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

        CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);

        if(isHistory){
            templateVOList= templateService.childTemplates(codeClassifyOid);
        }else{
            //找模板
            CodeClstemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyOid);
            templateVOList.add(templateVO);
        }

        WriteExcelOption eo = new WriteExcelOption();
        eo.setAppend(true);
        //增加模板的信息导入
        LinkedList<WriteExcelData> tempEDList = new LinkedList<>();
        tempEDList.add(new WriteExcelData(0,0,"模板主键"));
        tempEDList.add(new WriteExcelData(0,1,"模板代号"));
        tempEDList.add(new WriteExcelData(0,2,"模板名称"));
        for(int j=0;j<templateVOList.size();j++){
            CodeClstemplateVO  templateVO=templateVOList.get(j);

            //组合格式的不导入，
            // æžšä¸¾çš„提供序列的选择
            //时间全部统一为yyyy-MM-dd HH:mm:ss
            //参照的自行输入名称
            //分类注入的不用，都是导入后自动处理的
            //编码，状态等字段不导入
            List<CodeClstempattrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
                !DEFAULT_ATTR_LIST.contains(s.getId())
                    && StringUtils.isBlank(s.getComponentrule())
                    && StringUtils.isBlank(s.getClassifyinvokeattr())
                    && (isHistory || VciBaseUtil.getBoolean(s.getFormdisplayflag()))
            ).collect(Collectors.toList());

            if(CollectionUtils.isEmpty(templateAttrVOS)){
                throw new VciBaseException("模板没有配置任何【表单显示】为【是】的属性");
            }
            List<CodeClstempattrVO> idAttrVOList = templateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(CODE_FIELD)).collect(Collectors.toList());
            LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
            Workbook workbook = new HSSFWorkbook();
            if(isHistory){
                excelDataList.add(new WriteExcelData(0,0,"分类路径"));
                excelDataList.add(new WriteExcelData(0,1,"码段宽度"));
                excelDataList.add(new WriteExcelData(0,2,!CollectionUtils.isEmpty(idAttrVOList)?idAttrVOList.get(0).getName():"企业编码"));
            }
            for (int i = 0; i < templateAttrVOS.size(); i++) {
                CodeClstempattrVO attrVO = templateAttrVOS.get(i);

                Object text = attrVO.getName();
                text = exportKeyAndRequired(workbook,attrVO,text);
                int colIndex = (isHistory?3:0) + i;
                WriteExcelData excelData = new WriteExcelData(0, colIndex, text);
                if(StringUtils.isNotBlank(attrVO.getCodedateformat())
                    || VciFieldTypeEnum.VTDateTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())
                    || VciFieldTypeEnum.VTDate.name().equalsIgnoreCase(attrVO.getAttributedatatype())
                    ||VciFieldTypeEnum.VTTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
                    excelData.setDateFormat(VciDateUtil.DateTimeFormat);
                }
                if(text instanceof RichTextString){
                    excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
                }
                excelDataList.add(excelData);
                if(StringUtils.isNotBlank(attrVO.getEnumstring()) || StringUtils.isNotBlank(attrVO.getEnumid())){
                    //添加数据有效性
                    List<String> enumValueList = new ArrayList<>();
                    enumValueList.add("");
                    List<KeyValue> valueList = engineService.listComboboxItems(attrVO);
                    if(!CollectionUtils.isEmpty(valueList)){
                        valueList.stream().forEach(kv->{
                            enumValueList.add(kv.getValue());
                        });
                    }
                    //默认加1万条
                    WriteExcelData ed = new WriteExcelData(1,colIndex,"");
                    ed.setRowTo(100);
                    ed.setColTo(colIndex);
                    ed.setValidation(true);
                    ed.setValidationDataList(enumValueList);
                    ed.setValidationErrorMsg("请在序列中选择正确的值");
                    excelDataList.add(ed);
                }
                if(VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
                    List<String> booleanList = new ArrayList<>();

                    booleanList.add("是");
                    booleanList.add("否");
                    //默认加1万条
                    WriteExcelData ed = new WriteExcelData(1,colIndex,"");
                    ed.setRowTo(100);
                    ed.setColTo(colIndex);
                    ed.setValidation(true);
                    ed.setValidationDataList(booleanList);
                    ed.setValidationErrorMsg("请在序列中选择正确的值");
                    excelDataList.add(ed);
                }
            }
            eo.addSheetDataList(j+templateVO.getName(),excelDataList);
            tempEDList.add(new WriteExcelData(j+1,0,templateVO.getOid()));
            tempEDList.add(new WriteExcelData(j+1,1,templateVO.getId()));
            tempEDList.add(new WriteExcelData(j+1,2,templateVO.getName()));
        }
        String excelName = LocalFileUtil.getDefaultTempFolder() + File.separator + codeClassifyVO.getName() + (isHistory?"_历史数据导入模板.xls": "_导入模板.xls");
        eo.addSheetDataList(templateVOList.size()+"模板信息【请勿删除或移动】",tempEDList);
        ExcelUtil.writeDataToFile(excelName,eo);
        return excelName;
    }

    /**
     * å¯¼å‡ºçš„时候封装必输和关键属性
     * @param attrVO å±žæ€§çš„显示对象
     * @param text å•å…ƒæ ¼çš„值
     */
    private Object exportKeyAndRequired(Workbook workbook,CodeClstempattrVO attrVO,Object text){
        //必输加*，关键属性为蓝色
        if (VciBaseUtil.getBoolean(attrVO.getRequireflag()) || VciBaseUtil.getBoolean(attrVO.getKeyattrflag())) {
            String value = text.toString();
            if(VciBaseUtil.getBoolean(attrVO.getRequireflag())) {
                value += REQUIRED_CHAR;
            }
            if(VciBaseUtil.getBoolean(attrVO.getKeyattrflag())){
                value += KEY_ATTR_CHAR;
            }
            RichTextString ts = new HSSFRichTextString(value);
            if(VciBaseUtil.getBoolean(attrVO.getRequireflag())){
                Font font =  workbook.createFont();
                font.setColor(HSSFColor.HSSFColorPredefined.RED.getIndex());
                ts.applyFont(font);
            }

            if(VciBaseUtil.getBoolean(attrVO.getKeyattrflag())){
                Font font =  workbook.createFont();
                font.setColor(HSSFColor.HSSFColorPredefined.BLUE.getIndex());
                ts.applyFont(font);
            }
            return ts;
        }
        return text;
    }


    /**
     * æ‰¹é‡ç”³è¯·ç¼–码数据
     *
     * @param orderDTO ç¼–码申请信息，必须包含分类主键和码段的信息
     * @param file     excel文件的信息
     * @return  æœ‰é”™è¯¯ä¿¡æ¯çš„excel的文件
     */
    @Override
    public CodeImProtRusultVO batchImportCode(CodeOrderDTO orderDTO, File file) {
        VciBaseUtil.alertNotNull(orderDTO,"编码申请相关的数据",orderDTO.getCodeClassifyOid(),"主题库分类主键");
        ReadExcelOption reo = new ReadExcelOption();
        reo.setReadAllSheet(true);
        List<SheetDataSet> sheetDataSetList = ExcelUtil.readDataObjectFromExcel(file,null,reo);
        if(CollectionUtils.isEmpty(sheetDataSetList) || CollectionUtils.isEmpty(sheetDataSetList.get(0).getRowData())
            ||sheetDataSetList.get(0).getRowData().size()<1){
            throw new VciBaseException("没有读取到任何的数据");
        }
        if(sheetDataSetList.size()>LIMIT+1){
            throw new VciBaseException("为了保证系统的稳定性，请一次不要导入超过1万条的数据");
        }
        //先找到每一行的标题，然后根据标题来获取对应的属性
        SheetDataSet dataSet = sheetDataSetList.get(0);
        //找第一行，为了找标题
        CodeClstemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(orderDTO.getCodeClassifyOid());

        //校验模板是不是最新的
        checkTemplateSync(sheetDataSetList,templateVO,0);
        //先不用管属性是否都存在，先转换一下数据
        Map<String,String> errorMap = new HashMap<>();
        String redisUUid=batchImportCodes(orderDTO,templateVO,dataSet,errorMap,true);
        CodeImProtRusultVO codeImProtRusultVO = new CodeImProtRusultVO();
        List<String> needRowIndexList = new ArrayList<>();
//        String filePath = returnErrorToExcel(dataSet.getRowData(), errorMap, needRowIndexList, dataSet.getColName());
//        if(StringUtils.isNotBlank(filePath)) {
//            codeImProtRusultVO.setFilePath(filePath);
//        }
//        if(StringUtils.isNotBlank(redisUUid)){
//            codeImProtRusultVO.setRedisUuid(redisUUid);
//        }
        return null;
//        return codeImProtRusultVO;
    }

    /**
     * æ ¡éªŒæ¨¡æ¿æ˜¯å¦ä¸ºåŒæ­¥çš„
     * @param sheetDataSetList excel里的内容
     * @param templateVO æ¨¡æ¿çš„信息
     */
    private void checkTemplateSync(List<SheetDataSet> sheetDataSetList,CodeClstemplateVO templateVO,int i){
        String templateOidInExcel = "";
        String templateName="";
        if(!CollectionUtils.isEmpty(sheetDataSetList)
            && sheetDataSetList.size()>1 && !CollectionUtils.isEmpty(sheetDataSetList.get(sheetDataSetList.size()-1).getColName())){
            List<SheetRowData>  rowData=  sheetDataSetList.get(sheetDataSetList.size()-1).getRowData();
            templateName=rowData.get(i).getData().get(2);
            templateOidInExcel=rowData.get(i).getData().get(0);
            //templateOidInExcel = sheetDataSetList.get(sheetDataSetList.size()-1).getColName().get(sheetDataSetList.size()-i);
        }
       /* if(!CollectionUtils.isEmpty(sheetDataSetList)
                && sheetDataSetList.size()>1 && !CollectionUtils.isEmpty(sheetDataSetList.get(sheetDataSetList.size()-1).getColName())){
            List<SheetRowData>  rowData=  sheetDataSetList.get(sheetDataSetList.size()-1).getRowData();
            templateOidInExcel=rowData.get(i).getData().get(0);
           //templateOidInExcel = sheetDataSetList.get(sheetDataSetList.size()-1).getColName().get(sheetDataSetList.size()-i);
        }*/
        if(StringUtils.isBlank(templateOidInExcel) || !templateOidInExcel.equalsIgnoreCase(templateVO.getOid())){
            throw new VciBaseException("模板【"+templateName+"】中的数据获取的模版信息与当前模板不匹配，请确保excel文件里有【模板信息-请勿移动或删除】的工作表，且确保每次导入都是先下载的导入模板后添加的数据");
        }

    }


    /***
     * æ‰¹é‡å¤„理申请数据
     * @param orderDTO
     * @param templateVO
     * @param dataSet
     * @return
     */
    private String batchImportCodes(CodeOrderDTO orderDTO,CodeClstemplateVO templateVO,SheetDataSet dataSet,Map<String,String> errorMap,boolean isEnumType){
        List<String> codeList=new ArrayList<>();
//        CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
        //规则的主键需要去获取
//        CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
//        //1.判断规则中除了流水码段，是否有其他码段
//        engineService.checkSecValueOnOrder(ruleVO,orderDTO);
//        List<SheetRowData> rowDataList = dataSet.getRowData();
//
//        //除去默认的属性.还有只有表单显示的字段才导入
//        List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s ->
//            !DEFAULT_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
//        ).collect(Collectors.toList());
//        Map<Integer/**列号**/,String/**字段的名称**/> fieldIndexMap = new HashMap<>();
//        List<String> titleRowData = dataSet.getColName();
//        Map<String/**中文名称**/, String/**英文名称**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getName(), t -> t.getId().toLowerCase(Locale.ROOT),(o1, o2)->o2));
//        getFieldIndexMap(titleRowData,attrNameIdMap,fieldIndexMap);
//
//        //需要判断是否所有的属性都在模板上了
//        List<CodeClassifyTemplateAttrVO> unExistAttrVOs = attrVOS.stream().filter(s -> !fieldIndexMap.containsValue(s.getId().toLowerCase(Locale.ROOT))
//            && StringUtils.isBlank(s.getComponentrule()) && StringUtils.isBlank(s.getClassifyinvokeattr())//组合规则和分类注入确实没给用户导出去
//        ).collect(Collectors.toList());
//        if(!CollectionUtils.isEmpty(unExistAttrVOs)){
//            throw new VciBaseException("【" + unExistAttrVOs.stream().map(CodeClassifyTemplateAttrVO::getName) + "】这些属性在列表中没有找到");
//        }
//        List<ClientBusinessObject> cboList = new ArrayList<>();
//        String fullPath = getFullPath(classifyFullInfo);
//        excelToCbo(classifyFullInfo,fieldIndexMap,rowDataList,templateVO,cboList,fullPath,true);
//
//        //都转换完了。需要批量检查
//        //如果出错了，我们依然执行有效的数据，无效的数据写回到excel中
//        //2.判断必输项。。需要全部的属性，如果是必输，但是表单里面不显示的，只能是分类注入或者组合规则
//        batchCheckRequiredAttrOnOrder(templateVO,cboList,errorMap);
//        //3.判断关键属性
//        CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
//        Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
//        Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
//        if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
//            selfRepeatRowIndexList.stream().forEach(rowIndex->{
//                errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";在当前处理的数据文件中关键属性重复" );
//            });
//        }
//        if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
//            keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
//                errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";关键属性与系统中的重复" );
//            });
//        }
//        //分类注入
//        batchSwitchClassifyAttrOnOrder(attrVOS,cboList,classifyFullInfo,false);
//        //boolean
//        reSwitchBooleanAttrOnOrder(attrVOS,cboList);
//        //4.校验规则
//        batchCheckVerifyOnOrder(attrVOS, cboList,errorMap);
//        if(isEnumType) {//是否需要校验枚举/参照
//            //5.校验枚举是否正确
//            batchSwitchEnumAttrOnOrder(attrVOS, cboList, errorMap);
//            //7.处理参照的情况
//            batchSwitchReferAttrOnOrder(attrVOS,cboList,errorMap);
//        }
//        //6.时间格式的验证
//        //6.时间的，必须统一为yyyy-MM-dd HH:mm:ss
//        batchSwitchDateAttrOnOrder(attrVOS,cboList,errorMap);
//        //最后弄组合规则
//        batchSwitchComponentAttrOnOrder(attrVOS,cboList);
//        String uuid=redisService.getUUIDEveryDay();
//        Map<String, ClientBusinessObject> rowIndexCboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue((IMPORT_ROW_INDEX)), t -> t));
//
//        if(errorMap.size()>0) {
//            createRedisDatas(uuid + "-error",templateVO, rowIndexCboMap, dataSet, fieldIndexMap, errorMap,false);
//        }
//        boolean isCreateUUid=false;
//        List<ClientBusinessObject> needSaveCboList = cboList.stream().filter(cbo -> {
//            String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
//            return !errorMap.containsKey(rowIndex);
//        }).collect(Collectors.toList());
//        //相似校验
//        Map<String,String>resembleMap=new HashMap<>();
//        List<DataResembleVO> dataResembleVOS=new ArrayList<>();
//        String btmtypeid= classifyFullInfo.getTopClassifyVO().getBtmtypeid();
//        bathcResembleQuery(orderDTO.getCodeClassifyOid(),templateVO,needSaveCboList,resembleMap,btmtypeid,dataResembleVOS);
//        if(resembleMap.size()>0) {
//            isCreateUUid=true;
//            if(!CollectionUtils.isEmpty(dataResembleVOS)) {
//                redisService.setCacheList(uuid + "-resemble-data", dataResembleVOS);
//                createRedisDatas(uuid + "-resemble",templateVO, rowIndexCboMap, dataSet, fieldIndexMap, resembleMap, false);
//            }
//        }
//        //排除错误的，剩下正确的
//        Map<String,String> newErrorMap=new HashMap<>();
//        newErrorMap.putAll(resembleMap);
//        newErrorMap.putAll(errorMap);
//        needSaveCboList = cboList.stream().filter(cbo -> {
//            String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
//            return !newErrorMap.containsKey(rowIndex);
//        }).collect(Collectors.toList());
//        if((errorMap.size()>0&&needSaveCboList.size()>0)||resembleMap.size()>0){
//            isCreateUUid=true;
//        }
//        createRedisByCodeClassify(uuid + "-class",templateVO,dataSet,fieldIndexMap,false);
//        if(newErrorMap.size()>0) {
//            createRedisDatas(uuid + "-ok",templateVO, rowIndexCboMap, dataSet, fieldIndexMap, newErrorMap,true);
//        }else {
//            uuid="";
//            //要把以上的错误的都抛出后，再继续处理时间和组合规则
//            needSaveCboList = cboList.stream().filter(cbo -> {
//                String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
//                return !newErrorMap.containsKey(rowIndex);
//            }).collect(Collectors.toList());
//            if (!CollectionUtils.isEmpty(needSaveCboList)) {
//                //9.我们处理业务数据
//                //生成编码的内容
//                codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), needSaveCboList);
//                //如果是编码生成失败，则直接就失败了，其他的判断出来有错误的我们都统一返回到excel里面
//                engineService.batchSaveSelectChar(templateVO, needSaveCboList);
//            }
//        }
//        if(!isCreateUUid){
//            return uuid="";
//        }
//        return uuid;
        return null;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,708 @@
package com.vci.ubcs.code.service.impl;

import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeSerialValue;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.enumpack.CodeCutTypeEnum;
import com.vci.ubcs.code.enumpack.CodeGetValueTypeEnum;
import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
import com.vci.ubcs.code.service.ICodeWupinService;
import com.vci.ubcs.code.service.MdmProductCodeService;
import com.vci.ubcs.code.vo.CodeClstemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
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.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

import static com.vci.ubcs.code.constant.MdmEngineConstant.*;
@Service
public class MdmProductCodeServiceImpl  implements MdmProductCodeService {

    /**
     * æµæ°´å·çš„相关的信息
     */
    @Resource
    private CodeSerialValueMapper serialValueMapper;

    /**
     * æ‰€æœ‰çš„编码的内容
     */
    @Resource
    private CodeAllCodeServiceImpl codeAllCodeService;

    /**
     * æ‰€æœ‰çš„编码的内容
     */
    @Resource
    private ICodeWupinService iCodeWupinService;

    @Override
    public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClstemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList) {
//        BatchCBO batchCBO = new BatchCBO();
//        WebUtil.setPersistence(false);
//        dataCBOList = dataCBOList.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList());
//        batchCBO.getCreateCbos().addAll(dataCBOList);
        List<String> codeList = new ArrayList<>();

        /*****
         * ä¿è¯å¹¶å‘的时候，最大流水号都对的，但是这种加锁有弊端
         *
         */

        if(dataCBOList.stream().anyMatch(cbo-> StringUtils.isNotBlank(cbo.getId()))
//            && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
            ){
            //是历史数据导入
            //历史数据执行的时候，这个系统会很卡
            //主要是为了录入最大流水号和allcode
//            SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
            List<CodeAllCode> allCodeDOList = new ArrayList<>();
            Map<String/**流水依据**/, Map<String/**码段的主键**/,Double/**最大流水号**/>> maxSerialMap = new HashMap<>();
            dataCBOList.parallelStream().forEach(cbo->{
//                VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
                String code = cbo.getId();
                List<String> serialUnitList = new ArrayList<>();
                String[] secLengths = cbo.getCodeSecLengthField().split("#");
                List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
                Map<String/**码段的主键**/,String/**码段的值**/> serialValueMap = new HashMap<>();
                Map<String, CodeBasicSecVO> secVOMap = secVOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
                for (int i = 0; i < secLengths.length; i++) {
                    CodeBasicSecVO secVO = secVOList.get(i);
                    String thisSecValue  = "";
                    if(i == 0){
                        thisSecValue = code.contains("#")?code.substring(0,code.indexOf("#")):code;
                    } else if(i == secLengths.length-1){
                        //最后
                        thisSecValue =  code.contains("#")?code.substring(code.lastIndexOf("#")):code;
                    }else {
                        int start = 0;
                        for (int j = 0; j < i; j++) {
                            start += VciBaseUtil.getInt(secLengths[j]) + 1;
                        }
                        thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[1]));
                    }
                    if(VciBaseUtil.getBoolean(secVO.getSerialDependFlag())){
                        serialUnitList.add(thisSecValue);
                    }
                    if(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(secVO.getSecType())){
                        serialValueMap.put(secVO.getOid(),thisSecValue);
                    }
                }
                String serialUnitString = serialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : serialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
                List<String> serialUnFileStringList = new ArrayList<>();
                if(!CollectionUtils.isEmpty(serialValueMap)){
                    serialValueMap.forEach((secOid,secValue)->{
                        //要看是不是补位的
                        CodeBasicSecVO secVO = secVOMap.get(secOid);
                        Double serialDb = null;
                        if(OsCodeFillTypeEnum.NONE.getValue().equalsIgnoreCase(secVO.getCodeFillType())){
                            //不补码
                            //把所有不是数字的去掉，因为可能会是老数据，新规则
                            serialDb = VciBaseUtil.getDouble(killUnNumberChar(secValue));
                        }else {
                            //左右填充的，我们需要
                            serialDb = VciBaseUtil.getDouble(killUnNumberChar(killFillChar(secValue,secVO.getCodeFillSeparator(),
                                OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType()))));
                        }
                        Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>());
                        thisUnitMaxMap.put(secOid,serialDb);
                        maxSerialMap.put(serialUnitString,thisUnitMaxMap);
                        serialUnFileStringList.add(String.valueOf(serialDb));
                    });
                }
                CodeAllCode allCodeDO = new CodeAllCode();
                allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
                allCodeDO.setCodeRuleOid(ruleVO.getOid());
                allCodeDO.setId(cbo.getId());
                allCodeDO.setCodeClassifyTemplateOid(templateVO.getOid());
                allCodeDO.setCreateCodeBtm(cbo.getBtmname());
                allCodeDO.setCreateCodeOid(cbo.getOid());
                allCodeDO.setSerialUnit(serialUnitString);
                allCodeDO.setUnFillSerial(serialUnFileStringList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE)));
                allCodeDO.setLcStatus(cbo.getLcStatus());
                allCodeDOList.add(allCodeDO);
            });
            //处理最大的流水号
            List<CodeSerialValue> addSerialValueList = new ArrayList<>();
            List<CodeSerialValue> editSerialValueList = new ArrayList<>();
            maxSerialMap.forEach((serialUnit,secOidMaxMap)->{
                secOidMaxMap.forEach((secOid,maxSerial)->{
//                    Map<String, String> conditionMap = new HashMap<>();
//                    conditionMap.put("codeRuleOid", ruleVO.getOid());
//                    conditionMap.put("serialUnit", serialUnit);
//                    //这个字段是为了解决多个流水的问题
//                    conditionMap.put("codeSecOid", secOid);
                    QueryWrapper<CodeSerialValue> queryWrapper = new QueryWrapper<>();
                    queryWrapper.eq("codeRuleOid", ruleVO.getOid());
                    queryWrapper.eq("serialUnit", serialUnit);
                    queryWrapper.eq("codeSecOid", secOid);

                    List<CodeSerialValue> serialValueDOS = serialValueMapper.selectList(queryWrapper);
//                    .selectByCondition(conditionMap, new PageHelper(-1));
                    if (!CollectionUtils.isEmpty(serialValueDOS)) {
                        CodeSerialValue serialValueDO = serialValueDOS.get(0);
                        if(VciBaseUtil.getDouble(serialValueDO.getMaxSerial())<maxSerial){
                            serialValueDO.setMaxSerial(String.valueOf(maxSerial));
                            editSerialValueList.add(serialValueDO);
                        }
                    }else{
                        //没有
                        CodeSerialValue serialValueDO = new CodeSerialValue();
                        serialValueDO.setCodeRuleOid(ruleVO.getOid());
                        serialValueDO.setSerialUnit(serialUnit);
                        serialValueDO.setCodeSecOid(secOid);
                        serialValueDO.setMaxSerial(maxSerial.toString());
                        addSerialValueList.add(serialValueDO);
                    }
                });
            });
            if(!CollectionUtils.isEmpty(addSerialValueList)){
//                batchCBO.copyFromOther(serialValueMapper.batchInsert(addSerialValueList));
                for (CodeSerialValue codeSerialValue : addSerialValueList) {
                    serialValueMapper.insert(codeSerialValue);
                }
//                serialValueMapper.ba

            }
            if(!CollectionUtils.isEmpty(editSerialValueList)){
                for (CodeSerialValue codeSerialValue : editSerialValueList) {
                    serialValueMapper.updateById(codeSerialValue);
                }

//                batchCBO.copyFromOther(serialValueMapper.batchUpdate(editSerialValueList));
            }
            //处理allCode
            if(!CollectionUtils.isEmpty(allCodeDOList)){
                Map<String, List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
                Map<String, CodeAllCode> codeDOMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getCodeRuleOid() + "${SEP}" + s.getId(), t -> t));
                List<CodeAllCode> addCodeDOs = new ArrayList<>();
                List<CodeAllCode> editCodeDOs = new ArrayList<>();
                ruleGroup.forEach((ruleOid,allCodeDOS)->{
                    VciBaseUtil.switchCollectionForOracleIn(allCodeDOS).stream().forEach(codeDOs->{
//                        Map<String,String> conditionMap = new HashMap<>();
//                        conditionMap.put("coderuleoid",ruleOid);
//                        conditionMap.put("id",QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDOs.stream().map(s->s.getId()).collect(Collectors.toList()).toArray(new String[0])) + ")");
                        QueryWrapper<CodeAllCode> allCodeWrapper = new QueryWrapper<>();
                        allCodeWrapper.eq("coderuleoid",ruleOid);
                        allCodeWrapper.in("id", QueryOptionConstant.IN + "(" +
                            VciBaseUtil.toInSql(codeDOs.stream().map(s->s.getId()).collect(Collectors.toList()).toArray(new String[0])) + ")");
                        List<CodeAllCode> existCodes = codeAllCodeService.selectByWrapper(allCodeWrapper);


                        if(!CollectionUtils.isEmpty(existCodes)){
                            existCodes.stream().forEach(existCode->{
                                String rule_id = existCode.getCodeRuleOid() + "${SEP}" + existCode.getId();
                                if(codeDOMap.containsKey(rule_id)){
                                    CodeAllCode newCodeDO = codeDOMap.get(rule_id);
                                    existCode.setCreateCodeOid(newCodeDO.getOid());
                                    existCode.setCreateCodeBtm(newCodeDO.getCreateCodeBtm());
                                    existCode.setCodeClassifyTemplateOid(newCodeDO.getCodeClassifyTemplateOid());
                                    existCode.setCodeClassifyOid(newCodeDO.getCodeClassifyOid());
                                    existCode.setLcStatus(newCodeDO.getLcStatus());
                                    editCodeDOs.add(existCode);
                                }
                            });
                        }
                    });
                });
                if(!CollectionUtils.isEmpty(editCodeDOs)){
                    Set<String> exitIds = editCodeDOs.stream().map(s -> s.getCodeRuleOid() + "${SEP}" + s.getId()).collect(Collectors.toSet());
                    addCodeDOs = allCodeDOList.stream().filter(s -> !exitIds.contains(s.getCodeRuleOid() + "${SEP}" + s.getId())).collect(Collectors.toList());
                }else{
                    addCodeDOs = allCodeDOList;
                }
                if(!CollectionUtils.isEmpty(editCodeDOs)){
//                    batchCBO.copyFromOther(allCodeMapper.batchUpdate(editCodeDOs));
                    codeAllCodeService.updateBatchById(editCodeDOs);
                }
                if(!CollectionUtils.isEmpty(addCodeDOs)){
//                    batchCBO.copyFromOther(allCodeMapper.batchInsert(addCodeDOs));
                    Map<String, String> statusMap = addCodeDOs.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
                    addCodeDOs.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
                        s.setLcStatus(statusMap.get(s.getOid()));
                    });
                    codeAllCodeService.saveBatch(addCodeDOs);
                }
            }
//            WebUtil.setPersistence(true);
//            boService.persistenceBatch(batchCBO);
            return codeList;
        }else {
            List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
            List<String> serialUnitList = new LinkedList<>();
            List<String> secValueList = new ArrayList<>();
            Map<String, String> secValueMap = secDTOList.stream().collect(Collectors.toMap(s -> s.getSecOid(), s -> s.getSecValue()));
            List<CodeBasicSecVO> serialSecVOList = new ArrayList<>();
            List<CodeBasicSecVO> attrSecVOList = new ArrayList<>();
            for (int i = 0; i < secVOList.size(); i++) {
                CodeBasicSecVO secVO = secVOList.get(i);
                switchSecValue(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
            }
            //处理属性码段和流水码段
            Map<String/**流水码段的主键**/, Map<String/**流水依据**/, Double>> lastMaxSerialValueMap = new HashMap<>();
            List<CodeAllCode> allCodeDOList = new ArrayList<>();

            //已经存储的最大流水号的内容
            Map<String/**码段的主键**/, Map<String, CodeSerialValue>> maxSerialValueMap = new HashMap<>();

            for (int i = 0; i < dataCBOList.size(); i++) {
                CodeWupinEntity cbo = dataCBOList.get(i);
                List<String> thisSecValueList = new LinkedList<>();
                for (int j = 0; j < secValueList.size(); j++) {
                    thisSecValueList.add(secValueList.get(j));
                }
                List<String> thisSerialUnitList = new LinkedList<>();
                //因为流水依据每次可能不一样，所以每次都拷贝一份
                for (int j = 0; j < serialUnitList.size(); j++) {
                    thisSerialUnitList.add(serialUnitList.get(j));
                }
                //先看看有没有属性的码段
                boolean attrSevIsSerialDepend = CollectionUtils.isEmpty(attrSecVOList) ? false : (attrSecVOList.stream().anyMatch(s -> VciBaseUtil.getBoolean(s.getSerialDependFlag())));
                switchAttrSecValue(attrSecVOList, cbo, thisSecValueList, attrSevIsSerialDepend, thisSerialUnitList);

                String serialUnitString = thisSerialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : thisSerialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
                switchSerialSecValue(serialSecVOList, attrSevIsSerialDepend, ruleVO, serialUnitString, maxSerialValueMap, thisSecValueList, lastMaxSerialValueMap, i == 0);

                //组装编码的值
                cbo.setId(thisSecValueList.stream().collect(Collectors.joining()));
                codeList.add(cbo.getId());
                StringBuilder sb = new StringBuilder();
                //把码段里面都找一下流水号
                for (int j = 0; j < serialSecVOList.size(); j++) {
                    CodeBasicSecVO secVO = serialSecVOList.get(j);
                    Double serialValue = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>()).getOrDefault(serialUnitString, 0d);
                    if (serialValue != null) {
                        sb.append(String.valueOf(serialValue.longValue())).append(SERIAL_VALUE_SPACE);
                    }
                }
                //要存储最后的全部allcode
                wrapperAllCode(classifyFullInfoBO, ruleVO, cbo, templateVO, allCodeDOList, serialUnitString, sb.toString());
            }
            saveSerialValue( ruleVO, lastMaxSerialValueMap, maxSerialValueMap);

            Map<String, String> statusMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
            allCodeDOList.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
                s.setLcStatus(statusMap.get(s.getOid()));

            });
            codeAllCodeService.saveBatch(allCodeDOList);
            iCodeWupinService.saveBatch(dataCBOList);
//            batchCBO.getCreateCbos().stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmName())).forEach(s -> {
//                s.setLcStatus(statusMap.get(s.getOid()));
//                try {
//                    s.setAttributeValue("lcstatus",statusMap.get(s.getOid()));
//                } catch (VCIError e) {
//                    e.printStackTrace();
//                }
//            });
        }
//        WebUtil.setPersistence(true);
//        boService.persistenceBatch(batchCBO);
        return codeList;
    }
    /**
     * è½¬æ¢å±žæ€§ç æ®µçš„值
     * @param attrSecVOList å±žæ€§ç æ®µçš„显示对象
     * @param cbo ä¸šåŠ¡æ•°æ®ï¼Œç”¨äºŽèŽ·å–码段的值
     * @param thisSecValueList ç å€¼çš„列表
     * @param attrSevIsSerialDepend æ˜¯å¦æœ‰ä½œä¸ºæµæ°´ä¾æ®
     * @param serialUnitList æµæ°´ä¾æ®çš„内容
     *                       è¿˜éœ€è¦åŽç»­çš„一个移植将会涉及到其他的服务
     */
    private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList,CodeWupinEntity cbo,
                                    List<String> thisSecValueList,boolean attrSevIsSerialDepend,
                                    List<String> serialUnitList){
        if (!CollectionUtils.isEmpty(attrSecVOList)) {
            attrSecVOList.stream().forEach(attrSevVO -> {
                String value = "";
                if (StringUtils.isNotBlank(attrSevVO.getGetValueClass())) {
                    //使用组合规则来处理的
//                    value = getValueByFormulaForCBO(cbo, attrSevVO.getGetValueClass());
                } else {
//                    value = cbo.getAttributeValue(attrSevVO.getReferAttributeId());
                }
                if (value == null) {
                    value = "";
                }
                //替换secValueList里面的内容
                for (int j = 0; j < thisSecValueList.size(); j++) {
                    String secValue = thisSecValueList.get(j);
                    if (secValue.equalsIgnoreCase("${attr_" + attrSevVO.getOid() + "}")) {
                        thisSecValueList.set(j, value);
                    }
                }
                if (attrSevIsSerialDepend) {
                    //是流水依赖的话，需要去替换一下
                    for (int j = 0; j < serialUnitList.size(); j++) {
                        String secValue = serialUnitList.get(j);
                        if (secValue.equalsIgnoreCase("${attr_" + attrSevVO.getOid() + "}")) {
                            serialUnitList.set(j, value);
                        }
                    }
                }
            });
        }
    }


    /**
     * è½¬æ¢æµæ°´ç æ®µçš„值
     * @param serialSecVOList æµæ°´ç æ®µ
     * @param attrSevIsSerialDepend æ˜¯å¦æœ‰å±žæ€§ç æ®µå‚与流水
     * @param ruleVO è§„则的内容
     * @param serialUnitString æµæ°´ä¾æ®
     * @param maxSerialValueMap æœ€å¤§çš„流水号
     * @param thisSecValueList æœ¬æ¬¡çš„码值
     * @param lastMaxSerialValueMap å°è£…后
     * @param firstData æ˜¯å¦ä¸ºç¬¬ä¸€æ¡æ•°æ®
     */
    private void switchSerialSecValue(List<CodeBasicSecVO> serialSecVOList,boolean attrSevIsSerialDepend,
                                      CodeRuleVO ruleVO,String serialUnitString,
                                      Map<String/**码段的主键**/,Map<String/**流水依据**/,CodeSerialValue>> maxSerialValueMap,List<String> thisSecValueList,
                                      Map<String/**码段的主键**/,Map<String/**流水依据**/, Double>> lastMaxSerialValueMap,boolean firstData){
        if (!CollectionUtils.isEmpty(serialSecVOList)) {
            for (int j = 0; j < serialSecVOList.size(); j++) {
                CodeBasicSecVO secVO = serialSecVOList.get(j);
                if (attrSevIsSerialDepend || firstData) {
                    //如果属性码段也是依赖，则每次都要查询，如果属性码段不是依赖，则只查询一次
//                    Map<String, String> conditionMap = new HashMap<>();
//                    conditionMap.put("codeRuleOid", ruleVO.getOid());
//                    conditionMap.put("serialUnit", serialUnitString);
//                    //这个字段是为了解决多个流水的问题
//                    conditionMap.put("codeSecOid", secVO.getOid());
                    QueryWrapper<CodeSerialValue> codeSerialWrapper = new QueryWrapper<>();
                    codeSerialWrapper.eq("codeRuleOid", ruleVO.getOid());
                    codeSerialWrapper.eq("serialUnit", serialUnitString);
                    codeSerialWrapper.eq("codeSecOid", secVO.getOid());
                    List<CodeSerialValue> serialValueDOS = serialValueMapper.selectList(codeSerialWrapper);
                    if (!CollectionUtils.isEmpty(serialValueDOS)) {
                        Map<String, CodeSerialValue> unitSerialMap = maxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>());
                        CodeSerialValue serialValueDO = serialValueDOS.get(0);
                        unitSerialMap.put(serialValueDO.getSerialUnit(),serialValueDO);
                        maxSerialValueMap.put(secVO.getOid(), unitSerialMap);
                    }
                }
                Double startValue = null;
                if(maxSerialValueMap.containsKey(secVO.getOid()) && maxSerialValueMap.get(secVO.getOid()).containsKey(serialUnitString)){
                    startValue = VciBaseUtil.getDouble(maxSerialValueMap.get(secVO.getOid()).get(serialUnitString).getMaxSerial());
                }
                if(lastMaxSerialValueMap.containsKey(secVO.getOid()) && lastMaxSerialValueMap.get(secVO.getOid()).containsKey(serialUnitString)){
                    //说明多个申请，之前已经加了流水号了
                    startValue = lastMaxSerialValueMap.get(secVO.getOid()).get(serialUnitString);
                }
                Double thisSerialValue = 0d;
                if (startValue == null) {
                    //第一个编码
                    thisSerialValue = VciBaseUtil.getDouble(secVO.getSerialStart());
                } else {
                    //流水号肯定是数字
                    thisSerialValue = startValue + (j + 1) * secVO.getSerialStep();
                }
                //要看是否超过最大的流水值
                if (thisSerialValue >= secVO.getCodeFillLimit()) {
                    throw new VciBaseException("流水号已经超过允许的最大流水值{0}",new String[]{secVO.getCodeFillLimit().toString()});
                }
                //要看补位的内容
                Integer fillLength = VciBaseUtil.getInt(secVO.getCodeFillLength());
                if (fillLength == 0 || fillLength > VciBaseUtil.getInt(secVO.getCodeSecLength())) {
                    //防止在添加的地方没有控制正确
                    fillLength = VciBaseUtil.getInt(secVO.getCodeSecLength());
                }
                String serialString = String.valueOf(thisSerialValue.longValue());
                serialString = fillString(fillLength, OsCodeFillTypeEnum.forValue(secVO.getCodeFillType()), serialString, secVO.getCodeFillSeparator());
                for (int z = 0; z < thisSecValueList.size(); z++) {
                    String secValue = thisSecValueList.get(z);
                    if (secValue.equalsIgnoreCase("${" + secVO.getOid() + "}")) {
                        thisSecValueList.set(z, serialString);
                    }
                }
                Map<String, Double> unitSerialMap = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>());
                unitSerialMap.put(serialUnitString, thisSerialValue);
                lastMaxSerialValueMap.put(secVO.getOid(),unitSerialMap);
            }
        }
    }

    /**
     * è½¬æ¢ç å€¼çš„内容
     * @param secVO ç æ®µçš„内容
     * @param secValueMap ç å€¼çš„内容，key是码段的主键，value是码值
     * @param classifyFullInfoBO åˆ†ç±»çš„全部信息
     * @param serialSecVOList æµæ°´ç æ®µ
     * @param attrSecVOList å±žæ€§ç æ®µ
     * @param serialUnitList æµæ°´ä¾æ®
     * @param secValueList ç å€¼åˆ—表
     */
    private void switchSecValue(CodeBasicSecVO secVO,Map<String,String> secValueMap,
                                CodeClassifyFullInfoBO classifyFullInfoBO,List<CodeBasicSecVO> serialSecVOList,
                                List<CodeBasicSecVO> attrSecVOList, List<String> serialUnitList,
                                List<String> secValueList ){
        CodeSecTypeEnum secType = CodeSecTypeEnum.forValue(secVO.getSecType());
        String secValue = secValueMap.getOrDefault(secVO.getOid(), "");
        switch (secType) {
            case CODE_FIXED_SEC:
                //固定码段的，直接用码值,不论码值的长度是多少，因为可变长度和固定长度是控制在码段管理里面的码值定义的
                break;
            case CODE_DATE_SEC:
                //时间码段，需要将当前时间依据时间格式进行转换.
                //时间码段不涉及到是否补位
                secValue = VciDateUtil.date2Str(new Date(), secVO.getCodeDateFormatStr());
                break;
            case CODE_CLASSIFY_SEC:
                //分类码段的，也是从前端选择了码值即可，不论码值的长度是多少
                break;
            case CODE_LEVEL_SEC:
                //层级码段，需要从分类上获取相应的信息
                if (CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(secVO.getCodeLevelType())) {
                    //最小层，因为我们只能在叶子节点上申请编码，所以这个就是当前分类的
                    if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType()) || CollectionUtils.isEmpty(classifyFullInfoBO.getParentClassifyVOs())) {
                        //就是当前分类的
                        secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
                    } else {
                        //我们需要从顶层开始找到当前分类为止
                        secValue = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId();
                    }
                } else {
                    //指定层，我们需要通过上级的来获取
                    if (CollectionUtils.isEmpty(classifyFullInfoBO.getParentClassifyVOs())) {
                        //说明当前已经是最高的了
                        secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
                    } else {
                        //这个我们需要看看,层级是不是大于了最大层级的数
                        List<CodeClassifyVO> parentClassifyVOList = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList());
                        if (secVO.getCodeLevelValue() > (parentClassifyVOList.size() + 1)) {
                            //指定的层级比当前的层级还大了，所以只能获取当前层级了
                            if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType())) {
                                secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
                            } else {
                                secValue = parentClassifyVOList.stream().map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId();
                            }
                        } else {
                            //我们获取其中指定层的内容
                            if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType())) {
                                CodeClassifyVO classifyVO = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() == secVO.getCodeLevelValue().intValue()).findFirst().orElseGet(() -> null);
                                if (classifyVO != null) {
                                    secValue = classifyVO.getId();
                                }
                            } else {
                                //小于等于的全部拿出来
                                secValue = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() <= secVO.getCodeLevelValue().intValue()).sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining());
                            }
                        }
                    }
                }
                //看看长度是否需要截断
                if (!CodeCutTypeEnum.NONE.getValue().equalsIgnoreCase(secVO.getValueCutType()) &&
                    secVO.getValueCutLength() != null && secVO.getValueCutLength() > 0 && secValue.length() > secVO.getValueCutLength()) {
                    if (CodeCutTypeEnum.RIGHT.getValue().equalsIgnoreCase(secVO.getValueCutType())) {
                        //左截取是从左边剪掉，右截取是从右边剪掉--保留左边
                        secValue = secValue.substring(0, secVO.getValueCutLength());
                    } else {
                        secValue = secValue.substring(secValue.length() - secVO.getValueCutLength());
                    }
                }
                break;
            case CODE_REFER_SEC:
                //引用的在页面上已经选择了，所以直接使用前端上传递的值
                //引用就是参照，可能是其他的分类（业务类型）下的数据，所以只在页面上选择
                break;
            case CODE_ATTR_SEC:
                //属性与引用的区别是，属性是当前数据里的属性，而引用可能是引用其他的分类的（业务类型）
                //因为可能是批量的数据的操作，所以我们这里不能直接处理属性，需要后边一边处理
                secValue = "${attr_" + secVO.getOid() + "}";
                attrSecVOList.add(secVO);
                break;
            case CODE_VARIABLE_SEC:
                //可变码段，是在页面上输入内容
                if (secValue.length() > VciBaseUtil.getInt(secVO.getCodeSecLength())) {
                    throw new VciBaseException("【{0}】这个码段是可变码段，但是现在输入的码值的长度({1})超过了规定的长度{2}", new String[]{secVO.getName(), String.valueOf(secValue.length()), secVO.getCodeSecLength()});
                }
                OsCodeFillTypeEnum fillTypeEnum = OsCodeFillTypeEnum.forValue(secVO.getCodeFillType());
                secValue = fillString(VciBaseUtil.getInt(secVO.getCodeSecLength()), fillTypeEnum, secValue, secVO.getCodeFillSeparator());
                break;
            case CODE_SERIAL_SEC:
                //流水码段
                serialSecVOList.add(secVO);
                secValue = "${" + secVO.getOid() + "}";
            default:
                break;
        }
        if (VciBaseUtil.getBoolean(secVO.getSerialDependFlag())) {
            serialUnitList.add(secValue);
        }
        secValueList.add(secValue);
    }

    /**
     * è¡¥ä½
     * @param totalLength æ€»é•¿åº¦
     * @param fillTypeEnum è¡¥ä½æ–¹å¼
     * @param text å½“前的内容
     * @param fillChar è¡¥ä½çš„字符
     * @return ä¸å¡«å……位置和长度已经达到/超过的时候不会填充
     */
    private String fillString(int totalLength,OsCodeFillTypeEnum fillTypeEnum,String text,String fillChar){
        if(text.length() >= totalLength || OsCodeFillTypeEnum.NONE.equals(fillTypeEnum)){
            //不用补位了
            return  text;
        }
        int balance = totalLength - text.length();
        StringBuilder sb = new StringBuilder();
        for (int i = 0; i < balance; i++) {
            sb.append(fillChar);
        }
        if(OsCodeFillTypeEnum.LEFT.equals(fillTypeEnum)) {
            text = sb.toString() + text;
        }else {
            text = text + sb.toString();
        }
        return  text;
    }

    /**
     * å°è£…存储码值的对象
     * @param classifyFullInfoBO åˆ†ç±»å…¨éƒ¨çš„信息
     * @param ruleVO è§„则的内容
     * @param cbo ä¸šåŠ¡æ•°æ®
     * @param templateVO æ¨¡æ¿çš„信息
     * @param allCodeDOList æ‰€æœ‰çš„码值的对象列表
     */
    private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO,CodeRuleVO ruleVO,
                                CodeWupinEntity cbo,CodeClstemplateVO templateVO,
                                List<CodeAllCode> allCodeDOList,String serialUnitString,String serialValueString){
        CodeAllCode allCodeDO = new CodeAllCode();
        allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
        allCodeDO.setCodeRuleOid(ruleVO.getOid());
        allCodeDO.setId(cbo.getId());
        allCodeDO.setCodeClassifyTemplateOid(templateVO.getOid());
        allCodeDO.setCreateCodeBtm(cbo.getBtmname());
        allCodeDO.setCreateCodeOid(cbo.getOid());
        allCodeDO.setSerialUnit(serialUnitString);
        allCodeDO.setUnFillSerial(serialValueString);
        allCodeDO.setLcStatus(cbo.getLcStatus());
        allCodeDOList.add(allCodeDO);
    }




    /**
     * ä¿å­˜æµæ°´çš„信息
     * @param ruleVO è§„则的显示对象
     * @param lastMaxSerialValueMap æœ€å¤§çš„流水值映射
     * @param maxSerialValueMap ä¾æ®å­˜å‚¨çš„最大流水的内容
     */
    private void saveSerialValue(CodeRuleVO ruleVO,
                                 Map<String/**码段的主键**/,Map<String, Double>> lastMaxSerialValueMap,
                                 Map<String/**码段的主键**/,Map<String, CodeSerialValue>> maxSerialValueMap){
        List<CodeSerialValue> editSerialValueDOList = new ArrayList<>();
        List<CodeSerialValue> addSerialValueDOList = new ArrayList<>();
        //存储最大流水号
        lastMaxSerialValueMap.forEach((secOid,maxSerialMap)->{
            maxSerialMap.forEach((unit,maxSerial)->{
                CodeSerialValue serialValueDO = null;
                if(maxSerialValueMap.containsKey(secOid) && maxSerialValueMap.get(secOid).containsKey(unit)){
                    //说明有
                    serialValueDO = maxSerialValueMap.get(secOid).get(unit);
                    serialValueDO.setMaxSerial(maxSerial.toString());
                    editSerialValueDOList.add(serialValueDO);
                }else{
                    serialValueDO = new CodeSerialValue();
                    serialValueDO.setCodeRuleOid(ruleVO.getOid());
                    serialValueDO.setSerialUnit(unit);
                    serialValueDO.setCodeSecOid(secOid);
                    serialValueDO.setMaxSerial(maxSerial.toString());
                    addSerialValueDOList.add(serialValueDO);
                }
            });
        });
        if(!CollectionUtils.isEmpty(editSerialValueDOList)){
//            batchCBO.copyFromOther(serialValueMapper.batchUpdate(editSerialValueDOList));
            for (CodeSerialValue codeSerialValue : editSerialValueDOList) {
                serialValueMapper.updateById(codeSerialValue);
            }
        }
        if(!CollectionUtils.isEmpty(addSerialValueDOList)){
            for (CodeSerialValue codeSerialValue : addSerialValueDOList) {
                serialValueMapper.insert(codeSerialValue);
            }
//            batchCBO.copyFromOther(serialValueMapper.batchInsert(addSerialValueDOList));
        }
    }

    /**
     * åŽ»æŽ‰ä¸æ˜¯æ•°å­—的字符
     * @param s å­—符
     * @return æ›¿æ¢åŽçš„值
     */
    private String killUnNumberChar(String s){
        Integer lastUnNumberIndex = 0;
        for (int i = 0; i < s.length(); i++) {
            char c = s.charAt(i);
            if(!(new String(new char[]{c})).matches(RegExpConstant.NUMBER)){
                lastUnNumberIndex = i;
            }
        }
        String value = s;
        if(lastUnNumberIndex >0){
            value = value.substring(lastUnNumberIndex);
        }
        return value;
    }

    /**
     * åŽ»é™¤è¡¥ä½å­—符
     * @param s å­—符
     * @param fillString è¡¥ä½å­—符
     * @param left æ˜¯å¦å·¦è¡¥ä½
     * @return æ›¿æ¢åŽçš„值
     */
    private String killFillChar(String s, String fillString,boolean left){
        Integer index = 0;
        String value = s;
        if(left){
            for (int i = 0; i < s.length(); i++) {
                char c = s.charAt(i);
                if((new String(new char[]{c})).equalsIgnoreCase(fillString)){
                    index = i;
                }
            }
            if(index >0){
                value = value.substring(index);
            }
        }else{
            //从右往左找
            for (int i = s.length()-1; i >=0; i++) {
                char c = s.charAt(i);
                if((new String(new char[]{c})).equalsIgnoreCase(fillString)){
                    index = i;
                }
            }
            if(index >0){
                value = value.substring(0,index);
            }
        }
        return value;

    }
}

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

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

import com.vci.ubcs.code.entity.CodeClassifyProcessTemp;
import com.vci.ubcs.code.entity.CodeClassifyValue;
import com.vci.ubcs.code.enumpack.CodeClassifyProcessUseEnum;
import com.vci.ubcs.code.vo.CodeClsflowtempVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

import java.util.Objects;

public class CodeClassifyProcessTempWrapper  extends BaseEntityWrapper<CodeClassifyProcessTemp, CodeClassifyProcessTempVO> {

    public static CodeClassifyProcessTempWrapper build() {
        return new CodeClassifyProcessTempWrapper();
    }

    @Override
    public CodeClassifyProcessTempVO entityVO(CodeClassifyProcessTemp codeClassifyProcessTemp) {
        CodeClassifyProcessTempVO codeClassifyProcessTempVO = Objects.requireNonNull(BeanUtil.copy(codeClassifyProcessTemp, CodeClassifyProcessTempVO.class));
        codeClassifyProcessTempVO.setCodeProcessUseText(CodeClassifyProcessUseEnum.getTextByValue(codeClassifyProcessTemp.getCodeProcessUse()));


        return codeClassifyProcessTempVO;
    }



}

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

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

@@ -16,7 +16,7 @@
 */
package com.vci.ubcs.code.wrapper;

import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.entity.CodePhaseattrEntity;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import com.vci.ubcs.code.vo.CodePhaseattrVO;
@@ -28,15 +28,15 @@
 * @author yuxc
 * @since 2023-04-20
 */
public class CodePhaseattrWrapper extends BaseEntityWrapper<CodePhaseAttr, CodePhaseattrVO>  {
public class CodePhaseattrWrapper extends BaseEntityWrapper<CodePhaseattrEntity, CodePhaseattrVO>  {

    public static CodePhaseattrWrapper build() {
        return new CodePhaseattrWrapper();
     }

    @Override
    public CodePhaseattrVO entityVO(CodePhaseAttr CodePhaseattr) {
        CodePhaseattrVO CodePhaseattrVO = Objects.requireNonNull(BeanUtil.copy(CodePhaseattr, CodePhaseattrVO.class));
    public CodePhaseattrVO entityVO(CodePhaseattrEntity codePhaseattr) {
        CodePhaseattrVO CodePhaseattrVO = Objects.requireNonNull(BeanUtil.copy(codePhaseattr, CodePhaseattrVO.class));

        //User createUser = UserCache.getUser(CodePhaseattr.getCreateUser());
        //User updateUser = UserCache.getUser(CodePhaseattr.getUpdateUser());

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

@@ -16,8 +16,8 @@
 */
package com.vci.ubcs.code.wrapper;

import com.vci.ubcs.code.entity.CodeTemplatePhase;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.code.entity.CodeTempphaseEntity;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseEntityVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

@@ -29,15 +29,15 @@
 * @author yuxc
 * @since 2023-04-20
 */
public class CodeTempphaseWrapper extends BaseEntityWrapper<CodeTemplatePhase, CodeTemplatePhaseVO>  {
public class CodeTempphaseWrapper extends BaseEntityWrapper<CodeTempphaseEntity, CodeTemplatePhaseEntityVO>  {

    public static CodeTempphaseWrapper build() {
        return new CodeTempphaseWrapper();
     }

    @Override
    public CodeTemplatePhaseVO entityVO(CodeTemplatePhase CodeTempphase) {
        CodeTemplatePhaseVO CodeTemplatePhaseVO = Objects.requireNonNull(BeanUtil.copy(CodeTempphase, CodeTemplatePhaseVO.class));
    public CodeTemplatePhaseEntityVO entityVO(CodeTempphaseEntity CodeTempphase) {
        CodeTemplatePhaseEntityVO CodeTemplatePhaseVO = Objects.requireNonNull(BeanUtil.copy(CodeTempphase, CodeTemplatePhaseEntityVO.class));

        //User createUser = UserCache.getUser(CodeTempphase.getCreateUser());
        //User updateUser = UserCache.getUser(CodeTempphase.getUpdateUser());

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package com.vci.ubcs.code.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.vo.CodeWupinVO;
import java.util.Objects;

/**
 * ç¼–码信息 åŒ…装类,返回视图层所需的字段
 *
 * @author yuxc
 * @since 2023-05-05
 */
public class CodeWupinWrapper extends BaseEntityWrapper<CodeWupinEntity, CodeWupinVO>  {

    public static CodeWupinWrapper build() {
        return new CodeWupinWrapper();
     }

    @Override
    public CodeWupinVO entityVO(CodeWupinEntity codeWupin) {
        CodeWupinVO codeWupinVO = Objects.requireNonNull(BeanUtil.copy(codeWupin, CodeWupinVO.class));

        //User createUser = UserCache.getUser(codeWupin.getCreateUser());
        //User updateUser = UserCache.getUser(codeWupin.getUpdateUser());
        //codeWupinVO.setCreateUserName(createUser.getName());
        //codeWupinVO.setUpdateUserName(updateUser.getName());

        return codeWupinVO;
    }


}

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClstemplateMapper.xml

@@ -100,4 +100,17 @@



    <select id="selectChildHasReleaseTemplate" resultType="list">
        select t.oid as oid, cls.oid as clsoid
        from platformbtm_codeclstemplate t
                 left join (select oid
                            from platformbtm_codeclassify
                            where lcstatus = #{lcstatus}
                                start with oid = #{classifyoid}
                            connect by prior oid = parentcodeclassifyoid) cls
                           on t.codeclassifyoid = cls.oid
        where t.lcstatus = #{templatelcstatus}
          and cls.oid is not null
    </select>

</mapper>

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml

@@ -1,9 +1,9 @@
<?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.code.mapper.CodePhaseAttrMapper">
<mapper namespace="com.vci.ubcs.code.mapper.CodePhaseattrMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="CodePhaseattrResultMap" type="com.vci.ubcs.code.entity.CodePhaseAttr">
    <resultMap id="CodePhaseattrResultMap" type="com.vci.ubcs.code.entity.CodePhaseattrEntity">
        <result column="OID" property="oid"/>
        <result column="REVISIONOID" property="revisionOid"/>
        <result column="NAMEOID" property="nameOid"/>

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="CodeTempphaseResultMap" type="com.vci.ubcs.code.entity.CodeTemplatePhase">
    <resultMap id="CodeTempphaseResultMap" type="com.vci.ubcs.code.entity.CodeTempphaseEntity">
        <result column="CREATETIME" property="createTime"/>
        <result column="LASTMODIFIER" property="lastModifier"/>
        <result column="LASTMODIFYTIME" property="lastModifyTime"/>
@@ -21,7 +21,7 @@
        <result column="DESCRIPTION" property="description"/>
        <result column="OWNER" property="owner"/>
        <result column="COPYFROMVERSION" property="copyFromVersion"/>
        <result column="CODECLASSIFYTEMPLATEOID" property="codeclassifytemplateoid"/>
        <result column="CODECLASSIFYTEMPLATEOID" property="codeClassifyTemplateOid"/>
        <result column="OID" property="oid"/>
        <result column="REVISIONOID" property="revisionOid"/>
        <result column="NAMEOID" property="nameOid"/>

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,108 @@
<?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.code.mapper.CodeWupinMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupinEntity">
        <result column="OID" property="oid"/>
        <result column="REVISIONOID" property="revisionOid"/>
        <result column="NAMEOID" property="nameOid"/>
        <result column="BTMNAME" property="btmname"/>
        <result column="ISLASTR" property="lastR"/>
        <result column="ISFIRSTR" property="firstR"/>
        <result column="ISLASTV" property="lastV"/>
        <result column="ISFIRSTV" property="firstV"/>
        <result column="CREATOR" property="creator"/>
        <result column="CREATETIME" property="createTime"/>
        <result column="LASTMODIFIER" property="lastModifier"/>
        <result column="LASTMODIFYTIME" property="lastModifyTime"/>
        <result column="REVISIONRULE" property="revisionRule"/>
        <result column="VERSIONRULE" property="versionRule"/>
        <result column="REVISIONSEQ" property="revisionSeq"/>
        <result column="REVISIONVALUE" property="revisionValue"/>
        <result column="VERSIONSEQ" property="versionSeq"/>
        <result column="VERSIONVALUE" property="versionValue"/>
        <result column="LCTID" property="lctid"/>
        <result column="LCSTATUS" property="lcStatus"/>
        <result column="TS" property="ts"/>
        <result column="ID" property="id"/>
        <result column="NAME" property="name"/>
        <result column="DESCRIPTION" property="description"/>
        <result column="OWNER" property="owner"/>
        <result column="CHECKINBY" property="checkinby"/>
        <result column="CHECKINTIME" property="checkintime"/>
        <result column="CHECKOUTBY" property="checkoutby"/>
        <result column="CHECKOUTTIME" property="checkouttime"/>
        <result column="COPYFROMVERSION" property="copyFromVersion"/>
        <result column="CODECLSFID" property="codeclsfid"/>
        <result column="CODECLSFPATH" property="codeclsfpath"/>
        <result column="CODETEMPLATEOID" property="codetemplateoid"/>
        <result column="MATERIALCLASSIFY" property="materialclassify"/>
        <result column="MATERIALID" property="materialid"/>
        <result column="TUHAO" property="tuhao"/>
        <result column="PINPAI" property="pinpai"/>
        <result column="MORENGONGYS" property="morengongys"/>
        <result column="XIEYIJIAGE" property="xieyijiage"/>
        <result column="HESUANPICI" property="hesuanpici"/>
        <result column="BEIZHUSHUOMING" property="beizhushuoming"/>
        <result column="MATERIALTYPE" property="materialtype"/>
        <result column="MATERIALNAME" property="materialname"/>
        <result column="RUANJIANBANBEN" property="ruanjianbanben"/>
        <result column="QITACHICUN" property="qitachicun"/>
        <result column="MORENCAIGOUY" property="morencaigouy"/>
        <result column="YUMAILEIXING" property="yumaileixing"/>
        <result column="CHUANGJIANGONGSI" property="chuangjiangongsi"/>
        <result column="CAIGOUWL" property="caigouwl"/>
        <result column="WULIAOXINGZHI" property="wuliaoxingzhi"/>
        <result column="XIEYIBIANHAO" property="xieyibianhao"/>
        <result column="CAIZHI" property="caizhi"/>
        <result column="CHUKUFANGSHI" property="chukufangshi"/>
        <result column="SHIFOUPIHAOGUANLI" property="shifoupihaoguanli"/>
        <result column="KUCUNWL" property="kucunwl"/>
        <result column="XINGHAOGUIGE" property="xinghaoguige"/>
        <result column="DUIWAIGUIGE" property="duiwaiguige"/>
        <result column="ZHIBAOQI" property="zhibaoqi"/>
        <result column="CAIGOUTIQIANQI" property="caigoutiqianqi"/>
        <result column="HESUANFENLEI" property="hesuanfenlei"/>
        <result column="XIAOSHOUWL" property="xiaoshouwl"/>
        <result column="CHANGJIAXINGHAO" property="changjiaxinghao"/>
        <result column="ZUIXIAOQIDING" property="zuixiaoqiding"/>
        <result column="JILIANGDW" property="jiliangdw"/>
        <result column="ZHILIANGBZ" property="zhiliangbz"/>
        <result column="FIRSTFL" property="firstfl"/>
        <result column="SECONDFL" property="secondfl"/>
        <result column="THRIFL" property="thrifl"/>
        <result column="OLDCODE" property="oldcode"/>
        <result column="SECRETGRADE" property="secretGrade"/>
        <result column="BAOZHUANGGUIGE" property="baozhuangguige"/>
        <result column="PASSING" property="passing"/>
        <result column="XBJ" property="xbj"/>
        <result column="XBXKXS" property="xbxkxs"/>
        <result column="XFJJSTJ" property="xfjjstj"/>
        <result column="XGZCCDGCD" property="xgzccdgcd"/>
        <result column="XXNDJ" property="xxndj"/>
        <result column="XZJMC" property="xzjmc"/>
        <result column="ZJXH" property="zjxh"/>
        <result column="CLPH" property="clph"/>
        <result column="BMCL" property="bmcl"/>
        <result column="CPXS" property="cpxs"/>
        <result column="XBZJBMC" property="xbzjbmc"/>
        <result column="XWLWWMC" property="xwlwwmc"/>
        <result column="JJZYQ" property="jjzyq"/>
        <result column="JSBMC" property="jsbmc"/>
        <result column="JSBXH" property="jsbxh"/>
        <result column="JSCCJ" property="jsccj"/>
        <result column="JSSXT" property="jssxt"/>
        <result column="JSZGL" property="jszgl"/>
        <result column="JZL" property="jzl"/>
        <result column="JZRXX" property="jzrxx"/>
        <result column="JZXZB" property="jzxzb"/>
    </resultMap>


    <select id="selectCodeWupinPage" resultMap="codeWupinResultMap">
        select * from PL_CODE_WUPIN where is_deleted = 0
    </select>


</mapper>

 Source/UBCS/ubcs-service/ubcs-ddl/pom.xml

@@ -15,6 +15,7 @@
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.plugin.version>3.8.1</maven.plugin.version>
    </properties>

    <dependencies>
@@ -50,5 +51,17 @@
        </dependency>
    </dependencies>

    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                    <finalName>${project.name}</finalName>
                </configuration>
            </plugin>
        </plugins>
    </build>

</project>

 Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java

@@ -153,18 +153,18 @@
        List<VciFieldTypeEnum> fieldTypes = listFieldInMapByColumnStr(columnStr, map);
        VciFieldTypeEnum finalField = null;
        int i = Integer.MAX_VALUE;
        if (CollectionUtils.isEmpty(fieldTypes)){
            return null;
        }
        if (fieldTypes.size() == 1){
            return fieldTypes.get(0);
        }
        for (VciFieldTypeEnum fieldType : fieldTypes) {
            DdlFieldMappingAttrBO bo = map.get(fieldType);
            int i1 = Math.abs(bo.getDataLength() - length);
            if (i1 < i){
                finalField = fieldType;
                i = i1;
            if (fieldType.equals(VciFieldTypeEnum.VTString)) {
                finalField = VciFieldTypeEnum.VTString;
            }
            if (fieldType.equals(VciFieldTypeEnum.VTDateTime)){
                finalField = VciFieldTypeEnum.VTDateTime;
            }
            if (fieldType.equals(VciFieldTypeEnum.VTInteger) && length <= 26){
                finalField = VciFieldTypeEnum.VTInteger;
            }
        }
        return finalField;

 Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java

@@ -1104,13 +1104,13 @@
            List<BtmTypeVO> btmTypeVOList = new ArrayList<>();
            allTableBO.forEach(table -> {
                BtmTypeVO vo = new BtmTypeVO();
                vo.setTableName(table.getTableName());
                vo.setTableName(table.getTableName().toLowerCase());
                vo.setDescription(table.getTableDesc());
                List<DdlTableInDataBaseBO> columns = selectTableColumnInfo(table.getTableName());
                List<BtmTypeAttributeVO> attributes = new ArrayList<>();
                columns.forEach(col -> {
                    BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
                    attributeVO.setId(col.getId());
                    attributeVO.setId(col.getId().toLowerCase());
                    attributeVO.setName(col.getName());
                    attributeVO.setNullableFlag(col.getNullableFlag());
                    attributeVO.setAttributeLength(col.getAttributeLength());
@@ -1120,6 +1120,9 @@
                    if (field != null){
                        attributeVO.setAttrDataType(field.name());
                    }
                    if(col.getPrecisionLength() != null){
                        attributeVO.setAttrDataType(VciFieldTypeEnum.VTDouble.name());
                    }
                    attributes.add(attributeVO);
                });
                vo.setAttributes(attributes);

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java

@@ -37,6 +37,7 @@
@RequestMapping("/attribute")
@Api(value = "元数据控制器", tags = "元数据控制器")
public class AttributeController extends BladeController {

    /**
     * å…ƒæ•°æ®æœåŠ¡
     */

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java

@@ -1,7 +1,9 @@
package com.vci.ubcs.omd.controller;

import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.nacos.api.exception.NacosException;
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.omd.constant.OmdCacheConstant;
@@ -9,6 +11,7 @@
import com.vci.ubcs.omd.entity.BtmType;
import com.vci.ubcs.omd.repeater.DomainRepeater;
import com.vci.ubcs.omd.service.IBtmTypeService;
import com.vci.ubcs.omd.vo.BtmTypeTreeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import io.swagger.annotations.*;
@@ -21,13 +24,13 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
 * Description: ä¸šåŠ¡ç±»åž‹æŽ§åˆ¶å™¨
@@ -92,7 +95,7 @@
        @ApiImplicitParam(name = "name", value = "业务类型中文名称", paramType = "query", dataType = "string"),
        @ApiImplicitParam(name = "tableName", value = "业务类型数据库表名", paramType = "query", dataType = "string"),
    })
    @ApiOperationSupport(order = 2)
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "查询列表", notes = "传入查询")
    public R<IPage<BtmTypeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
        IPage<BtmTypeVO> pageVO = new Page<>();
@@ -110,7 +113,7 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/submit/{auto}")
    @ApiOperationSupport(order = 3)
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增或修改", notes = "传入业务类型对象")
    public R submit(@Valid @RequestBody BtmTypeDTO dto,@PathVariable(value = "auto") boolean auto) {
        CacheUtil.clear(OmdCacheConstant.BTM_CACHE);
@@ -124,7 +127,7 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 4)
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "删除", notes = "主键集合")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        CacheUtil.clear(OmdCacheConstant.BTM_CACHE);
@@ -141,7 +144,7 @@
     * èŽ·å–领域值
     */
    @GetMapping("/domain")
    @ApiOperationSupport(order = 5)
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "获取领域值")
    public R<List<String>> getDomain(){
        try {
@@ -150,4 +153,62 @@
            return R.fail(e.getErrMsg());
        }
    }

    /**
     * æŒ‰domain分组，查询业务类型的树形结构
     */
    @GetMapping("/tree-domain")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "业务类型树形结构", notes = "业务类型树形结构")
    public R<List<BtmTypeTreeVO>> treeDomain(){
        return R.data(btmTypeService.treeDomain());
    }

    /**
     * ä»Žæ•°æ®åº“表中获取
     * @param domain é¢†åŸŸå€¼
     * @return è¯»å–结果
     */
    @GetMapping("/get-from-table")
    @ApiOperation(value = "从数据库表中读取",notes = "从数据库表中读取")
    @ApiOperationSupport(order = 8)
    public R<List<BtmTypeVO>> getFromTable(String domain){
        return R.data(btmTypeService.getFromTable(domain));
    }

    /**
     * æ•°æ®åº“选择的表保存为业务类型
     * @param btmTypeDTOList é¡µé¢ä¼ è¾“对象
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/save-from-table/{domain}")
    @ApiOperation(value = "从数据库中保存",notes = "从数据库中保存")
    @ApiOperationSupport(order = 9)
    public R saveFromTable(@RequestBody List<BtmTypeDTO> btmTypeDTOList,@PathVariable(value = "domain") String domain){
        // æ•°æ®åº“表不能重复
        Set<String> tableNames = btmTypeDTOList.stream().map(BtmTypeDTO::getTableName).filter(StringUtils::isNotBlank).collect(Collectors.toSet());
        long count = btmTypeService.count(Wrappers.<BtmType>query().lambda().in(BtmType::getTableName,tableNames));
        if (count > 0){
            return R.fail("所选表在业务类型中已存在");
        }
        // ä¸šåŠ¡ç±»åž‹ä¸èƒ½é‡å¤
        btmTypeDTOList = btmTypeDTOList.stream().peek(s -> {
            String id;
            String tableName = s.getTableName();
            if (tableName.contains(StringPool.UNDERSCORE)) {
                List<String> strList = Arrays.asList(tableName.split(StringPool.UNDERSCORE));
                id = strList.get(strList.size() - 1);
            } else {
                id = tableName;
            }
            s.setId(id.toLowerCase());
        }).collect(Collectors.toList());
        List<String> btmTypeIdList = btmTypeDTOList.stream().map(BtmTypeDTO::getId).collect(Collectors.toList());

        long countId = btmTypeService.count(Wrappers.<BtmType>query().lambda().in(BtmType::getId, btmTypeIdList));
        if (countId > 0){
            return R.fail("所选表与已存在业务类型冲突");
        }
        return R.data(btmTypeService.saveFromTable(btmTypeDTOList,domain));
    }
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java

@@ -21,13 +21,6 @@
    List<Attribute> selectAll();

    /**
     * ä¸»é”®æŸ¥è¯¢
     * @param primaryKey ä¸»é”®
     * @return æŸ¥è¯¢ç»“æžœ
     */
    Attribute selectByPrimaryKey(Long primaryKey);

    /**
     * ä¸»é”®æ‰¹é‡æŸ¥è¯¢
     * @param primaryKeyCollection ä¸»é”®é›†åˆ
     * @return æŸ¥è¯¢ç»“æžœ

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java

@@ -15,10 +15,10 @@
 */
public interface BtmTypeAttributeMapper extends BladeMapper<BtmTypeAttribute> {

    int batchDelete(List<String> records);
    int batchDelete(@Param("records") List<String> records);


    int batchUpdate(List<BtmTypeAttribute> btmTypeAttributeDOList);
    int batchUpdate(@Param("records") List<BtmTypeAttribute> btmTypeAttributeDOList);

    /**
     * èŽ·å–业务类型中的指定属性

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeMapper.java

@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.mapper;

import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.vci.ubcs.omd.entity.BtmTypeAttribute;
import com.vci.ubcs.omd.entity.BtmType;
import org.apache.ibatis.annotations.Param;
@@ -9,21 +10,13 @@
import java.util.Collection;
import java.util.List;

@Repository
public interface BtmTypeMapper extends BladeMapper<BtmType> {
    /**
     * æ ¹æ®ä¸»é”®åˆ é™¤å¯¹è±¡
     * @param oid ç”Ÿå‘½å‘¨æœŸä¸»é”®
     * @return å½±å“çš„行数
     */
    int deleteByPrimaryKey(String oid);

    /**
     * æ’入业务类型
     * @param record è¦æ·»åŠ çš„业务类型对象
     * @return å½±å“çš„行数
     */
    int insert(BtmType record);
    int deleteByPrimaryKey(@Param("oid") String oid);

    /**
     * æ ¹æ®ä¸»é”®èŽ·å–数据对象
@@ -113,6 +106,7 @@
     * @param records æ‰¹é‡çš„信息
     * @return æ‰§è¡Œæ€»æ•°
     */
    Long batchInsert(@Param("records") List<BtmTypeAttribute> records);
    @InterceptorIgnore(tenantLine = "1")
    Long batchInsert(@Param("records") List<BtmType> records);

}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/repeater/DomainRepeater.java

@@ -2,11 +2,13 @@

import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceManager;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
import com.vci.ubcs.common.constant.LauncherConstant;
import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LinkTypeVO;
@@ -15,11 +17,9 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;

@@ -68,12 +68,27 @@
     * Nacos服务列表
     */
    private static NamingService namingService;

    @Autowired
    private NacosServiceManager manager;

    @Autowired
    private NacosDiscoveryProperties properties;


    /**
     * æ‹¿å–服务中的所有表信息
     * @param serviceName æœåŠ¡åç§°
     * @return è¿”回结果
     * @throws NacosException æ‰¾ä¸åˆ°æœåŠ¡æ—¶æŠ›å‡ºå¼‚常
     */
    public static R getFromTable(String serviceName) throws NacosException{
        ResponseEntity<R> responseEntity = executeGet(getUrl(serviceName, API_GET_ALL_TABLE_INFO), new HashMap<>());
        if (responseEntity.getStatusCode().equals(HttpStatus.OK)) {
            R body = Objects.requireNonNull(responseEntity.getBody());
            return body;
        }
        return R.fail(String.valueOf(responseEntity.getStatusCode().value()));
    }

    @PostConstruct
    private void init() {
@@ -198,29 +213,41 @@
    }

    /**
     * æ‰§è¡ŒhttpGet接口
     *
     * @param url          åœ°å€
     * @param extraHeaders è¯·æ±‚头参数
     * @return æ‰§è¡Œç»“æžœ
     */
    private static ResponseEntity<R> executeGet(String url,Map<String, String> extraHeaders) {
        RestTemplate restTemplate = new RestTemplate();
        HttpHeaders httpHeaders = new HttpHeaders();
        httpHeaders.add("Blade-Auth", AuthUtil.getHeader());
        HttpEntity<String> request = new HttpEntity<>(httpHeaders);
        if (!CollectionUtils.isEmpty(extraHeaders)){
            StringBuilder sb = new StringBuilder().append("?");
            extraHeaders.forEach( (k,v) -> {
                sb.append(k).append(StringPool.EQUALS).append(v).append(StringPool.AMPERSAND);
            });
            String str = sb.toString();
            if (str.endsWith(StringPool.AMPERSAND)){
                str = str.substring(0,str.length()-1);
            }
            url = url + str;
        }
        return restTemplate.exchange(url, HttpMethod.GET,request,R.class,"");
    }

    /**
     * èŽ·å–所有已注册的服务
     * @return ä¸åŒ…含默认服务的其他服务
     * @throws NacosException
     */
    public static List<String> getDomain() throws NacosException {
        List<ServiceInfo> services = namingService.getSubscribeServices();
        Set<String> serviceNames = new HashSet<>();
        serviceNames.add(AppConstant.APPLICATION_GATEWAY_NAME);
        serviceNames.add(AppConstant.APPLICATION_ADMIN_NAME);
        serviceNames.add(AppConstant.APPLICATION_AUTH_NAME);
        serviceNames.add(AppConstant.APPLICATION_DESK_NAME);
        serviceNames.add(AppConstant.APPLICATION_DEVELOP_NAME);
        serviceNames.add(AppConstant.APPLICATION_FLOW_NAME);
        serviceNames.add(AppConstant.APPLICATION_FLOWDESIGN_NAME);
        serviceNames.add(AppConstant.APPLICATION_LOG_NAME);
        serviceNames.add(AppConstant.APPLICATION_REPORT_NAME);
        serviceNames.add(AppConstant.APPLICATION_SWAGGER_NAME);
        serviceNames.add(AppConstant.APPLICATION_SYSTEM_NAME);
        serviceNames.add(AppConstant.APPLICATION_TURBINE_NAME);
        serviceNames.add(AppConstant.APPLICATION_USER_NAME);
        serviceNames.add(AppConstant.APPLICATION_WEBSOCKET_NAME);
        serviceNames.add(AppConstant.APPLICATION_ZIPKIN_NAME);
        serviceNames.add(AppConstant.APPLICATION_NAME_OMD);
        return services.stream().map(ServiceInfo::getName).filter(s -> !serviceNames.contains(s)).collect(Collectors.toList());
        RestTemplate restTemplate = new RestTemplate();
        String url = "http://" +LauncherConstant.NACOS_DEV_ADDR + "/nacos/v1/ns/service/list?pageNo=1&pageSize=50";
        String forObject = restTemplate.getForObject(url, String.class);
        JSONObject jsonObject = JSON.parseObject(forObject);
        return (List<String>) jsonObject.get("doms");
    }
}

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

@@ -27,12 +27,6 @@
    List<BtmTypeAttributeVO> checkAndInsert(String btmTypeOid, List<BtmTypeLinkAttributesDTO> attributesDTOList, String creator, Date now);

    /**
     * æ‰¹é‡æ’å…¥
     * @param records æ•°æ®å¯¹è±¡é›†åˆ
     */
    int batchInsert(List<BtmTypeAttribute> records);

    /**
     * ä¸šåŠ¡ç±»åž‹ä¸»é”®æŸ¥å±žæ€§
     * @param btmTypeOid ä¸šåŠ¡ç±»åž‹ä¸»é”®
     * @return æŸ¥è¯¢ç»“æžœ

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

@@ -5,6 +5,7 @@
import com.vci.ubcs.omd.entity.BtmType;
import com.vci.ubcs.omd.entity.BtmTypeAttribute;
import com.vci.ubcs.omd.entity.ModifyAttributeInfo;
import com.vci.ubcs.omd.vo.BtmTypeTreeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.omd.vo.LinkTypeVO;
@@ -210,4 +211,25 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    R submit(BtmTypeDTO btmTypeDTO,boolean autoCreateTable);

    /**
     * æŒ‰domain分组，查询业务类型属性结构
     * @return æŸ¥è¯¢ç»“æžœ
     */
    List<BtmTypeTreeVO> treeDomain();

    /**
     * ä»Žæ•°æ®åº“表中获取
     * @param domain é¢†åŸŸå€¼
     * @return è¯»å–结果
     */
    List<BtmTypeVO> getFromTable(String domain);

    /**
     * é€‰æ‹©æ•°æ®åº“表保存为业务类型
     * @param btmTypeDTOList é¡µé¢ä¼ è¾“对象
     * @param domain é¢†åŸŸ
     * @return æ‰§è¡Œç»“æžœ
     */
    List<BtmTypeVO> saveFromTable(List<BtmTypeDTO> btmTypeDTOList,String domain);
}

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

@@ -60,7 +60,7 @@
    @Override
    public AttributeVO getAttributeDetail(Long id) {
        Func.requireNotNull(id,"主键不能为空");
        return AttributeWrapper.build().entityVO(baseMapper.selectByPrimaryKey(id));
        return AttributeWrapper.build().entityVO(baseMapper.selectById(id));
    }

    /**
@@ -127,7 +127,6 @@
        }
        return true;
    }


    /**
     * æ ¹æ®è‹±æ–‡åç§°é›†åˆæ‰¹é‡èŽ·å–属性对象

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

@@ -62,7 +62,7 @@
            if (!exists){
                return null;
            }
            batchInsert(btmTypeAttributeDOList);
            saveBatch(btmTypeAttributeDOList);
            return BtmTypeAttributeWrapper.build().listEntityVO(btmTypeAttributeDOList);
//            btmTypeAttributeDOList.stream().forEachOrdered(s -> {
//                btmTypeAttributeDOMapper.insert(s);
@@ -116,16 +116,6 @@
//            });
        }
        return null;
    }

    /**
     * æ‰¹é‡æ’å…¥
     *
     * @param records æ•°æ®å¯¹è±¡é›†åˆ
     */
    @Override
    public int batchInsert(List<BtmTypeAttribute> records) {
        return baseMapper.insertBatchSomeColumn(records);
    }

    /**

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

@@ -1,15 +1,19 @@
package com.vci.ubcs.omd.service.impl;

import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.exception.NacosException;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.omd.constant.BtmTypeFieldConstant;
import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO;
import com.vci.ubcs.omd.entity.Attribute;
import com.vci.ubcs.omd.repeater.DomainRepeater;
import com.vci.ubcs.omd.service.IAttributeService;
import com.vci.ubcs.omd.service.IBtmTypeAttributeService;
import com.vci.ubcs.omd.service.IModifyAttributeService;
import com.vci.ubcs.omd.wrapper.BtmTypeAttributeWrapper;
import com.vci.ubcs.omd.vo.BtmTypeTreeVO;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import com.vci.ubcs.omd.wrapper.ModifyAttributeWrapper;
import com.vci.ubcs.starter.web.constant.OmdRegExpConstant;
@@ -24,6 +28,7 @@
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.omd.vo.LinkTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
@@ -38,6 +43,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.util.CollectionUtils;

@@ -71,6 +77,12 @@
     */
    @Autowired
    private IModifyAttributeService modifyAttributeService;

    /**
     * å±žæ€§çš„服务
     */
    @Autowired
    private IAttributeService attributeService;

    /**
     * è¡¨åå‰ç¼€
@@ -621,4 +633,174 @@
    public boolean changeStatus(@NotEmpty List<Long> ids, Integer status) {
        return false;
    }

    /**
     * æŒ‰domain分组，查询业务类型属性结构
     *
     * @return æŸ¥è¯¢ç»“æžœ
     */
    @Override
    public List<BtmTypeTreeVO> treeDomain() {
        try {
            List<String> domain = DomainRepeater.getDomain();
            List<BtmTypeVO> vos = BtmTypeWrapper.build().listEntityVO(baseMapper.selectAll());
            Map<String, List<BtmTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(BtmTypeVO::getDomain));
            List<BtmTypeTreeVO> treeList = new ArrayList<>();
            domainMap.forEach((k,v)-> {
                if (domain.contains(k)){
                    BtmTypeTreeVO parent = new BtmTypeTreeVO();
                    parent.setOid(k);
                    parent.setName(k);
                    parent.setChildList(v.stream().map(s -> {
                        BtmTypeTreeVO child = new BtmTypeTreeVO();
                        child.setOid(s.getOid());
                        child.setName(s.getId() + " " + (s.getName() == null ? "" : s.getName()));
                        return child;
                    }).collect(Collectors.toList()));
                    treeList.add(parent);
                }
            });
            return treeList;
        } catch (NacosException e) {
            throw new RuntimeException(e);
        }
    }

    /**
     * ä»Žæ•°æ®åº“表中获取
     *
     * @param domain é¢†åŸŸå€¼
     * @return è¯»å–结果
     */
    @Override
    public List<BtmTypeVO> getFromTable(String domain) {
        VciBaseUtil.alertNotNull(domain,"领域值");
        try {
            if (!DomainRepeater.getDomain().contains(domain)){
                return null;
            }
            R result = DomainRepeater.getFromTable(domain);
            if (result.isSuccess()){
                List<BtmTypeVO> list = new ArrayList<>();
                Object dataList = result.getData();
                if (dataList instanceof  List){
                    ((List<?>) dataList).forEach(data -> {
                        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(data));
                        list.add(BeanUtil.copy(jsonObject,BtmTypeVO.class));
                    });
                }
                return list;
            }else {
                return new ArrayList<>();
            }
        } catch (NacosException e) {
            throw new RuntimeException(e);
        }
    }

    /**
     * é€‰æ‹©æ•°æ®åº“表保存为业务类型
     *
     * @param btmTypeDTOList é¡µé¢ä¼ è¾“对象
     * @param domain é¢†åŸŸ
     * @return æ‰§è¡Œç»“æžœ
     */
    @Override
    @Transactional
    public List<BtmTypeVO> saveFromTable(List<BtmTypeDTO> btmTypeDTOList,String domain) {
        // ä¹‹å‰å·²ç»åšè¿‡é‡å¤æ ¡éªŒäº†ï¼Œè¿™è¾¹ç›´æŽ¥æ‰§è¡Œä¿å­˜é€»è¾‘即可
        List<BtmType> btmList = new ArrayList<>();
        List<BtmTypeAttribute> btmTypeAttributes = new ArrayList<>();
        Map<String,Attribute> idAttrMap = new HashMap<>();
        // æ ¡éªŒå±žæ€§æ˜¯å¦å­˜åœ¨
        Set<String> attributeIds = new HashSet<>();
        Date now = new Date();
        String user = AuthUtil.getUserAccount();
        btmTypeDTOList.stream().forEach(dto -> {
            BtmType btmType = Objects.requireNonNull(BeanUtil.copy(dto, BtmType.class));
            btmType.setOid(VciBaseUtil.getPk());
            btmType.setTs(now);
            btmType.setCreator(user);
            btmType.setBtmName("btmType");
            btmType.setCreateTime(now);
            btmType.setDomain(domain);
            btmType.setLastModifyTime(now);
            btmType.setLastModifier(user);
            btmType.setName(dto.getDescription());
            Set<String> ids = dto.getAttributes().stream().filter(s -> {
                return ! (BtmTypeFieldConstant.BASIC_FIELD_MAP.containsKey(s.getId())
                || BtmTypeFieldConstant.LIFECYCLE_MANAGE_FIELD_MAP.containsKey(s.getId())
                || BtmTypeFieldConstant.SECRET_MANAGE_FIELD_MAP.containsKey(s.getId())
                || BtmTypeFieldConstant.REVISION_MANAGE_FIELD_MAP.containsKey(s.getId())
                );
            }).map(attr -> {
                // æ·»åŠ å±žæ€§ï¼Œ1是校验，2是添加
                Attribute attribute = new Attribute();
                attribute.setKey(attr.getId());
                attribute.setLabel(attr.getName());
                attribute.setDictKey(attr.getAttrDataType());
                attribute.setMaxLength(attr.getAttributeLength());
                attribute.setPrecision(attr.getPrecisionLength());
                attribute.setDescription(attr.getDescription());
                attribute.setDefaultValue(attr.getDefaultValue());
                attribute.setNullable(String.valueOf(attr.isNullableFlag()));
                attribute.setHashtag(attr.getDescription());
                attribute.setReferToId(attr.getReferBtmTypeId());
                attribute.setReferToName(attr.getReferBtmTypeName());
                attribute.setTs(now);
                attribute.setCreateTime(now);
                attribute.setCreateUser(AuthUtil.getUserId());
                idAttrMap.put(attribute.getKey(),attribute);
                // åœ¨è¿™é‡Œç»™ä¸šåŠ¡ç±»åž‹è®¾ç½®ç‰ˆæœ¬æŽ§åˆ¶ã€ç”Ÿå‘½å‘¨æœŸæŽ§åˆ¶ã€å¯†çº§æŽ§åˆ¶ç›¸å…³çš„信息

                // æ·»åŠ ä¸šåŠ¡ç±»åž‹å’Œå±žæ€§çš„关系
                BtmTypeAttribute btmTypeAttribute = Objects.requireNonNull(BeanUtil.copy(attr, BtmTypeAttribute.class));
                btmTypeAttribute.setPkBtmType(btmType.getOid());
                btmTypeAttribute.setCreator(user);
                btmTypeAttribute.setCreateTime(now);
                btmTypeAttribute.setLastModifier(user);
                btmTypeAttribute.setLastModifyTime(now);
//                btmTypeAttribute.setBtmName("btmTypeAttribute");
                btmTypeAttribute.setOid(VciBaseUtil.getPk());
                btmTypeAttribute.setBtmName(btmType.getId());
                btmTypeAttribute.setOwner(user);
                btmTypeAttributes.add(btmTypeAttribute);
                return attr;
            }).map(BtmTypeLinkAttributesDTO::getId).collect(Collectors.toSet());
            attributeIds.addAll(ids);
            btmType.setLifeCycleFlag(String.valueOf(ids.stream().anyMatch(BtmTypeFieldConstant.LIFECYCLE_MANAGE_FIELD_MAP::containsKey)));
            btmType.setRevisionFlag(String.valueOf(ids.stream().anyMatch(BtmTypeFieldConstant.REVISION_MANAGE_FIELD_MAP::containsKey)));
            btmType.setSecretFlag(String.valueOf(ids.stream().anyMatch(BtmTypeFieldConstant.SECRET_MANAGE_FIELD_MAP::containsKey)));
            btmType.setConsistence(BooleanEnum.TRUE.getValue());
            btmList.add(btmType);
        });
        List<Attribute> existAttr = attributeService.list(Wrappers.<Attribute>query().lambda().in(Attribute::getKey, attributeIds));
        if (!CollectionUtils.isEmpty(btmList)){
            baseMapper.batchInsert(btmList);
        }
        if (!CollectionUtils.isEmpty(btmTypeAttributes)){
            btmTypeAttributeService.saveBatch(btmTypeAttributes);
        }
        BtmTypeFieldConstant.BASIC_FIELD_MAP.forEach((k,v) -> {
            idAttrMap.remove(k);
        });
        BtmTypeFieldConstant.LIFECYCLE_MANAGE_FIELD_MAP.forEach((k,v) -> {
            idAttrMap.remove(k);
        });
        BtmTypeFieldConstant.SECRET_MANAGE_FIELD_MAP.forEach((k,v) -> {
            idAttrMap.remove(k);
        });
        BtmTypeFieldConstant.REVISION_MANAGE_FIELD_MAP.forEach((k,v) -> {
            idAttrMap.remove(k);
        });
        if (CollectionUtils.isEmpty(existAttr)){
            attributeService.saveBatch(idAttrMap.values());
        }else {
            List<Attribute> addList = idAttrMap.values().stream().filter(a -> existAttr.stream().noneMatch(b -> StringUtils.equals(a.getKey(), b.getKey()))).collect(Collectors.toList());
            if (CollectionUtils.isEmpty(addList)) {
                attributeService.saveBatch(addList);
            }
        }
        return BtmTypeWrapper.build().listEntityVO(btmList);
    }
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java

@@ -84,7 +84,7 @@
     */
    public BtmType entityBeforeSave(BtmType btmTypeDO) {
        btmTypeDO.setOid(VciBaseUtil.getPk());
        btmTypeDO.setBtmname("btmType");
        btmTypeDO.setBtmName("btmType");
        Date now  = new Date();
        String userAccount = AuthUtil.getUserAccount();
        btmTypeDO.setLastModifier(userAccount);

 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml

@@ -5,46 +5,64 @@
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="baseResultMap" type="com.vci.ubcs.omd.entity.Attribute">
        <id column="id" property="id"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>
        <result column="create_time" property="createTime"/>
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="key" property="key"/>
        <result column="label" property="label"/>
        <result column="create_user" property="createUser" jdbcType="NUMERIC"/>
        <result column="create_dept" property="createDept" jdbcType="NUMERIC"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_user" property="updateUser" jdbcType="NUMERIC"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
        <result column="status" property="status" jdbcType="NUMERIC"/>
        <result column="is_deleted" property="isDeleted" jdbcType="NUMERIC"/>
        <result column="tenant_id" property="tenantId" jdbcType="NUMERIC"/>
        <result column="key" property="key" jdbcType="VARCHAR"/>
        <result column="label" property="label" jdbcType="VARCHAR"/>
        <result column="type_code" property="typeCode"/>
        <result column="type_key" property="typeKey"/>
        <result column="hashtag" property="hashtag" jdbcType="VARCHAR"/>
        <result column="description" property="description" jdbcType="VARCHAR"/>
        <result column="nullable" property="nullable"/>
        <result column="max_length" property="maxLength"/>
        <result column="precision" property="precision"/>
        <result column="refer_type_code" property="referTypeCode"/>
        <result column="refer_type_key" property="referTypeKey"/>
        <result column="refer_to_id" property="referToId" jdbcType="VARCHAR"/>
        <result column="refer_to_name" property="referToName"/>
        <result column="using_dict" property="usingDict"/>
        <result column="dict_code" property="dictCode"/>
        <result column="dict_key" property="dictKey"/>
        <result column="default_value" property="defaultValue"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
        <result column="create_dept" property="createDept" jdbcType="VARCHAR"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
        <result column="ts" property="ts" jdbcType="TIMESTAMP"/>
    </resultMap>

    <resultMap id="extraResultMap" type="com.vci.ubcs.omd.entity.Attribute">
        <result column="nullable" property="nullable" jdbcType="VARCHAR"/>
        <result column="max_length" property="maxLength" jdbcType="NUMERIC"/>
        <result column="precision" property="precision" jdbcType="NUMERIC"/>
        <result column="refer_to_id" property="referToId" jdbcType="NUMERIC"/>
        <result column="refer_type_code" property="referTypeCode" jdbcType="VARCHAR"/>
        <result column="refer_type_key" property="referTypeKey" jdbcType="VARCHAR"/>
        <result column="refer_to_name" property="referToName" jdbcType="VARCHAR"/>
<!--        <result column="using_dict" property="usingDict" jdbcType="VARCHAR"/>-->
<!--        <result column="dict_code" property="dictCode" jdbcType="VARCHAR"/>-->
<!--        <result column="dict_key" property="dictKey" jdbcType="VARCHAR"/>-->
        <result column="default_value" property="defaultValue" jdbcType="VARCHAR"/>

    </resultMap>


    <sql id="base_query_column">
        id, tenant_id ,key ,label ,type_code , type_key , hashtag , description, nullable , max_length, precision,
            refer_type_code, refer_type_key, refer_to_id, refer_to_name, using_dict, dict_code, dict_key, default_value,
            status, is_deleted, create_user, create_dept, create_time, update_user, update_time , ts
    </sql>
    <sql id="tableName">
        pl_omd_attribute
    </sql>
    <select id="selectAll" resultMap="baseResultMap">
        select
        <include refid="base_query_column"/>
        from
        <include refid="tableName"/>
    </select>
    <select id="selectByPrimaryKeyCollection" resultMap="baseResultMap">
        select DISTINCT <include refid="base_query_column" />
        from <include refid="tableName"/>
        <where>
            <foreach collection="oids" item="item" index="arrayindex" open=" OID in ( " close=")" >
                #{item,jdbcType=VARCHAR}
                <if test="(arrayindex != oids.size() -1)">
                    ,
                </if>
            </foreach>
        </where>
    </select>


</mapper>

 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,111 @@
<?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.omd.mapper.BtmTypeAttributeMapper">

    <resultMap id="base_result_map" type="com.vci.ubcs.omd.entity.BtmTypeAttribute">
        <id column="oid" jdbcType="VARCHAR" property="oid"/>
        <result column="id" jdbcType="VARCHAR" property="id"/>
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="description" jdbcType="VARCHAR" property="description"/>
        <result column="pk_btm_type" jdbcType="VARCHAR" property="pkBtmType"/>
        <result column="attribute_length" jdbcType="DECIMAL" property="attributeLength"/>
        <result column="attr_data_type" jdbcType="VARCHAR" property="attrDataType"/>
        <result column="nullable_flag" jdbcType="VARCHAR" property="nullableFlag"/>
        <result column="default_value" jdbcType="VARCHAR" property="defaultValue"/>
        <result column="precision_length" jdbcType="DECIMAL" property="precisionLength"/>
        <result column="scale_length" property="scaleLength" jdbcType="DECIMAL"/>
        <result column="range" jdbcType="VARCHAR" property="range"/>
        <result column="refer_btm_type_id" jdbcType="VARCHAR" property="referBtmTypeId"/>
        <result column="refer_btm_type_name" jdbcType="VARCHAR" property="referBtmTypeName"/>
        <result column="enum_id" jdbcType="VARCHAR" property="enumId"/>
        <result column="enum_name" jdbcType="VARCHAR" property="enumName"/>
        <result column="btm_name" property="btmName" jdbcType="VARCHAR"/>
        <result column="owner" property="owner" jdbcType="VARCHAR"/>
        <result column="creator" jdbcType="VARCHAR" property="creator"/>
        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
        <result column="last_modifier" jdbcType="VARCHAR" property="lastModifier"/>
        <result column="last_modify_time" jdbcType="TIMESTAMP" property="lastModifyTime"/>
        <result column="ts" jdbcType="TIMESTAMP" property="ts"/>
    </resultMap>

    <sql id="base_query_column">
        oid, id, name, description, pk_btm_type, attribute_length, attr_data_type, nullable_flag,
        default_value, precision_length, scale_length, range, refer_btm_type_id, refer_btm_type_name,
        enum_id, enum_name, btm_name, owner, creator, create_time, last_modifier, last_modify_time, ts
    </sql>

    <sql id="tableName">
        pl_omd_btm_type_attribute
    </sql>
    <sql id="btmTypeTableName">
        pl_omd_btm_type
    </sql>
    <update id="batchUpdate" parameterType="java.util.List">
        <foreach collection="records" item="item" index="index" open="begin" close=";end;" separator=";">
            update <include refid="tableName"/> set
                id = #{item.id,jdbcType=VARCHAR},
                name = #{item.name,jdbcType=VARCHAR},
                descrption = #{item.decription,jdbcType=VARCHAR},
                pk_btm_type = #{item.pkBtmType,jdbcType=VARCHAR},
                attribute_length = #{item.attributeLength,jdbcType=DECIMAL},
                attr_data_type = #{item.attrDataType,jdbcType=VARCHAR},
                nullable_flag = #{item.nullableFlag,jdbcType=VARCHAR},
                default_value = #{item.defaultValue,jdbcType=VARCHAR},
                precision_length = #{item.precisionLength,jdbcType=DECIMAL},
                scale_length = #{item.scaleLength,jdbcType=DECIMAL},
                range = #{item.range,jdbcType=VARCHAR},
                refer_btm_type_id = #{item.referBtmTypeId,jdbcType=VARCHAR},
                refer_btm_type_name = #{item.referBtmTypeName,jdbcType=VARCHAR},
                enum_id = #{item.enumId,jdbcType=VARCHAR},
                enum_name = #{item.enumName,jdbcType=VARCHAR},
                btm_name = #{item.btmName,jdbcType=VARCHAR},
                owner = #{item.owner,jdbcType=VARCHAR},
                creator = #{item.creator,jdbcType=VARCHAR},
                create_time = #{item.createTime,jdbcType=TIMESTAMP},
                last_modifier = #{item.lastModifier,jdbcType=VARCHAR},
                last_modify_time = #{item.lastModifyTime,jdbcType=TIMESTAMP},
                ts = #{item.ts,jdbcType=TIMESTAMP}
        </foreach>
    </update>
    <delete id="batchDelete">
        delete from
        <include refid="tableName"/>
        <where>
            <foreach collection="records" item="item" index="arrayindex" open="oid in (" close=")">
                #{item,jdbcType=VARCHAR}
                <if test="(arrayindex != records.size() -1)">
                    ,
                </if>
            </foreach>
        </where>
    </delete>
    <select id="selectByBtmTypeIdAndAttributeIds" resultType="com.vci.ubcs.omd.entity.BtmTypeAttribute">
        select <include refid="base_query_column"/>
        from <include refid="tableName" />
        where PKBTMTYPE = (select oid from <include refid="btmTypeTableName"/> where lower(id) = lower(#{btmTypeId,jdbcType=VARCHAR}) )
        <if test="ids.size() > 0">
            and
            <foreach collection="ids" item="item" index="arrayindex" open=" lower(ID) in ( " close=")" >
                lower(#{item,jdbcType=VARCHAR})
                <if test="(arrayindex != ids.size() -1)">
                    ,
                </if>
            </foreach>
        </if>
    </select>
    <select id="selectByBtmTypeIds" resultType="com.vci.ubcs.omd.entity.BtmTypeAttribute">
        select DISTINCT <include refid="base_query_column" />
        from <include refid="tableName" />
        where PKBTMTYPE IN (
        select oid from <include refid="btmTypeTableName"/> where
        <foreach collection="ids" item="item" index="arrayindex" open=" lower(ID) in ( " close=")" >
            lower(#{item,jdbcType=VARCHAR})
            <if test="(arrayindex != ids.size() -1)">
                ,
            </if>
        </foreach>
        )
        order by id asc
    </select>

</mapper>

 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,221 @@
<?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.omd.mapper.BtmTypeMapper">


    <resultMap id="BaseResultMap" type="com.vci.ubcs.omd.entity.BtmType">
        <id column="oid" jdbcType="VARCHAR" property="oid" />
        <result column="id" jdbcType="VARCHAR" property="id" />
        <result column="name" jdbcType="VARCHAR" property="name" />
        <result column="description" jdbcType="VARCHAR" property="description" />
        <result column="table_name" jdbcType="VARCHAR" property="tableName" />
        <result column="revision_rule_id" jdbcType="VARCHAR" property="revisionRuleId" />
        <result column="revision_rule_name" jdbcType="VARCHAR" property="revisionRuleName" />
        <result column="revision_sep" jdbcType="VARCHAR" property="revisionSep" />
        <result column="revision_flag" jdbcType="VARCHAR" property="revisionFlag" />
        <result column="input_revision_flag" jdbcType="VARCHAR" property="inputRevisionFlag" />
        <result column="secret_flag" jdbcType="VARCHAR" property="secretFlag" />
        <result column="abstract_flag" jdbcType="VARCHAR" property="abstractFlag" />
        <result column="impl_class" jdbcType="VARCHAR" property="implClass" />
        <result column="shape" jdbcType="VARCHAR" property="shape" />
        <result column="life_cycle_flag" jdbcType="VARCHAR" property="lifeCycleFlag" />
        <result column="life_cycle_id" jdbcType="VARCHAR" property="lifeCycleId" />
        <result column="life_cycle_name" jdbcType="VARCHAR" property="lifeCycleName" />
        <result column="version_rule" jdbcType="VARCHAR" property="versionRule" />
        <result column="sub_life_cycle_id" jdbcType="VARCHAR" property="subLifeCycleId" />
        <result column="sub_life_cycle_name" jdbcType="VARCHAR" property="subLifeCycleName" />
        <result column="view_flag" jdbcType="VARCHAR" property="viewFlag" />
        <result column="view_create_sql" jdbcType="VARCHAR" property="viewCreateSql" />
        <result column="btm_name" property="btmName" jdbcType="VARCHAR" />
        <result column="owner" property="owner" jdbcType="VARCHAR" />
        <result column="creator" jdbcType="VARCHAR" property="creator" />
        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
        <result column="last_modifier" jdbcType="VARCHAR" property="lastModifier" />
        <result column="last_modify_time" jdbcType="TIMESTAMP" property="lastModifyTime" />
        <result column="ts" jdbcType="TIMESTAMP" property="ts" />
        <result column="domain" jdbcType="VARCHAR" property="domain" />
        <result column="consistence" jdbcType="VARCHAR" property="consistence" />
    </resultMap>

    <sql id="base_query_column">
        oid, id, name, description, table_name, revision_rule_id, revision_rule_name,revision_flag,
    revision_sep, input_revision_flag, secret_flag, abstract_flag, impl_class, shape,life_cycle_flag, life_cycle_id,life_cycle_name,
    version_rule,sub_life_cycle_id,sub_life_cycle_name, view_flag, view_create_sql,btm_name, owner, creator, create_time, last_modifier,
    last_modify_time, ts,domain,consistence
    </sql>
    <sql id="tableName">
        pl_omd_btm_type
    </sql>
    <insert id="batchInsert" useGeneratedKeys="false">
        insert into <include refid="tableName"/> (
            <include refid="base_query_column"/>
        )
        <foreach collection="records" item="item" separator="union all">
            (
            select #{item.oid,jdbcType=VARCHAR},
                   #{item.id,jdbcType=VARCHAR},
                   #{item.name,jdbcType=VARCHAR},
            #{item.description,jdbcType=VARCHAR},
            #{item.tableName,jdbcType=VARCHAR},
            #{item.revisionRuleId,jdbcType=VARCHAR},
            #{item.revisionRuleName,jdbcType=VARCHAR},
            #{item.revisionFlag,jdbcType=VARCHAR},
            #{item.revisionSep,jdbcType=VARCHAR},
            #{item.inputRevisionFlag,jdbcType=VARCHAR},
            #{item.secretFlag,jdbcType=VARCHAR},
            #{item.abstractFlag,jdbcType=VARCHAR},
            #{item.implClass,jdbcType=VARCHAR},
            #{item.shape,jdbcType=VARCHAR},
            #{item.lifeCycleFlag,jdbcType=VARCHAR},
            #{item.lifeCycleId,jdbcType=VARCHAR},
            #{item.lifeCycleName,jdbcType=VARCHAR},
            #{item.versionRule,jdbcType=VARCHAR},
            #{item.subLifeCycleId,jdbcType=VARCHAR},
            #{item.subLifeCycleName,jdbcType=VARCHAR},
            #{item.viewFlag,jdbcType=VARCHAR},
            #{item.viewCreateSql,jdbcType=VARCHAR},
            #{item.btmName,jdbcType=VARCHAR },
            #{item.owner,jdbcType=VARCHAR },
            #{item.creator,jdbcType=VARCHAR},
            #{item.createTime,jdbcType=TIMESTAMP},
            #{item.lastModifier,jdbcType=VARCHAR},
            #{item.lastModifyTime,jdbcType=TIMESTAMP},
            #{item.ts,jdbcType=TIMESTAMP},
            #{item.domain,jdbcType=VARCHAR},
            #{item.consistence,jdbcType=VARCHAR}
            from dual
            )
        </foreach>
    </insert>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
        delete from <include refid="tableName"/>
        where OID = #{oid,jdbcType=VARCHAR}
    </delete>

    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
        select <include refid="base_query_column"/>
        from <include refid="tableName" />
        where OID = #{oid,jdbcType=VARCHAR}
    </select>

    <select id="selectByPrimaryKeys" resultMap="BaseResultMap">
        select <include refid="base_query_column" />
        from <include refid="tableName" />
        where OID in ( ${oids,jdbcType=VARCHAR})
    </select>

    <select id="selectByPrimaryKeyCollection" resultMap="BaseResultMap">
        select <include refid="base_query_column" />
        from <include refid="tableName" />
        <where>
            <foreach collection="oids" item="item" index="arrayindex" open=" OID in ( " close=")" >
                #{item,jdbcType=VARCHAR}
                <if test="(arrayindex != oids.size() -1)">
                    ,
                </if>
            </foreach>
        </where>
    </select>

    <select id="selectByIdCollection" resultMap="BaseResultMap">
        select <include refid="base_query_column" />
        from <include refid="tableName" />
        <where>
            <foreach collection="ids" item="item" index="arrayindex" open=" lower(ID) in ( " close=")" >
                lower(#{item,jdbcType=VARCHAR})
                <if test="(arrayindex != ids.size() -1)">
                    ,
                </if>
            </foreach>
        </where>
    </select>

    <select id="selectAll" resultMap="BaseResultMap">
        select <include refid="base_query_column"/>
        from <include refid="tableName" />
    </select>

    <update id="updateByPrimaryKey" parameterType="com.vci.ubcs.omd.entity.BtmType">
        update <include refid="tableName"/>
        set id = #{id,jdbcType=VARCHAR},
            name = #{name,jdbcType=VARCHAR},
            description = #{description,jdbcType=VARCHAR},
            table_name = #{tableName,jdbcType=VARCHAR},
            revision_rule_id = #{revisionRuleId,jdbcType=VARCHAR},
            revision_flag = #{revisionFlag,jdbcType=VARCHAR},
            revision_rule_name = #{revisionRuleName,jdbcType=VARCHAR},
            revision_sep = #{revisionSep,jdbcType=VARCHAR},
            input_revision_flag = #{inputRevisionFlag,jdbcType=VARCHAR},
            secret_flag = #{secretFlag,jdbcType=VARCHAR},
            abstract_flag = #{abstractFlag,jdbcType=VARCHAR},
            impl_class = #{implClass,jdbcType=VARCHAR},
            shape = #{shape,jdbcType=VARCHAR},
            life_cycle_flag = #{lifeCycleFlag,jdbcType=VARCHAR},
            life_cycle_id = #{lifeCycleId,jdbcType=VARCHAR},
            life_cycle_name = #{lifeCycleName,jdbcType=VARCHAR},
            version_rule = #{versionRule,jdbcType=VARCHAR},
            sub_life_cycle_id = #{subLifeCycleId,jdbcType=VARCHAR},
            sub_life_cycle_name = #{subLifeCycleName,jdbcType=VARCHAR},
            view_flag = #{viewFlag,jdbcType=VARCHAR},
            view_create_sql = #{viewCreateSql,jdbcType=VARCHAR},
            btm_name =#{btmName,jdbcType=VARCHAR },
            owner = #{owner,jdbcType=VARCHAR },
            creator = #{creator,jdbcType=VARCHAR},
            create_time = #{createTime,jdbcType=TIMESTAMP},
            last_modifier = #{lastModifier,jdbcType=VARCHAR},
            last_modify_time = #{lastModifyTime,jdbcType=TIMESTAMP},
            ts = #{ts,jdbcType=TIMESTAMP},
            domain = #{domain,jdbcType=VARCHAR},
            consistence = #{consistence,jdbcType=VARCHAR}
        where OID = #{oid,jdbcType=VARCHAR}
    </update>


    <select id="selectNameByOid" resultType="java.lang.String">
        select NAME from <include refid="tableName" />
        where OID = #{oid,jdbcType=VARCHAR}
    </select>
    <select id="selectNameById" resultType="java.lang.String">
        select NAME from <include refid="tableName" />
        where ID = #{id,jdbcType=VARCHAR}
    </select>


    <select id="selectByAttributeOid" resultMap="BaseResultMap">
        select <include refid="base_query_column"/>
        from <include refid="tableName" /> where oid in (
        select DISTINCT PKBTMTYPE from <include refid="tableName"/>ATTRIBUTE
        where lower(ATTRIBUTEID) in (select id from vcibt_ATTRIBUTE where oid = #{pkAttribute,jdbcType=VARCHAR} ) )
    </select>


    <select id="selectByRevisionRuleOid" resultMap="BaseResultMap">
        select <include refid="base_query_column"/>
        from <include refid="tableName" /> where REVISIONRULEID in
        (select DISTINCT  id from  vcibt_REVISIONRULE where oid = #{pkRevisionRule,jdbcType=VARCHAR} )
    </select>


    <select id="selectByLifeCycleOid" resultMap="BaseResultMap">
        select <include refid="base_query_column"/>
        from <include refid="tableName" /> where LIFECYCLEID in
        (select DISTINCT  id from  vcibt_LIFECYCLE where oid = #{pkLifeCycle,jdbcType=VARCHAR} )
    </select>

    <delete id="batchDeleteByOids" >
        delete from <include refid="tableName" />
        <where>
            <foreach collection="oids" item="item" index="arrayindex" open=" oid in ( " close=")" >
                #{item,jdbcType=VARCHAR}
                <if test="(arrayindex != oids.size() -1)">
                    ,
                </if>
            </foreach>
        </where>
    </delete>




</mapper>

 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/ModifyAttributeInfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
<?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.omd.mapper.ModifyAttributeInfoMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="baseResultMap" type="com.vci.ubcs.omd.entity.ModifyAttributeInfo">
        <id column="oid" property="oid" jdbcType="VARCHAR" />
        <result column="id" property="id" jdbcType="VARCHAR" />
        <result column="name" property="name" jdbcType="VARCHAR" />
        <result column="description" property="description" jdbcType="VARCHAR" />
        <result column="business_type" property="businessType" jdbcType="VARCHAR" />
        <result column="table_name" property="tableName" jdbcType="VARCHAR" />
        <result column="task_name" property="taskName" jdbcType="VARCHAR" />
        <result column="modify_column_reason" property="modifyColumnReason" jdbcType="VARCHAR" />
        <result column="order_modify_user_name" property="orderModifyUserName" jdbcType="VARCHAR" />
        <result column="order_modify_date" property="orderModifyDate" jdbcType="TIMESTAMP" />
        <result column="handle_finish_flag" property="handleFinishFlag" jdbcType="VARCHAR" />
        <result column="handle_user_name" property="handleUserName" jdbcType="VARCHAR" />
        <result column="handle_date" property="handleDate" jdbcType="TIMESTAMP" />
        <result column="handle_result" property="handleResult" jdbcType="VARCHAR" />
        <result column="btm_name" property="btmname" jdbcType="VARCHAR" />
        <result column="creator" property="creator" jdbcType="VARCHAR" />
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="TS" property="ts" jdbcType="TIMESTAMP" />
        <result column="add_attributes" property="addAttributes" jdbcType="CLOB" />
        <result column="modify_attributes" property="modifyAttributes" jdbcType="CLOB" />
        <result column="delete_attributes" property="deleteAttributes" jdbcType="CLOB" />
        <result column="before_modify_attributes" property="beforeModifyAttributes" jdbcType="CLOB" />

    </resultMap>

    <resultMap id="extraResultMap" type="com.vci.ubcs.omd.entity.Attribute">

    </resultMap>

    <sql id="base_query_column">
        oid, id, name, description, business_type, table_name, task_name, modify_column_reason, order_modify_user_name,
        order_modify_date, handle_finish_flag, handle_user_name, handle_date, handle_result, btm_name, creator, create_time,
        ts, add_attributes, modify_attributes, delete_attributes, before_modify_attributes
    </sql>
    <sql id="tableName">
        pl_omd_modify_attribute_info
    </sql>



</mapper>