From 7a6bb589a47ff7ef5b1553dc0fcf34a05af1b6cb Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 18:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-ddl-api/src/main/java/com/vci/ubcs/ddl/bo/DdlFieldMappingAttrBO.java | 13
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessorStrategy.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMsMapperProcessor.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMySqlMapperProcessor.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/VciSpringUtil.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlDmMapperProcessor.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml | 5
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 1050 ++++++++++++++++++++++++++++---------------------------
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlOracleMapperProcessor.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java | 21
Source/UBCS-WEB/src/views/modeling/Business.vue | 10
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 4
19 files changed, 590 insertions(+), 539 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 35923fd..c29b168 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -82,7 +82,7 @@
<i :class="icons.revisionRule"></i>
鐗堟湰瑙勫垯
</template>
- {{ obj.versionRule }}
+ {{ obj.revisionRuleName }}
</el-descriptions-item>
<el-descriptions-item :labelStyle="descriptionOption.labelStyle"
:contentStyle="descriptionOption.contentStyle">
@@ -350,8 +350,12 @@
this.ifRefreshBtmAddRefresh();
},
businessEdit() {
- var json = JSON.stringify(this.obj);
- this.$refs.btmAdd.btmType = JSON.parse(json);
+ if (!this.obj.oid){
+ this.$message.warning("璇烽�夋嫨涓�鏉″彾瀛愯妭鐐圭殑涓氬姟绫诲瀷");
+ return;
+ }
+ const json = JSON.stringify(this.obj);
+ this.$refs.btmAdd.btmType =JSON.parse(json);
this.$refs.btmAdd.showSubmitDialog = true;
this.ifRefreshBtmAddRefresh();
},
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index e8abccc..ca03ae9 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -1,555 +1,575 @@
<template>
- <el-dialog
+ <el-dialog
title="涓氬姟绫诲瀷"
:visible.sync="showSubmitDialog"
append-to-body
@close="closeSubmitDialog"
width="70%"
style="height: 115vh;"
+ >
+ <el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm"
+ :rules="rules" @resetFields="resetForm" status-icon="true">
+ <el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true" prop="id">
+ <el-input v-model="btmType.id" :prefix-icon="icons.key"></el-input>
+ </el-form-item>
+ <el-form-item label="涓枃鍚嶇О" label-width="100px">
+ <el-input v-model="btmType.name" :prefix-icon="icons.name"></el-input>
+ </el-form-item>
+ <el-form-item label="鏁版嵁搴撹〃鍚�" label-width="100px">
+ <el-input v-model="btmType.tableName" :prefix-icon="icons.tableName"></el-input>
+ </el-form-item>
+ <el-form-item label="鎵�灞為鍩�" label-width="100px" prop="domain" class="domainSelect">
+ <el-select v-model="btmType.bizDomain" :prefix-icon="icons.domain">
+ <el-option v-for="item in domainOption"
+ :label="item.label" :value="item.value" :key="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐗堟湰瑙勫垯" label-width="100px">
+ <el-input v-model="btmType.revisionRuleName" :prefix-icon="icons.revisionRule" class="revisionRule"
+ @focus="openRevision" clearable @clear="clearRevision">
+ <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鐢熷懡鍛ㄦ湡" label-width="100px">
+ <el-input v-model="btmType.lifeCycleId" :prefix-icon="icons.lifeCycle">
+ <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+ <div>
+ <el-form-item label="寮�鍚鍥�" label-width="100px" class="viewFlag">
+ <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>
+ </el-form-item>
+ <el-form-item label="瑙嗗浘璇彞" label-width="100px" class="viewInput">
+ <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>
+ </el-form-item>
+ </div>
+ <el-form-item label="鎻忚堪" label-width="100px" class="description">
+ <el-input v-model="btmType.description"
+ :prefix-icon="icons.desc"
+ class="descClass"
+ id="descId"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+ <avue-crud :option="option"
+ :data="btmType.attributes"
+ :page.sync="page"
+ ref="attrTable">
+ <template slot-scope="scope" slot="menuLeft">
+ <el-button type="danger"
+ icon="el-icon-plus"
+ size="small"
+ @click="rowAdd()">灞炴�ч�夋嫨
+ </el-button>
+ </template>
+ <template slot="attrDataTypeText" slot-scope="{row}">
+ <el-tag>{{ row.attrDataTypeText }}</el-tag>
+ </template>
+ <template slot="menu" slot-scope="{row,index}">
+ <el-button icon="el-icon-edit" size="small" type="text" v-if="!row.$cellEdit" @click="cellEditClick(row)">缂栬緫
+ </el-button>
+ <el-button icon="el-icon-delete" size="small" type="text" v-if="!row.$cellEdit"
+ @click="removeFormAttrTable(row,index)">绉婚櫎
+ </el-button>
+ <el-button icon="el-icon-check" size="small" type="text" v-if="row.$cellEdit" @click="cellEditSave(row,index)">
+ 淇濆瓨
+ </el-button>
+ </template>
+ </avue-crud>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitBtmType">纭畾</el-button>
+ <el-button @click="cancleSubmitBtmType">鍙栨秷</el-button>
+ </div>
+
+ <!-- 灞炴�ф睜鐨勯�夋嫨 -->
+ <el-dialog title="灞炴�ф睜"
+ :visible="attrRef.visible"
+ append-to-body
+ @close="closeAttrDialog"
+ width="80%"
>
- <el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm" :rules="rules" @resetFields="resetForm" status-icon="true">
- <el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true" prop="id">
- <el-input v-model="btmType.id" :prefix-icon="icons.key"></el-input>
- </el-form-item>
- <el-form-item label="涓枃鍚嶇О" label-width="100px">
- <el-input v-model="btmType.name" :prefix-icon="icons.name"></el-input>
- </el-form-item>
- <el-form-item label="鏁版嵁搴撹〃鍚�" label-width="100px">
- <el-input v-model="btmType.tableName" :prefix-icon="icons.tableName"></el-input>
- </el-form-item>
- <el-form-item label="鎵�灞為鍩�" label-width="100px" prop="domain">
- <el-select v-model="btmType.domain" :prefix-icon="icons.domain">
- <el-option v-for="item in domainOption"
- :label="item.label" :value="item.value" :key="item.value"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐗堟湰瑙勫垯" label-width="100px">
- <el-input v-model="btmType.revisionRuleName" :prefix-icon="icons.revisionRule" class="revisionRule"
- @focus="openRevision" clearable @clear="clearRevision">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
- </el-input>
- </el-form-item>
- <el-form-item label="鐢熷懡鍛ㄦ湡" label-width="100px">
- <el-input v-model="btmType.lifeCycleId" :prefix-icon="icons.lifeCycle">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
- </el-input>
- </el-form-item>
- <div>
- <el-form-item label="寮�鍚鍥�" label-width="100px" class="viewFlag">
- <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>
- </el-form-item>
- <el-form-item label="瑙嗗浘璇彞" label-width="100px">
- <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>
- </el-form-item>
- </div>
- <el-form-item label="鎻忚堪" label-width="100px" class="description">
- <el-input v-model="btmType.description"
- :prefix-icon="icons.desc"
- class="descClass"
- id="descId"
- ></el-input>
- </el-form-item>
- </el-form>
- <avue-crud :option="option"
- :data="btmType.attributes"
- :page.sync="page"
- ref="attrTable">
- <template slot-scope="scope" slot="menuLeft">
- <el-button type="danger"
- icon="el-icon-plus"
- size="small"
- @click="rowAdd()">灞炴�ч�夋嫨</el-button>
- </template>
- <template slot="menu" slot-scope="{row,index}">
- <el-button icon="el-icon-edit" size="small" type="text" v-if="!row.$cellEdit" @click="cellEditClick(row)">缂栬緫</el-button>
- <el-button icon="el-icon-delete" size="small" type="text" v-if="!row.$cellEdit" @click="removeFormAttrTable(row,index)">绉婚櫎</el-button>
- <el-button icon="el-icon-check" size="small" type="text" v-if="row.$cellEdit" @click="cellEditSave(row,index)">淇濆瓨</el-button>
- </template>
- </avue-crud>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitBtmType">纭畾</el-button>
- <el-button @click="cancleSubmitBtmType">鍙栨秷</el-button>
- </div>
-
-<!-- 灞炴�ф睜鐨勯�夋嫨 -->
- <el-dialog title="灞炴�ф睜"
- :visible="attrRef.visible"
- append-to-body
- @close="closeAttrDialog"
- width="80%"
- >
- <avue-crud class="attrRef"
- :option="attrRef.option"
- :data="attrRef.data"
- :page.sync="attrRef.page"
- ref="attrRef"
- @on-load="attrRefOnLoad"
- @search-change="attrRefSearch"
- @selection-change="selectionChange"
- v-loading="attrRef.loading">
- <template slot="typeValue" slot-scope="scope" >
- <el-tag>{{scope.row.typeValue}}</el-tag>
- </template>
- </avue-crud>
- <div slot="footer" class="dialog-footer">
- <el-button @click="confirmSelectAttr">纭畾</el-button>
- <el-button @click="cancleSelectAttr">鍙栨秷</el-button>
- </div>
- </el-dialog>
-<!-- 鐗堟湰瑙勫垯鐨勫弬鐓� -->
- <el-dialog title="璇烽�夋嫨鐗堟湰瑙勫垯"
- :visible.sync="revisionRef.visible"
- append-to-body
- width="80%">
-
- <avue-crud class="revisionRef"
- :option="revisionRef.option"
- :data="revisionRef.data"
- :page.sync="revisionRef.page"
- ref="revisionRef"
- @row-click="revisionClick">
- <template slot="radio"
- slot-scope="{row}">
- <el-radio v-model="revisionRef.selectRow"
- :label="row.$index">
- </el-radio>
- </template>
- </avue-crud>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="confirmRevision">纭畾</el-button>
- <el-button @click="cancelRevision">鍙栨秷</el-button>
- </div>
- </el-dialog>
+ <avue-crud class="attrRef"
+ :option="attrRef.option"
+ :data="attrRef.data"
+ :page.sync="attrRef.page"
+ ref="attrRef"
+ @on-load="attrRefOnLoad"
+ @search-change="attrRefSearch"
+ @selection-change="selectionChange"
+ v-loading="attrRef.loading">
+ <template slot="typeValue" slot-scope="scope">
+ <el-tag>{{ scope.row.typeValue }}</el-tag>
+ </template>
+ </avue-crud>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="confirmSelectAttr">纭畾</el-button>
+ <el-button @click="cancleSelectAttr">鍙栨秷</el-button>
+ </div>
</el-dialog>
+ <!-- 鐗堟湰瑙勫垯鐨勫弬鐓� -->
+ <el-dialog title="璇烽�夋嫨鐗堟湰瑙勫垯"
+ :visible.sync="revisionRef.visible"
+ append-to-body
+ width="80%">
+
+ <avue-crud class="revisionRef"
+ :option="revisionRef.option"
+ :data="revisionRef.data"
+ :page.sync="revisionRef.page"
+ ref="revisionRef"
+ @row-click="revisionClick">
+ <template slot="radio"
+ slot-scope="{row}">
+ <el-radio v-model="revisionRef.selectRow"
+ :label="row.$index">
+ </el-radio>
+ </template>
+ </avue-crud>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="confirmRevision">纭畾</el-button>
+ <el-button @click="cancelRevision">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
+ </el-dialog>
</template>
<script>
-import { add,update } from '@/api/omd/btmType';
-import { queryPage } from '@/api/omd/OmdAttribute';
-import { getPage } from '@/api/omd/revisionRule';
+import {add, update} from '@/api/omd/btmType';
+import {queryPage} from '@/api/omd/OmdAttribute';
+import {getPage} from '@/api/omd/revisionRule';
+
export default {
- name: 'BusinessAdd',
- props: {
- btmType:{
- type: Object
- },
- domainOption:{
- type: Array
- },
- icons: {
- type: Array
- }
+ name: 'BusinessAdd',
+ props: {
+ btmType: {
+ type: Object
},
- watch:{
- btmType:{
- handler(newval,oldval){
- console.log('鐩戝惉',newval,oldval)
- },
- deep:true,
- immediate:true
+ domainOption: {
+ type: Array
+ },
+ icons: {
+ type: Array
}
},
- data() {
- return {
- form: {},
- showSubmitDialog : false,
- option: {
- height: "330px",
- selection: false,
- headerAlign: 'center',
- border: true,
- index: true,
- rowKey: 'id',
- tabs: true,
- menu: true,
- editBtn: false,
- delBtn: false,
- menuWidth: 150,
- addBtn:false,
- highlightCurrentRow: true,
- column: [
- {
- label: '鑻辨枃鍚嶇О',
- prop: 'id',
- align: 'center'
- }, {
- label: '涓枃鍚嶇О',
- prop: 'name',
- align: 'center',
- cell: true
- },
- {
- label: "绫诲瀷",
- prop: "attrDataType",
- align: 'center',
- slot: true
- },
- {
- label: "榛樿鍊�",
- prop: "defaultValue",
- align: 'center',
- cell: true
- },
- {
- label: "璇存槑",
- prop: "description",
- align: 'center',
- cell:true
- }
- ]
- },
- attrRef:{
- visible:false,
- page: {
- currentPage:1,
- pageSize:10,
- },
- loading: false,
- key: null,
- option:{
- height: 360,
- addBtn: false,
- refreshBtn: false,
- columnBtn: false,
- selection: true,
- menu: false,
- border: true,
- reserveSelection: true,
- searchMenuSpan:8,
- highlightCurrentRow: true,
- rowKey: 'id',
- column: [
- {
- label: '鑻辨枃鍚嶇О',
- prop: 'id',
- align: 'left',
- search: true,
- width: 230
- }, {
- label: '涓枃鍚嶇О',
- prop: 'name',
- align: 'center',
- },
- {
- label: "绫诲瀷",
- prop: "typeValue",
- align: 'center',
- slot: true,
- },
- {
- label: "榛樿鍊�",
- prop: "defaultValue",
- align: 'center'
- },
- {
- label: '鍏佽涓虹┖',
- prop: 'nullable',
- type: 'switch',
- display: false,
- hide: true,
- labelWidth: 132,
- dicData: [{
- label: '鍚�',
- value: 1
- }, {
- label: '鏄�',
- value: 0
- }]
- },
- {
- label: "璇存槑",
- prop: "description",
- cell:true,
- align: 'center'
- }
- ]
- },
- data: [],
- queryNotIn: ''
- },
- revisionRef: {
- visible: false,
- page: {
- currentPage:1,
- pageSize: 10
- },
- selectRow:'',
- searchKey: null,
- option:{
- height: 360,
- addBtn: false,
- refreshBtn: false,
- columnBtn: false,
- menu: false,
- border: true,
- reserveSelection: true,
- searchMenuSpan:8,
- searchShowBtn: false,
- highlightCurrentRow: true,
- column:[{
- label: '閫夋嫨',
- prop: 'radio',
- width: 60,
- hide: false
- },
- {
- label:'鑻辨枃鍚嶇О',
- prop: 'id',
- search:true
- },
- {
- label:"涓枃鍚嶇О",
- prop:"name",
- search:true,
- },
- {
- label:"璺宠穬瀛楃",
- prop: "skipCode"
- },
- {
- label: "鍒濆鍊�",
- prop:"startCode"
- },
- {
- label: "姝ラ暱",
- prop: "serialStep"
- },
- {
- label: "鍓嶇紑",
- prop:"prefixCode"
- },
- {
- label: "鍚庣紑",
- prop: "suffixCode"
- },
- {
- label: "鎻忚堪",
- prop:"description",
- type:"textarea"
- }
- ]
- },
- },
- rules: {
- id: [
- { required: true, message: '璇疯緭鍏ヤ笟鍔＄被鍨嬬紪鍙�', trigger: 'blur' },
- { pattern: /^[A-Za-z]+$/, message: '涓氬姟绫诲瀷缂栧彿鍙兘涓鸿嫳鏂�', trigger: 'blur' },
- { min: 2, max: 20, message: '闀垮害鍦�2鍒�20涓瓧绗�', trigger: 'blur' }
- ],
- domain: [
- { required: true, message: '璇烽�夋嫨鎵�灞為鍩�', trigger: 'blur' }
- ]
- },
- }
- },
- created() {
-
- },
- methods: {
- // 鍏抽棴缁勪欢寮圭獥
- closeSubmitDialog(){
- this.showSubmitDialog = false;
- this.btmType.attributes = [];
- this.btmType = {};
- this.attrRef.selectData = [];
- this.attrRef.queryNotIn = null;
- this.resetForm();
- },
- // 鍏抽棴灞炴�ф睜鏌ヨ寮圭獥
- closeAttrDialog(){
- this.attrRef.visible = false;
- },
- // 灞炴�ч�夋嫨娣诲姞
- async rowAdd() {
- await this.attrRefOnLoad();
- this.attrRef.visible = true;
- },
- // 灞炴�ф睜鍔犺浇
- attrRefOnLoad(){
- if (this.attrRef.queryNotIn != ''){
- this.attrRef.queryNotIn = '';
- this.btmType.attributes.forEach(item => {
- this.attrRef.queryNotIn += (item.id + ",")
- })
- }
- this.attrRef.loading = true;
- queryPage(this.attrRef.key,this.attrRef.queryNotIn,this.attrRef.page.currentPage, this.attrRef.page.pageSize).then(res => {
- const data = res.data.data;
- this.attrRef.page.total = data.total;
- this.attrRef.data = data.records;
- });
- setTimeout(() => {
- this.attrRef.loading = false;
- },600)
- this.$nextTick(() => {
- this.$refs.attrRef.refreshTable();
- });
- },
- // 灞炴�ф睜妫�绱�
- attrRefSearch(form,done){
- this.attrRef.key = form.id;
- this.attrRefOnLoad();
- done();
- this.attrRef.key = null;
- },
- // 浠庡睘鎬ф睜涓Щ闄�
- removeFormAttrTable(row,index){
- this.btmType.attributes.splice(index,1);
- this.attrRef.queryNotIn = "";
- this.btmType.attributes.forEach(item => {
- this.attrRef.queryNotIn += (item.id + ",")
- })
- },
- // 灞炴�ф睜鍕鹃�変簨浠�
- selectionChange(list){
- this.attrRef.selectData = list;
- },
- // 纭灞炴�ф睜鍕鹃��
- confirmSelectAttr(){
- if(!this.btmType.attributes) {
- this.btmType.attributes = [];
- }
- this.attrRef.selectData.forEach(item => {
- this.btmType.attributes.push({
- id: item.id,
- name: item.name,
- typeValue: item.typeValue,
- typeKey: item.typeValue,
- attrDataType : item.typeKey,
- defaultValue: item.defaultValue,
- description: item.description,
- attributeLength: item.maxLength,
- referBtmTypeId: item.referTypeCode,
- referBtmTypeName: item.referToName,
- enumId: item.dictCode,
- // enumName: item,
- });
- this.attrRef.queryNotIn += (item.id + ",")
- });
- this.attrRef.data = [];
- this.closeAttrDialog();
- },
- // 鍙栨秷灞炴�ф睜鍕鹃��
- cancleSelectAttr(){
- this.attrRef.selectData = [];
- this.closeAttrDialog();
- },
- // 娣诲姞涓氬姟绫诲瀷
- submitBtmType(){
- console.log(this.btmType);
- add(this.btmType,true).then(res => {
- // 娣诲姞瀹屾垚锛屽洖璋冪埗缁勪欢鐨勫埛鏂�
- this.$message.success('淇濆瓨鎴愬姛');
- this.cancleSubmitBtmType();
- this.$emit('refreshTable');
- })
- },
- // 鍙栨秷娣诲姞涓氬姟绫诲瀷
- cancleSubmitBtmType(){
- this.btmType = {};
- this.btmType.attributes = [];
- this.showSubmitDialog = false;
- },
- // 鍒锋柊灞炴�у垪琛�
- refreshAttrTable(){
- this.$nextTick( () => {
- this.$refs.attrTable.refreshTable();
- })
- },
- //
- viewChange(){
-
- },
- // 鍒楄〃缂栬緫
- cellEditClick(cell){
- console.log(cell);
- cell.$cellEdit = true;
- },
- // 鍒楄〃缂栬緫淇濆瓨
- cellEditSave(row){
- this.btmType.attributes[row.$index].name = row.name
- this.btmType.attributes[row.$index].defaultValue = row.defaultValue;
- this.btmType.attributes[row.$index].description = row.description;
- row.$cellEdit = false;
- },
- // 鎵撳紑鐗堟湰瑙勫垯鍙傜収
- async openRevision(){
- await getPage().then(res => {
- this.revisionRef.data = res.data.data.records;
- });
- this.revisionRef.visible = true;
- },
- // 鍏抽棴鐗堟湰瑙勫垯鍙傜収寮圭獥
- closeRevisionDialog(){
- this.revisionRef.visible = false;
- },
- // 鐗堟湰瑙勫垯鍙傜収鍒楄〃妫�绱�
- revisionRefSearch(){
-
- },
- // 鐗堟湰瑙勫垯閫変腑浜嬩欢
- revisionChange(){},
- // 纭閫変腑鐗堟湰瑙勫垯
- confirmRevision(){
- this.btmType.revisionFlag = true;
- this.btmType.revisionRuleId = this.revisionRef.selectData.id;
- this.btmType.revisionRuleName = this.revisionRef.selectData.name;
- this.btmType.inputRevisionFlag = false;
- this.cancelRevision();
- },
- // 鍙栨秷閫変腑鐗堟湰瑙勫垯
- cancelRevision(){
- this.revisionRef.selectRow = '';
- this.revisionRef.selectData = {};
- this.closeRevisionDialog();
- },
- // 鐗堟湰瑙勫垯鍗曢��
- revisionClick(row){
- this.revisionRef.selectRow = row.$index;
- this.revisionRef.selectData = {
- id: row.id,
- name: row.name,
- };
- },
- clearRevision(){
- this.$delete(this.btmType,'revisionFlag');
- this.$delete(this.btmType,'revisionRuleId');
- this.$delete(this.btmType,'revisionRuleName');
- this.$delete(this.btmType,'inputRevisionFlag');
- },
- resetForm(){
- this.btmType = {};
- this.$refs.form.resetFields();
- }
+ watch: {
+ btmType: {
+ handler(newval, oldval) {
+ console.log('鐩戝惉', newval, oldval)
+ },
+ deep: true,
+ immediate: true
}
+ },
+ data() {
+ return {
+ form: {},
+ showSubmitDialog: false,
+ option: {
+ height: "330px",
+ selection: false,
+ headerAlign: 'center',
+ border: true,
+ index: true,
+ rowKey: 'id',
+ tabs: true,
+ menu: true,
+ editBtn: false,
+ delBtn: false,
+ columnBtn: false,
+ menuWidth: 150,
+ addBtn: false,
+ highlightCurrentRow: true,
+ column: [
+ {
+ label: '鑻辨枃鍚嶇О',
+ prop: 'id',
+ align: 'center'
+ }, {
+ label: '涓枃鍚嶇О',
+ prop: 'name',
+ align: 'center',
+ cell: true
+ },{
+ label: "绫诲瀷",
+ prop: "attrDataTypeText",
+ align: 'center',
+ slot: true
+ },
+ {
+ label: "榛樿鍊�",
+ prop: "defaultValue",
+ align: 'center',
+ cell: true
+ },
+ {
+ label: "璇存槑",
+ prop: "description",
+ align: 'center',
+ cell: true
+ }
+ ]
+ },
+ attrRef: {
+ visible: false,
+ page: {
+ currentPage: 1,
+ pageSize: 10,
+ },
+ loading: false,
+ key: null,
+ option: {
+ height: 360,
+ addBtn: false,
+ refreshBtn: false,
+ columnBtn: false,
+ selection: true,
+ menu: false,
+ border: true,
+ reserveSelection: true,
+ searchMenuSpan: 8,
+ highlightCurrentRow: true,
+ rowKey: 'id',
+ column: [
+ {
+ label: '鑻辨枃鍚嶇О',
+ prop: 'id',
+ align: 'left',
+ search: true,
+ width: 230
+ }, {
+ label: '涓枃鍚嶇О',
+ prop: 'name',
+ align: 'center',
+ },
+ {
+ label: "绫诲瀷",
+ prop: "typeValue",
+ align: 'center',
+ slot: true,
+ },
+ {
+ label: "榛樿鍊�",
+ prop: "defaultValue",
+ align: 'center'
+ },
+ {
+ label: '鍏佽涓虹┖',
+ prop: 'nullable',
+ type: 'switch',
+ display: false,
+ hide: true,
+ labelWidth: 132,
+ dicData: [{
+ label: '鍚�',
+ value: 1
+ }, {
+ label: '鏄�',
+ value: 0
+ }]
+ },
+ {
+ label: "璇存槑",
+ prop: "description",
+ cell: true,
+ align: 'center'
+ }
+ ]
+ },
+ data: [],
+ queryNotIn: ''
+ },
+ revisionRef: {
+ visible: false,
+ page: {
+ currentPage: 1,
+ pageSize: 10
+ },
+ selectRow: '',
+ searchKey: null,
+ option: {
+ height: 360,
+ addBtn: false,
+ refreshBtn: false,
+ columnBtn: false,
+ menu: false,
+ border: true,
+ reserveSelection: true,
+ searchMenuSpan: 8,
+ searchShowBtn: false,
+ highlightCurrentRow: true,
+ column: [{
+ label: '閫夋嫨',
+ prop: 'radio',
+ width: 60,
+ hide: false
+ },
+ {
+ label: '鑻辨枃鍚嶇О',
+ prop: 'id',
+ search: true
+ },
+ {
+ label: "涓枃鍚嶇О",
+ prop: "name",
+ search: true,
+ },
+ {
+ label: "璺宠穬瀛楃",
+ prop: "skipCode"
+ },
+ {
+ label: "鍒濆鍊�",
+ prop: "startCode"
+ },
+ {
+ label: "姝ラ暱",
+ prop: "serialStep"
+ },
+ {
+ label: "鍓嶇紑",
+ prop: "prefixCode"
+ },
+ {
+ label: "鍚庣紑",
+ prop: "suffixCode"
+ },
+ {
+ label: "鎻忚堪",
+ prop: "description",
+ type: "textarea"
+ }
+ ]
+ },
+ },
+ rules: {
+ id: [
+ {required: true, message: '璇疯緭鍏ヤ笟鍔＄被鍨嬬紪鍙�', trigger: 'blur'},
+ {pattern: /^[A-Za-z]+$/, message: '涓氬姟绫诲瀷缂栧彿鍙兘涓鸿嫳鏂�', trigger: 'blur'},
+ {min: 2, max: 20, message: '闀垮害鍦�2鍒�20涓瓧绗�', trigger: 'blur'}
+ ],
+ domain: [
+ {required: true, message: '璇烽�夋嫨鎵�灞為鍩�', trigger: 'blur'}
+ ]
+ },
+ }
+ },
+ created() {
+
+ },
+ methods: {
+ // 鍏抽棴缁勪欢寮圭獥
+ closeSubmitDialog() {
+ this.showSubmitDialog = false;
+ this.btmType.attributes = [];
+ this.btmType = {};
+ this.attrRef.selectData = [];
+ this.attrRef.queryNotIn = null;
+ this.resetForm();
+ },
+ // 鍏抽棴灞炴�ф睜鏌ヨ寮圭獥
+ closeAttrDialog() {
+ this.attrRef.visible = false;
+ },
+ // 灞炴�ч�夋嫨娣诲姞
+ async rowAdd() {
+ await this.attrRefOnLoad();
+ this.attrRef.visible = true;
+ },
+ // 灞炴�ф睜鍔犺浇
+ attrRefOnLoad() {
+ if (this.attrRef.queryNotIn != '' && this.btmType.attributes !== undefined && this.btmType.attributes.length > 0) {
+ this.attrRef.queryNotIn = '';
+ this.btmType.attributes.forEach(item => {
+ this.attrRef.queryNotIn += (item.id + ",")
+ })
+ }
+ this.attrRef.loading = true;
+ queryPage(this.attrRef.key, this.attrRef.queryNotIn, this.attrRef.page.currentPage, this.attrRef.page.pageSize).then(res => {
+ const data = res.data.data;
+ this.attrRef.page.total = data.total;
+ this.attrRef.data = data.records;
+ });
+ setTimeout(() => {
+ this.attrRef.loading = false;
+ }, 600)
+ this.$nextTick(() => {
+ this.$refs.attrRef.refreshTable();
+ });
+ },
+ // 灞炴�ф睜妫�绱�
+ attrRefSearch(form, done) {
+ this.attrRef.key = form.id;
+ this.attrRefOnLoad();
+ done();
+ this.attrRef.key = null;
+ },
+ // 浠庡睘鎬ф睜涓Щ闄�
+ removeFormAttrTable(row, index) {
+ this.btmType.attributes.splice(index, 1);
+ this.attrRef.queryNotIn = "";
+ this.btmType.attributes.forEach(item => {
+ this.attrRef.queryNotIn += (item.id + ",")
+ })
+ },
+ // 灞炴�ф睜鍕鹃�変簨浠�
+ selectionChange(list) {
+ this.attrRef.selectData = list;
+ },
+ // 纭灞炴�ф睜鍕鹃��
+ confirmSelectAttr() {
+ if (!this.btmType.attributes) {
+ this.btmType.attributes = [];
+ }
+ console.log(this.attrRef.selectData);
+ this.attrRef.selectData.forEach(item => {
+ this.btmType.attributes.push({
+ id: item.id,
+ name: item.name,
+ attrDataType: item.typeKey,
+ attrDataTypeText: item.typeValue,
+ defaultValue: item.defaultValue,
+ description: item.description,
+ attributeLength: item.maxLength,
+ referBtmTypeId: item.referTypeCode,
+ referBtmTypeName: item.referToName,
+ enumId: item.dictCode,
+ });
+ this.attrRef.queryNotIn += (item.id + ",")
+ });
+ this.attrRef.data = [];
+ this.closeAttrDialog();
+ },
+ // 鍙栨秷灞炴�ф睜鍕鹃��
+ cancleSelectAttr() {
+ this.attrRef.selectData = [];
+ this.closeAttrDialog();
+ },
+ // 娣诲姞涓氬姟绫诲瀷
+ submitBtmType() {
+ console.log(this.btmType);
+ add(this.btmType, true).then(res => {
+ // 娣诲姞瀹屾垚锛屽洖璋冪埗缁勪欢鐨勫埛鏂�
+ this.$message.success('淇濆瓨鎴愬姛');
+ this.cancleSubmitBtmType();
+ this.$emit('refreshTable');
+ })
+ },
+ // 鍙栨秷娣诲姞涓氬姟绫诲瀷
+ cancleSubmitBtmType() {
+ this.btmType = {};
+ this.btmType.attributes = [];
+ this.showSubmitDialog = false;
+ },
+ // 鍒锋柊灞炴�у垪琛�
+ refreshAttrTable() {
+ this.$nextTick(() => {
+ this.$refs.attrTable.refreshTable();
+ })
+ },
+ //
+ viewChange() {
+
+ },
+ // 鍒楄〃缂栬緫
+ cellEditClick(cell) {
+ console.log(cell);
+ cell.$cellEdit = true;
+ },
+ // 鍒楄〃缂栬緫淇濆瓨
+ cellEditSave(row) {
+ this.btmType.attributes[row.$index].name = row.name
+ this.btmType.attributes[row.$index].defaultValue = row.defaultValue;
+ this.btmType.attributes[row.$index].description = row.description;
+ row.$cellEdit = false;
+ },
+ // 鎵撳紑鐗堟湰瑙勫垯鍙傜収
+ async openRevision() {
+ await getPage().then(res => {
+ this.revisionRef.data = res.data.data.records;
+ });
+ this.revisionRef.visible = true;
+ },
+ // 鍏抽棴鐗堟湰瑙勫垯鍙傜収寮圭獥
+ closeRevisionDialog() {
+ this.revisionRef.visible = false;
+ },
+ // 鐗堟湰瑙勫垯鍙傜収鍒楄〃妫�绱�
+ revisionRefSearch() {
+
+ },
+ // 鐗堟湰瑙勫垯閫変腑浜嬩欢
+ revisionChange() {
+ },
+ // 纭閫変腑鐗堟湰瑙勫垯
+ confirmRevision() {
+ this.btmType.revisionFlag = true;
+ this.btmType.revisionRuleId = this.revisionRef.selectData.id;
+ this.btmType.revisionRuleName = this.revisionRef.selectData.name;
+ this.btmType.inputRevisionFlag = false;
+ this.cancelRevision();
+ },
+ // 鍙栨秷閫変腑鐗堟湰瑙勫垯
+ cancelRevision() {
+ this.revisionRef.selectRow = '';
+ this.revisionRef.selectData = {};
+ this.closeRevisionDialog();
+ },
+ // 鐗堟湰瑙勫垯鍗曢��
+ revisionClick(row) {
+ this.revisionRef.selectRow = row.$index;
+ this.revisionRef.selectData = {
+ id: row.id,
+ name: row.name,
+ };
+ },
+ clearRevision() {
+ this.$delete(this.btmType, 'revisionFlag');
+ this.$delete(this.btmType, 'revisionRuleId');
+ this.$delete(this.btmType, 'revisionRuleName');
+ this.$delete(this.btmType, 'inputRevisionFlag');
+ },
+ resetForm() {
+ this.btmType = {};
+ this.$refs.form.resetFields();
+ }
+ }
}
</script>
<style>
/* 灞炴�ф睜鍙傜収鍒楄〃 */
-.attrRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
- display: none !important;
+.attrRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
+ display: none !important;
}
-.revisionRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
- display: none !important;
+.revisionRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
+ display: none !important;
}
.btmTypeForm > .el-form-item > .el-form-item__content > .el-input > .el-input__inner {
- width: 200px;
+ width: 200px;
+}
+
+.domainSelect > .el-form-item__content > .el-select > .el-input > .el-input__inner {
+ width: 200px;
}
.viewFlag {
- width: 305px;
+ width: 305px;
+}
+
+.viewInput > .el-form-item__content > .el-input > .el-input__inner {
+ width: 200px;
}
.descClass > .el-input__inner {
- width: 57vw
+ width: 57vw
}
#descId {
- width: 57vw;
+ width: 57vw;
}
</style>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-ddl-api/src/main/java/com/vci/ubcs/ddl/bo/DdlFieldMappingAttrBO.java b/Source/UBCS/ubcs-service-api/ubcs-ddl-api/src/main/java/com/vci/ubcs/ddl/bo/DdlFieldMappingAttrBO.java
index 038400b..65e6252 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-ddl-api/src/main/java/com/vci/ubcs/ddl/bo/DdlFieldMappingAttrBO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-ddl-api/src/main/java/com/vci/ubcs/ddl/bo/DdlFieldMappingAttrBO.java
@@ -59,16 +59,19 @@
@Override
public String toString() {
StringBuilder stringBuilder = new StringBuilder().append(dataType);
- if (dataLength != null && dataPrecision != null){
- stringBuilder.append(StringPool.SPACE).append(StringPool.LEFT_BRACKET).append(dataLength).append(StringPool.COMMA).append(dataPrecision).append(StringPool.RIGHT_BRACKET).append(StringPool.SPACE);
- }else if (dataLength != null) {
- stringBuilder.append(StringPool.SPACE).append(StringPool.LEFT_BRACKET).append(dataLength).append(StringPool.RIGHT_BRACKET).append(StringPool.SPACE);
+ if (dataLength != null){
+ stringBuilder.append(StringPool.SPACE).append(StringPool.LEFT_BRACKET).append(dataLength);
+ if (dataPrecision != null){
+ stringBuilder.append(StringPool.COMMA).append(dataPrecision).append(StringPool.RIGHT_BRACKET).append(StringPool.SPACE);
+ }else {
+ stringBuilder.append(StringPool.RIGHT_BRACKET).append(StringPool.SPACE);
+ }
}
if (!nullable){
stringBuilder.append(StringPool.SPACE).append("not null").append(StringPool.SPACE);
}
if (StringUtil.isNotBlank(defaultValue)){
- stringBuilder.append(StringPool.SPACE).append("default").append(StringPool.SPACE).append(defaultValue).append(StringPool.SPACE);
+ stringBuilder.append(StringPool.SPACE).append("default").append(StringPool.SPACE).append(StringPool.SINGLE_QUOTE).append(defaultValue).append(StringPool.SINGLE_QUOTE).append(StringPool.SPACE);
}
return stringBuilder.toString();
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
index 723c7ea..081469a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
@@ -147,5 +147,5 @@
/**
* 涓氬姟绫诲瀷鎵�灞為鍩�
*/
- private String domain;
+ private String bizDomain;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/VciSpringUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/VciSpringUtil.java
index 246345f..9c17440 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/VciSpringUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/VciSpringUtil.java
@@ -12,7 +12,7 @@
* @author LiHang
* @date 2023/4/26
*/
-@Component
+@Component("vciSpringUtil")
public class VciSpringUtil implements ApplicationContextAware {
private static ApplicationContext applicationContext;
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlDmMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlDmMapperProcessor.java
index d40064d..0c7eb69 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlDmMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlDmMapperProcessor.java
@@ -3,12 +3,14 @@
import com.vci.ubcs.ddl.mapper.DdlDmMapper;
import com.vci.ubcs.ddl.mapper.DdlMapper;
import com.vci.ubcs.starter.util.VciSpringUtil;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
/**
* 杈炬ⅵ鏁版嵁搴撴墽琛岃〃鎿嶄綔sql鐨勫鐞嗗櫒
*/
@Component
+@DependsOn("vciSpringUtil")
public class DdlDmMapperProcessor extends DdlMapperProcessor{
private static final DdlMapper MAPPER = VciSpringUtil.getBean(DdlDmMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java
index 578d9b8..f19401a 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java
@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -21,6 +22,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DdlMapperProcessStrategy {
@Value("${spring.datasource.driver-class-name}")
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMsMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMsMapperProcessor.java
index a21d862..b279937 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMsMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMsMapperProcessor.java
@@ -5,6 +5,7 @@
import com.vci.ubcs.ddl.mapper.DdlMapper;
import com.vci.ubcs.starter.util.VciSpringUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -20,6 +21,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DdlMsMapperProcessor extends DdlMapperProcessor{
private static DdlMapper mapper = VciSpringUtil.getBean(DdlMSMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMySqlMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMySqlMapperProcessor.java
index d7e8ca5..4d278d2 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMySqlMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMySqlMapperProcessor.java
@@ -5,6 +5,7 @@
import com.vci.ubcs.ddl.mapper.DdlMySqlMapper;
import com.vci.ubcs.starter.util.VciSpringUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
@@ -20,6 +21,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DdlMySqlMapperProcessor extends DdlMapperProcessor{
private static DdlMapper mapper = VciSpringUtil.getBean(DdlMySqlMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlOracleMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlOracleMapperProcessor.java
index 174344c..872192c 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlOracleMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlOracleMapperProcessor.java
@@ -5,6 +5,7 @@
import com.vci.ubcs.starter.util.VciSpringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -17,6 +18,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DdlOracleMapperProcessor extends DdlMapperProcessor{
private static DdlMapper mapper = VciSpringUtil.getBean(DdlOracleMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java
index 2121d5c..ffbe5b0 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java
@@ -9,10 +9,12 @@
import org.apache.commons.collections4.BidiMap;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Locale;
+import java.util.Optional;
/**
* Description: 搴旂敤浜庤揪姊︽暟鎹紝鐢熸垚鍒涘缓琛ㄦ搷浣渟ql鐨勫鐞嗗櫒
@@ -21,6 +23,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DllDmMapperProcessor extends DllMapperProcessor {
private static final DllMapper MAPPER = VciSpringUtil.getBean(DllDmMapper.class);
@@ -29,8 +32,8 @@
static {
// 闇�瑕侀噸鏂版槧灏勭殑瀛楁绫诲瀷鍦ㄨ繖閲屽啓
- FIELD_MAP.put(VciFieldTypeEnum.VTDouble, new DdlFieldMappingAttrBO("DOUBLE", 26, 8, true, null));
- FIELD_MAP.put(VciFieldTypeEnum.VTInteger, new DdlFieldMappingAttrBO("INTEGER", 10, null, true, null));
+ FIELD_MAP.put(VciFieldTypeEnum.VTDouble, new DdlFieldMappingAttrBO("DOUBLE", 53, null, true, null));
+ FIELD_MAP.put(VciFieldTypeEnum.VTInteger, new DdlFieldMappingAttrBO("INTEGER", null, null, true, null));
FIELD_MAP.put(VciFieldTypeEnum.VTLong, new DdlFieldMappingAttrBO("NUMBER", 38, null, true, null));
FIELD_MAP.put(VciFieldTypeEnum.VTBoolean, new DdlFieldMappingAttrBO("VARCHAR", 5, null, true, null));
FIELD_MAP.put(VciFieldTypeEnum.VTDate, new DdlFieldMappingAttrBO("DATE", null, null, true, null));
@@ -64,17 +67,13 @@
@Override
public String getColumnTypeSql(VciFieldTypeEnum fieldType, BtmTypeAttributeVO attributeVO) {
DdlFieldMappingAttrBO mappingBO = getMappingBO(fieldType);
- if (fieldType.equals(VciFieldTypeEnum.VTDouble)) {
- mappingBO.setDataPrecision(attributeVO.getPrecisionLength() == -1 ? 8 : attributeVO.getPrecisionLength());
- }
- //鍏堝彧閽堝鏁板瓧绫诲瀷鐨勮繘琛屽鐞�
- if (fieldType.equals(VciFieldTypeEnum.VTInteger) ){
- mappingBO.setDataLength(null);
- } else if (fieldType.equals(VciFieldTypeEnum.VTDouble) || fieldType.equals(VciFieldTypeEnum.VTLong)) {
- if (attributeVO.getAttributeLength() <= mappingBO.getDataLength()) {
+ if (mappingBO.getDataLength() != null) {
+ //mappingBO鐢ㄦ潵鍋氭渶鍚庣殑鏍￠獙锛屽鏋滃畾涔夌殑BO娌℃湁瀛楁闀垮害锛屽垯璇存槑杩欎釜绫诲瀷鐢熸垚鐨剆ql涓嶅簲璇ユ寚瀹氶暱搴︺�傚鏋滄寚瀹氫簡闀垮害锛岃鏄庢槸瀛楁闀垮害鐨勬渶澶у�硷紝VARCHAR銆丆LOB闄ゅ
+ if (!(fieldType.equals(VciFieldTypeEnum.VTClob) || fieldType.equals(VciFieldTypeEnum.VTString))
+ && attributeVO.getAttributeLength() > mappingBO.getDataLength()) {
mappingBO.setDataLength(attributeVO.getAttributeLength());
}
- }else {
+ } else {
mappingBO.setDataLength(attributeVO.getAttributeLength());
}
mappingBO.setNullable(attributeVO.isNullableFlag());
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessorStrategy.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessorStrategy.java
index db82496..537a55c 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessorStrategy.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessorStrategy.java
@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -22,6 +23,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DllMapperProcessorStrategy {
@Value("${spring.datasource.driver-class-name}")
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
index fa60a49..e446893 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
@@ -11,6 +11,7 @@
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.apache.commons.collections4.BidiMap;
import org.springblade.core.tool.utils.StringPool;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import java.util.Arrays;
@@ -23,6 +24,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DllMsMapperProcessor extends DllMapperProcessor {
private static DllMapper mapper = VciSpringUtil.getBean(DllMsMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java
index 780984d..0340cca 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java
@@ -7,6 +7,7 @@
import com.vci.ubcs.starter.util.VciSpringUtil;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.apache.commons.collections4.BidiMap;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -18,6 +19,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DllMySqlMapperProcessor extends DllMapperProcessor {
private static final DllMapper MAPPER = VciSpringUtil.getBean(DllMySqlMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
index 4629964..a171433 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
@@ -6,6 +6,7 @@
import com.vci.ubcs.starter.util.VciSpringUtil;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.apache.commons.collections4.BidiMap;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -18,6 +19,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DllOracleMapperProcessor extends DllMapperProcessor {
private static DllMapper mapper = VciSpringUtil.getBean(DllOracleMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java
index 539f540..c47d99e 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java
@@ -6,6 +6,7 @@
import com.vci.ubcs.starter.util.VciSpringUtil;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.apache.commons.collections4.BidiMap;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -17,6 +18,7 @@
* @date 2023/4/24
*/
@Component
+@DependsOn("vciSpringUtil")
public class DllSqlLiteMapperProcessor extends DllMapperProcessor{
private static DllMapper mapper = VciSpringUtil.getBean(DllSqlLiteMapper.class);
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java
index 01bc4e0..96d8483 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.mapper;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.omd.entity.BtmTypeAttribute;
import org.apache.ibatis.annotations.Param;
@@ -19,6 +20,7 @@
int batchDelete(@Param("records") List<String> records);
+ @InterceptorIgnore(tenantLine = "true")
int batchUpdate(@Param("records") List<BtmTypeAttribute> btmTypeAttributeDOList);
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index 2dc1b5f..2a64160 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -495,7 +495,7 @@
}
checkBtmTypeBeforeSave(btmTypeDTO);
BtmType btmTypeDO = Optional.ofNullable(BeanUtil.copy(btmTypeDTO, BtmType.class)).orElseGet(BtmType::new);
- btmTypeDO.setBizDomain(btmTypeDTO.getDomain());
+ btmTypeDO.setBizDomain(btmTypeDTO.getBizDomain());
List<BtmTypeLinkAttributesDTO> attributes = btmTypeDTO.getAttributes();
List<BtmTypeAttributeVO> afterAttributes;
if (StringUtils.isBlank(btmTypeDO.getOid())){
@@ -521,7 +521,7 @@
try {
if (autoCreateTable) {
// checkTableSame(btmTypeVO);
- R result = DomainRepeater.submitBtmType(btmTypeDTO.getDomain(), btmTypeVO);
+ R result = DomainRepeater.submitBtmType(btmTypeDTO.getBizDomain(), btmTypeVO);
if (result.isSuccess()){
List<ModifyAttributeInfo> infoList = new ArrayList<>();
Object data = result.getData();
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml
index bfa4fe8..55b7372 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeAttributeMapper.xml
@@ -41,7 +41,8 @@
pl_omd_btm_type
</sql>
<update id="batchUpdate" parameterType="java.util.List">
- <foreach collection="records" item="item" index="index" open="begin" close=";end;" separator=";">
+ BEGIN
+ <foreach collection="records" item="item" index="index" separator=";">
update <include refid="tableName"/> set
id = #{item.id,jdbcType=VARCHAR},
name = #{item.name,jdbcType=VARCHAR},
@@ -65,7 +66,9 @@
last_modifier = #{item.lastModifier,jdbcType=VARCHAR},
last_modify_time = #{item.lastModifyTime,jdbcType=TIMESTAMP},
ts = #{item.ts,jdbcType=TIMESTAMP}
+ where oid = #{item.oid,jdbcType=VARCHAR}
</foreach>
+ ;END;
</update>
<delete id="batchDelete">
delete from
--
Gitblit v1.9.3