From 00062ed2e07d3d705abd1baa10ee483617f10dfb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 09 六月 2023 18:44:57 +0800
Subject: [PATCH] 提交get请求中文编码问题，表名常量类，表别名枚举类
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 83 +-----
Source/UBCS-WEB/vue.config.js | 12
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllCode.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java | 3
Source/UBCS-WEB/src/router/axios.js | 7
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java | 3
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/enumpack/CodeTableNameEnum.java | 161 +++++++++++++
Source/UBCS-WEB/src/api/code/mdmrule.js | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java | 2
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 45 ++-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplate.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java | 3
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java | 3
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java | 125 ++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 13
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java | 3
Source/UBCS-WEB/src/api/code/codebasic.js | 3
Source/data/applogs/xxl-job/xxl-job-admin.log | 0
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java | 6
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java | 5
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSerialValue.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 31 +-
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java | 7
Source/UBCS-WEB/src/util/param2CondMapUtil.js | 5
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystem.java | 3
Source/UBCS-WEB/src/views/code/code.vue | 40 +-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTemp.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 44 +-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java | 3
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java | 8
Source/data/applogs/xxl-job/xxl-job-admin.log.2023-06-07.zip | 0
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java | 4
50 files changed, 501 insertions(+), 184 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/code/codebasic.js b/Source/UBCS-WEB/src/api/code/codebasic.js
index 4d4c7ff..0102583 100644
--- a/Source/UBCS-WEB/src/api/code/codebasic.js
+++ b/Source/UBCS-WEB/src/api/code/codebasic.js
@@ -8,6 +8,9 @@
...params,
page,
limit,
+ },
+ paramsSerializer: function(params) {
+ return qs.stringify(params, { encode: false });
}
})
}
diff --git a/Source/UBCS-WEB/src/api/code/mdmrule.js b/Source/UBCS-WEB/src/api/code/mdmrule.js
index b659fc4..b0f0d13 100644
--- a/Source/UBCS-WEB/src/api/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/api/code/mdmrule.js
@@ -8,7 +8,7 @@
page,
limit,
...params,
- }
+ },
})
}
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index b6354df..a1afbc7 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -52,7 +52,8 @@
<div class="grid-content">
<el-select placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].condition">
<el-option
- v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
+ v-for="condition in item.fieldType==='text' || item.fieldType==='combox' ?
+ item.fieldType==='text' ? searchConditions:switchSearchConditions:dateConditions"
:key="condition.value"
:label="condition.label"
:value="condition.value">
@@ -71,7 +72,12 @@
:value="option.itemValue">
</el-option>
</el-select>
- <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+ <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+ <el-date-picker v-else-if="item.fieldType==='date'"
+ v-model="searchFormArrays[index].fieldValue"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</div>
</el-col>
<el-col :span="2">
@@ -106,7 +112,7 @@
// 瀵硅瘽妗嗘樉绀烘帶鍒�
isShowDialog: this.visible,
initOptions: [],
- // 瀛楁鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
+ // 瀛楁绫诲瀷鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
searchConditions: [
{
value: "_equal",
@@ -120,15 +126,9 @@
},{
value: "_notlike",
label: "涓嶅寘鍚�",
- },{
- value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
- label: "澶т簬",
- },{
- value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
- label: "灏忎簬",
- },
+ }
],
- // 瀛楁鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
+ // 瀛楁绫诲瀷鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
switchSearchConditions: [
{
value: "_equal",
@@ -137,6 +137,22 @@
value: "_notequal",
label: "涓嶇瓑浜�",
}
+ ],
+ // 瀛楁绫诲瀷鏄棩鏈�
+ dateConditions: [
+ {
+ value: "_equal",
+ label: "绛変簬",
+ },{
+ value: "_notequal",
+ label: "涓嶇瓑浜�",
+ },{
+ value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
+ label: "澶т簬",
+ },{
+ value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
+ label: "灏忎簬",
+ },
],
searchFormArrays: [],
fieldValue: '',
@@ -236,7 +252,7 @@
const searchConditions = this.searchFormArrays;
for(let index = 0; index < searchConditions.length; index++) {
//console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
- if(searchConditions[index].fieldValue.trim() != '' || searchConditions[index].fieldValue+''==='false') {
+ if(searchConditions[index].fieldValue+'' != '' || searchConditions[index].fieldValue+''==='false') {
// 瀛樺湪鐩稿悓鐨勬煡璇㈡潯浠�
if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' != 'undefined' ) {
this.$message.warning("瀛樺湪閲嶅鏌ヨ鏉′欢锛岃浠旂粏鏍稿!");
@@ -247,7 +263,7 @@
condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
}
}
- // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
+ // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝灏变紶閫掔粰鐖剁粍浠�
// console.log(condtionParam);
this.$emit('echoContion',condtionParam)
this.isShowDialog = false;
@@ -316,6 +332,9 @@
line-height: 40px;
height: 40px;
}
+ .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
+ width: 100%;
+ }
</style>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/router/axios.js b/Source/UBCS-WEB/src/router/axios.js
index 7801ad2..942f0ed 100644
--- a/Source/UBCS-WEB/src/router/axios.js
+++ b/Source/UBCS-WEB/src/router/axios.js
@@ -15,6 +15,7 @@
import {Base64} from 'js-base64';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
+import qs from 'qs';
//榛樿瓒呮椂鏃堕棿
axios.defaults.timeout = 20000;
@@ -51,6 +52,12 @@
if (config.method === 'post' && meta.isSerialize === true) {
config.data = serialize(config.data);
}
+ // get璇锋眰鐗规畩瀛楃姹夊瓧搴忓垪鍖栵紝鍚﹀垯浼氬鑷村悗绔棤娉曡浆鐮�
+ if(config.method === 'get'){
+ config.paramsSerializer = function(params) {
+ return qs.stringify(params, { encode: true })
+ };
+ }
return config
}, error => {
return Promise.reject(error)
diff --git a/Source/UBCS-WEB/src/util/param2CondMapUtil.js b/Source/UBCS-WEB/src/util/param2CondMapUtil.js
new file mode 100644
index 0000000..0a86d15
--- /dev/null
+++ b/Source/UBCS-WEB/src/util/param2CondMapUtil.js
@@ -0,0 +1,5 @@
+/**
+ * Param杞琧onditionMap鏉′欢鐨勫伐鍏风被
+*/
+
+
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9016174..5b3a5ea 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1173,7 +1173,6 @@
refreshParentClassifyDataChange() {
this.parentClassifyOnLoad(this.parentClsfyParams.parentClassifyDataPage, this.parentClsfyParams.parentClassifyQuery);
},
- // TODO:寰呬慨鏀�
parentClassifyOnLoad(page, params = {}) {
let parentClsParam = this.parentClsfyParams;
parentClsParam.classifyDialogLoading = true;
@@ -1204,22 +1203,25 @@
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
//console.log(this.currentSelectTreeData);
- attrParam.selectAttrOptionLoading = true;
+ this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if(attrParam.selectAttrQeury){
Object.keys(attrParam.selectAttrQeury).forEach(key=>{
- conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key];
+ conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key].trim();
});
}
conditionMaps['conditionMap[codeClassifyOid]'] = this.currentSelectTreeData.oid;
conditionMaps['conditionMap[btmTypeOid]'] = this.currentSelectTreeData.btmTypeOid;
listClassifyLinkAttr(conditionMaps).then(res=>{
- //console.log(res.data.data);
- attrParam.selectAttrData = res.data.data;
- attrParam.selectAttrOptionLoading = false;
+ const data = res.data;
this.$nextTick(() => {
- this.$refs[attrParam.ref].doLayout()
+ this.$refs[attrParam.ref].doLayout()
});
+ //console.log(data.data);
+ this.selectAttrParams.selectAttrData = data.data;
+ this.selectAttrParams.selectAttrOptionLoading = false;
+ // 灏嗘悳绱㈡鍐呭缃┖
+ this.selectAttrParams.selectAttrQeury = {};
})
},
// 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
@@ -1899,7 +1901,7 @@
//瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
this.currentCodeRuleOid = row.oid;
this.currentRuleLcStatus = row.lcStatus;
- this.sendGridCodeBasicSec({"pkCodeRule_equal":row.oid},false);
+ this.sendGridCodeBasicSec({"cpkCodeRule":row.oid},false);
},
// 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
sendGridCodeBasicSec(condition,isAdancedQuery/** 鏄惁楂樼骇鏌ヨ */){
@@ -1910,11 +1912,11 @@
let conditionMaps = {};
if(condition && !isAdancedQuery){
Object.keys(condition).forEach(key=>{
- conditionMaps['conditionMap[t.'+key+']'] = condition[key];
+ conditionMaps['conditionMap[pl_code_basicsec.'+key+']'] = condition[key].trim();
});
}
if(isAdancedQuery){
- condition['conditionMap[t.pkCodeRule_equal]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == ''
+ condition['conditionMap[pl_code_basicsec.pkCodeRule]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == ''
? this.selectionList[0].oid:this.currentCodeRuleOid;
}
gridCodeBasicSec(1, -1,isAdancedQuery ? condition:conditionMaps).then(res => {
@@ -1945,11 +1947,11 @@
},
basicSearchChange(params, done){
//console.log(this.$refs.crudBasic);
- this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule_equal":this.selectionList[this.selectionList.length-1].oid}),false);
+ this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule":this.selectionList[this.selectionList.length-1].oid}),false);
done();
},
basicSearchReset(){
- this.sendGridCodeBasicSec({"pkCodeRule_equal":this.selectionList[this.selectionList.length-1].oid},false);
+ this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid},false);
},
// 涓婄Щ涓嬬Щ鍩虹鐮佹
upOrderNum(row){
@@ -2055,7 +2057,7 @@
fieldType: 'combox',
queryField: 'lcStatus',
comboxKey: 'codeSearchLCStatus',
- }
+ },
]
}else {
this.advancedQueryParam.options = [
@@ -2063,22 +2065,22 @@
data: [],
title: '鐮佹缂栧彿',
fieldType: 'text',
- queryField: 't.id',
+ queryField: 'pl_code_basicsec.id',
},{
data: [],
title: '鐮佹鍚嶇О',
fieldType: 'text',
- queryField: 't.name',
+ queryField: 'pl_code_basicsec.name',
},{
data: [],
title: '鎻忚堪',
fieldType: 'text',
- queryField: 't.description',
+ queryField: 'pl_code_basicsec.description',
},{
data: [],
title: '鐮佹绫诲瀷',
fieldType: 'combox',
- queryField: 't.secType',
+ queryField: 'pl_code_basicsec.secType',
comboxKey: 'codeSecType',
}
]
@@ -2355,11 +2357,13 @@
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
+ let requestData = {};
if(params){
Object.keys(params).forEach(key=>{
- this.query['conditionMap['+key+'_like]'] = params[key];
+ requestData["conditionMap"+'['+key+']'] = params[key].trim();
});
}
+ this.query = requestData;
this.onLoad(this.page);
done();
},
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 98c3012..1e8bbca 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,17 +26,17 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
// target: 'http://localhost:37000',
- //target: 'http://192.168.1.51:37000',
- //target: 'http://192.168.3.7:37000',
+ // target: 'http://192.168.1.51:37000',
+ // target: 'http://192.168.3.7:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
- // target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.63:37000',
- //target: 'http://192.168.3.7:37000',
+ // target: 'http://192.168.3.7:37000',
// target: 'http://dev.vci-tech.com:37000',
- //target: 'http://192.168.1.51:37000/',
+ // target: 'http://192.168.1.51:37000/',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index ff73742..8c8a346 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -41,7 +41,7 @@
* nacos dev 鍦板潃
*/
//String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
- String NACOS_DEV_ADDR = "127.0.0.1:8848";
+ String NACOS_DEV_ADDR = "localhost:8848";
/**
* nacos prod 鍦板潃
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
index bd06787..e596a6a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
@@ -12,7 +12,6 @@
<name>${project.artifactId}</name>
<version>${bladex.project.version}</version>
<dependencies>
-
<!--<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -23,7 +22,6 @@
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>-->
-
<!--<dependency>
<groupId>com.vci</groupId>
<artifactId>vci-platform-web</artifactId>
@@ -68,7 +66,6 @@
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
-
</dependencies>
<packaging>jar</packaging>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllCode.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllCode.java
index 371a319..51fd9ec 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllCode.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllCode.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -31,7 +32,7 @@
* @since 2023-04-03
*/
@Data
-@TableName("PL_CODE_ALLCODE")
+@TableName(CodeTableNameConstant.PL_CODE_ALLCODE)
@ApiModel(value = "CodeAllCode瀵硅薄", description = "鍏ㄩ儴鐮佸��")
@EqualsAndHashCode(callSuper = true)
public class CodeAllCode extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
index c69d8c3..24a4dee 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.annotation.Transient;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.Alias;
import java.sql.Clob;
@@ -18,7 +20,7 @@
* @date 2022-1-18
*/
@Data
-@TableName("PL_CODE_BASICSEC")
+@TableName(CodeTableNameConstant.PL_CODE_BASICSEC)
@ApiModel(value = "CodeBasicSec瀵硅薄", description = "鐮佹鍩虹淇℃伅")
@EqualsAndHashCode(callSuper = true)
public class CodeBasicSec extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java
index 95a66fd..b21ffc2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.annotation.VciUseEnum;
import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
@@ -40,7 +41,7 @@
* @since 2023-03-29
*/
@Data
-@TableName("PL_CODE_BUTTON")
+@TableName(CodeTableNameConstant.PL_CODE_BUTTON)
@ApiModel(value = "codebutton瀵硅薄", description = "妯℃澘鎵╁睍姹�")
@EqualsAndHashCode(callSuper = true)
public class CodeButton extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
index cf9eb71..d941a7d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.annotation.Transient;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -15,7 +16,7 @@
*/
//@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY,text = "涓婚搴撳垎绫�",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
@Data
-@TableName("PL_CODE_CLASSIFY")
+@TableName(CodeTableNameConstant.PL_CODE_CLASSIFY)
@ApiModel(value = "CodeClassify瀵硅薄", description = "涓婚搴撶殑鍒嗙被")
@EqualsAndHashCode(callSuper = true)
public class CodeClassify extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTemp.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTemp.java
index d20b833..e889083 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTemp.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTemp.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.annotation.VciUseEnum;
import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
@@ -15,7 +16,7 @@
* @date 2023/5/5
*/
@Data
-@TableName("PL_CODE_CLSFLOWTEMP")
+@TableName(CodeTableNameConstant.PL_CODE_CLSFLOWTEMP)
@ApiModel(value = "CodeTempphase瀵硅薄", description = "鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�")
public class CodeClassifyProcessTemp extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplate.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplate.java
index 992f0d4..dcb703c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplate.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplate.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.annotation.Transient;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -32,7 +33,7 @@
* @since 2023-04-10
*/
@Data
-@TableName("PL_CODE_CLSTEMPLATE")
+@TableName(CodeTableNameConstant.PL_CODE_CLSTEMPLATE)
@ApiModel(value = "PlCodeClstemplate瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘绠＄悊")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyTemplate extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java
index 426dab0..5708185 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttr.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.annotation.VciFieldType;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
@@ -16,7 +17,7 @@
*/
//@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,text = "涓婚搴撳垎绫荤殑妯℃澘灞炴��",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
@Data
-@TableName("PL_CODE_CLSTEMPATTR")
+@TableName(CodeTableNameConstant.PL_CODE_CLSTEMPATTR)
@ApiModel(value = "CodeTempphase瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyTemplateAttr extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java
index ba17ddf..d890b89 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButton.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -31,7 +32,7 @@
* @since 2023-04-20
*/
@Data
-@TableName("PL_CODE_TEMPBUTTON")
+@TableName(CodeTableNameConstant.PL_CODE_TEMPBUTTON)
@ApiModel(value = "CodeTempbutton瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘鎸夐挳鎵╁睍")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyTemplateButton extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java
index c67f497..171542c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -13,7 +14,7 @@
* @date 2023/4/5
*/
@Data
-@TableName("PL_CODE_CLASSIFYVALUE")
+@TableName(CodeTableNameConstant.PL_CODE_CLASSIFYVALUE)
@ApiModel(value = "CodeClassify瀵硅薄", description = "鍒嗙被鐮佹鐨勭爜鍊�")
@EqualsAndHashCode(callSuper = true)
public class CodeClassifyValue extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java
index af993c8..a286bae 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -13,7 +14,7 @@
* @date 2022-1-18
*/
@Data
-@TableName("PL_CODE_FIXEDVALUE")
+@TableName(CodeTableNameConstant.PL_CODE_FIXEDVALUE)
@ApiModel(value = "CodeFixedValue瀵硅薄", description = "鍥哄畾鐮佹鐨勭爜鍊�")
@EqualsAndHashCode(callSuper = true)
public class CodeFixedValue extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java
index 9b70ab5..fb917a5 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,7 +36,7 @@
* @since 2023-04-03
*/
@Data
-@TableName("PL_CODE_KEYATTRREPEAT")
+@TableName(CodeTableNameConstant.PL_CODE_KEYATTRREPEAT)
@ApiModel(value = "PlCodeKeyattrrepeat瀵硅薄", description = "鍏抽敭灞炴�ф煡閲嶈鍒�")
//@EqualsAndHashCode(callSuper = true)
public class CodeKeyAttrRepeat implements Serializable {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java
index 0f34a9a..137f63e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttr.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -30,7 +31,7 @@
* @since 2023-04-20
*/
@Data
-@TableName("PL_CODE_PHASEATTR")
+@TableName(CodeTableNameConstant.PL_CODE_PHASEATTR)
@ApiModel(value = "CodePhaseattr瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴��")
@EqualsAndHashCode(callSuper = true)
public class CodePhaseAttr extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
index beacef8..e34545b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -8,6 +8,7 @@
import com.github.yulichang.annotation.EntityMapping;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -15,13 +16,13 @@
import java.util.List;
/**
- * 鐮佹鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆
*
* @author ludc
* @date 2023/5/19 17:24
*/
@Data
-@TableName("PL_CODE_REFERCONFIG")
+@TableName(CodeTableNameConstant.PL_CODE_REFERCONFIG)
@ApiModel(value = "CodeReferConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆")
@JsonInclude(JsonInclude.Include.NON_EMPTY) //涓嶈緭鍑烘帀绌哄瓧娈�
public class CodeReferConfig extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
index 53d85f1..dca7936 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -30,7 +31,7 @@
* @since 2023-04-03
*/
@Data
-@TableName("PL_CODE_RULE")
+@TableName(CodeTableNameConstant.PL_CODE_RULE)
@ApiModel(value = "CodeRule瀵硅薄", description = "缂栫爜瑙勫垯")
@EqualsAndHashCode(callSuper = true)
public class CodeRule extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSerialValue.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSerialValue.java
index 0084f53..3ab3758 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSerialValue.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSerialValue.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -13,7 +14,7 @@
* @date 2022-3-1
*/
@Data
-@TableName("PL_CODE_SERIALVALUE")
+@TableName(CodeTableNameConstant.PL_CODE_SERIALVALUE)
@ApiModel(value = "CodeSerialValue瀵硅薄", description = "缂栫爜瑙勫垯鐨勬祦姘村��")
@EqualsAndHashCode(callSuper = true)
public class CodeSerialValue extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
index 4d66c38..ab1e29d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.yulichang.annotation.EntityMapping;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -17,7 +18,7 @@
* @date 2023/5/19 17:35
*/
@Data
-@TableName("PL_CODE_SHOWFIELDCONFIG")
+@TableName(CodeTableNameConstant.PL_CODE_SHOWFIELDCONFIG)
@ApiModel(value = "CodeShowFieldConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�")
public class CodeShowFieldConfig implements Serializable {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
index 7dff2bc..618790b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -15,7 +16,7 @@
*/
@Data
-@TableName("PL_CODE_SRCHCONDCONFIG")
+@TableName(CodeTableNameConstant.PL_CODE_SRCHCONDCONFIG)
@ApiModel(value = "CodeSrchCondConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鎼滅储鏉′欢閰嶇疆")
public class CodeSrchCondConfig {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
index 8c1d08e..a958c4a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,7 +36,7 @@
* @since 2023-04-04
*/
@Data
-@TableName("PL_CODE_SYNONYM")
+@TableName(CodeTableNameConstant.PL_CODE_SYNONYM)
@ApiModel(value = "PlCodeSynonym瀵硅薄", description = "杩戜箟璇嶇淮鎶�")
//@EqualsAndHashCode(callSuper = true)
public class CodeSynonymEntity implements Serializable {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java
index cb815d0..0a64b26 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhase.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -30,7 +31,7 @@
* @since 2023-04-20
*/
@Data
-@TableName("PL_CODE_TEMPPHASE")
+@TableName(CodeTableNameConstant.PL_CODE_TEMPPHASE)
@ApiModel(value = "CodeTempphase瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵")
@EqualsAndHashCode(callSuper = true)
public class CodeTemplatePhase extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java
index 110925f..0fcc43a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeTempphaseEntity.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -30,7 +31,7 @@
* @since 2023-04-20
*/
@Data
-@TableName("PL_CODE_TEMPPHASE")
+@TableName(CodeTableNameConstant.PL_CODE_TEMPPHASE)
@ApiModel(value = "CodeTempphase瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵")
@EqualsAndHashCode(callSuper = true)
public class CodeTempphaseEntity extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java
index 3d8c88c..841b90b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -32,7 +33,7 @@
* @since 2023-05-05
*/
@Data
-@TableName("PL_CODE_WUPIN")
+@TableName(CodeTableNameConstant.PL_CODE_WUPIN)
@ApiModel(value = "CodeWupin瀵硅薄", description = "缂栫爜淇℃伅")
@EqualsAndHashCode(callSuper = true)
public class CodeWupin extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
index fcc1f05..c188cce 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +10,7 @@
import lombok.EqualsAndHashCode;
@Data
-@TableName("PL_DOCKING_LOG")
+@TableName(CodeTableNameConstant.PL_DOCKING_LOG)
@ApiModel(value = "DockingLog瀵硅薄", description = "闆嗘垚鏃ュ織瀵硅薄")
@EqualsAndHashCode(callSuper = true)
public class DockingLog extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystem.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystem.java
index 126af2f..640c3b4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystem.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystem.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -12,7 +13,7 @@
* @date 2023-06-01
*/
@Data
-@TableName("PL_CODE_SYSINTBASE")
+@TableName(CodeTableNameConstant.PL_CODE_SYSINTBASE)
@ApiModel(value = "DockingSystem", description = "闆嗘垚绠＄悊鎺ュ彛-闆嗘垚绯荤粺缁存姢瀵硅薄")
@EqualsAndHashCode(callSuper = true)
public class DockingSystem extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
index a4b5f02..800ffdd 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +19,7 @@
* @date 2023-06-01
*/
@Data
-@TableName("PL_CODE_SYSINTINFO")
+@TableName(CodeTableNameConstant.PL_CODE_SYSINTINFO)
@ApiModel(value = "DockingSystemConfig", description = "闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠＄悊瀵硅薄")
@EqualsAndHashCode(callSuper = true)
public class DockingSystemConfig extends BaseModel{
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java
index 283d057..c3b6d33 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java
@@ -115,7 +115,7 @@
/**
* 灞炴�х被鍨�
*/
- VCO_FIELD_TYPE("vciFieldType"),
+ VCI_FIELD_TYPE("vciFieldType"),
/**
* 绐楀彛绫诲瀷
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
new file mode 100644
index 0000000..7637bda
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
@@ -0,0 +1,125 @@
+package com.vci.ubcs.starter.constant;
+
+/**
+ * code鏈嶅姟涓敤鍒扮殑琛ㄥ悕甯搁噺绫�
+ * @author ludc
+ * @date 2023/6/8 11:04
+ */
+public class CodeTableNameConstant {
+
+ /**
+ * 鍩虹鐮佹鐨勪俊鎭�
+ */
+ public static final String PL_CODE_BASICSEC = "PL_CODE_BASICSEC";
+
+ /**
+ * 涓婚搴撶殑鍒嗙被
+ */
+ public static final String PL_CODE_CLASSIFY = "PL_CODE_CLASSIFY";
+
+ /**
+ * 妯℃澘鎵╁睍姹�
+ */
+ public static final String PL_CODE_BUTTON = "PL_CODE_BUTTON";
+
+ /**
+ * 鍏ㄩ儴鐮佸��
+ */
+ public static final String PL_CODE_ALLCODE = "PL_CODE_ALLCODE";
+
+ /**
+ * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
+ */
+ public static final String PL_CODE_CLSFLOWTEMP = "PL_CODE_CLSFLOWTEMP";
+
+ /**
+ * 缂栫爜搴撳畾涔�-妯℃澘绠＄悊
+ */
+ public static final String PL_CODE_CLSTEMPLATE = "PL_CODE_CLSTEMPLATE";
+
+ /**
+ * 涓婚搴撳垎绫荤殑妯℃澘灞炴��
+ */
+ public static final String PL_CODE_CLSTEMPATTR = "PL_CODE_CLSTEMPATTR";
+
+ /**
+ * 缂栫爜搴撳畾涔�-妯℃澘鎸夐挳鎵╁睍
+ */
+ public static final String PL_CODE_TEMPBUTTON = "PL_CODE_TEMPBUTTON";
+
+ /**
+ * 鍒嗙被鐮佹鐨勭爜鍊�
+ */
+ public static final String PL_CODE_CLASSIFYVALUE = "PL_CODE_CLASSIFYVALUE";
+
+ /**
+ * 鍥哄畾鐮佹鐨勭爜鍊�
+ */
+ public static final String PL_CODE_FIXEDVALUE = "PL_CODE_FIXEDVALUE";
+
+ /**
+ * 鍏抽敭灞炴�ф煡閲嶈鍒�
+ */
+ public static final String PL_CODE_KEYATTRREPEAT = "PL_CODE_KEYATTRREPEAT";
+
+ /**
+ * 缂栫爜搴撳畾涔�
+ */
+ public static final String PL_CODE_PHASEATTR = "PL_CODE_PHASEATTR";
+
+ /**
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆
+ */
+ public static final String PL_CODE_REFERCONFIG = "PL_CODE_REFERCONFIG";
+
+ /**
+ * 缂栫爜瑙勫垯
+ */
+ public static final String PL_CODE_RULE = "PL_CODE_RULE";
+
+ /**
+ * 缂栫爜瑙勫垯鐨勬祦姘村��
+ */
+ public static final String PL_CODE_SERIALVALUE = "PL_CODE_SERIALVALUE";
+
+ /**
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�
+ */
+ public static final String PL_CODE_SHOWFIELDCONFIG = "PL_CODE_SHOWFIELDCONFIG";
+
+ /**
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鎼滅储鏉′欢閰嶇疆
+ */
+ public static final String PL_CODE_SRCHCONDCONFIG = "PL_CODE_SRCHCONDCONFIG";
+
+ /**
+ * 杩戜箟璇嶇淮鎶� 瀹炰綋绫�
+ */
+ public static final String PL_CODE_SYNONYM = "PL_CODE_SYNONYM";
+
+ /**
+ * 缂栫爜搴撳畾涔�-妯℃澘闃舵 瀹炰綋绫�
+ */
+ public static final String PL_CODE_TEMPPHASE = "PL_CODE_TEMPPHASE";
+
+ /**
+ * 缂栫爜淇℃伅 瀹炰綋绫�
+ */
+ public static final String PL_CODE_WUPIN = "PL_CODE_WUPIN";
+
+ /**
+ * 闆嗘垚鏃ュ織瀵硅薄
+ */
+ public static final String PL_DOCKING_LOG = "PL_DOCKING_LOG";
+
+ /**
+ * 闆嗘垚绠＄悊鎺ュ彛-闆嗘垚绯荤粺缁存姢瀵硅薄
+ */
+ public static final String PL_CODE_SYSINTBASE = "PL_CODE_SYSINTBASE";
+
+ /**
+ * 闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠＄悊瀵硅薄
+ */
+ public static final String PL_CODE_SYSINTINFO = "PL_CODE_SYSINTINFO";
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/enumpack/CodeTableNameEnum.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/enumpack/CodeTableNameEnum.java
new file mode 100644
index 0000000..aa55cb4
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/enumpack/CodeTableNameEnum.java
@@ -0,0 +1,161 @@
+package com.vci.ubcs.starter.enumpack;
+
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
+import org.springblade.core.launch.constant.AppConstant;
+
+/**
+ * code鏈嶅姟涓敤鍒扮殑鑱旇〃鏌ヨ鏃惰〃鍒悕
+ * @author ludc
+ * @date 2023/6/8 11:22
+ */
+public enum CodeTableNameEnum {
+
+ /**
+ * 鍩虹鐮佹鐨勪俊鎭〃鍒悕
+ */
+ PL_CODE_BASICSEC(CodeTableNameConstant.PL_CODE_BASICSEC,"pl_code_basicsec"),
+
+ /**
+ * 涓婚搴撶殑鍒嗙被琛ㄥ埆鍚�
+ */
+ PL_CODE_CLASSIFY(CodeTableNameConstant.PL_CODE_CLASSIFY,"pl_code_classify"),
+
+ /**
+ * 妯℃澘鎵╁睍姹�
+ */
+ PL_CODE_BUTTON(CodeTableNameConstant.PL_CODE_BUTTON,"pl_code_button"),
+
+ /**
+ * 鍏ㄩ儴鐮佸��
+ */
+ PL_CODE_ALLCODE(CodeTableNameConstant.PL_CODE_ALLCODE,"pl_code_allcode"),
+
+ /**
+ * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
+ */
+ PL_CODE_CLSFLOWTEMP(CodeTableNameConstant.PL_CODE_CLSFLOWTEMP,"pl_code_clsflowtemp"),
+
+ /**
+ * 缂栫爜搴撳畾涔�-妯℃澘绠＄悊
+ */
+ PL_CODE_CLSTEMPLATE(CodeTableNameConstant.PL_CODE_CLSTEMPLATE,"pl_code_clstemplate"),
+
+ /**
+ * 涓婚搴撳垎绫荤殑妯℃澘灞炴��
+ */
+ PL_CODE_CLSTEMPATTR(CodeTableNameConstant.PL_CODE_CLSTEMPATTR,"pl_code_clstempattr"),
+
+ /**
+ * 缂栫爜搴撳畾涔�-妯℃澘鎸夐挳鎵╁睍
+ */
+ PL_CODE_TEMPBUTTON(CodeTableNameConstant.PL_CODE_TEMPBUTTON,"pl_code_tempbutton"),
+
+ /**
+ * 鍒嗙被鐮佹鐨勭爜鍊�
+ */
+ PL_CODE_CLASSIFYVALUE(CodeTableNameConstant.PL_CODE_CLASSIFYVALUE,"pl_code_classifyvalue"),
+
+ /**
+ * 鍥哄畾鐮佹鐨勭爜鍊�
+ */
+ PL_CODE_FIXEDVALUE(CodeTableNameConstant.PL_CODE_FIXEDVALUE,"pl_code_fixedvalue"),
+
+ /**
+ * 鍏抽敭灞炴�ф煡閲嶈鍒�
+ */
+ PL_CODE_KEYATTRREPEAT(CodeTableNameConstant.PL_CODE_KEYATTRREPEAT,"pl_code_keyattrrepeat"),
+
+ /**
+ * 缂栫爜搴撳畾涔�
+ */
+ PL_CODE_PHASEATTR(CodeTableNameConstant.PL_CODE_PHASEATTR,"pl_code_phaseattr"),
+
+ /**
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆
+ */
+ PL_CODE_REFERCONFIG(CodeTableNameConstant.PL_CODE_REFERCONFIG,"pl_code_referconfig"),
+
+ /**
+ * 缂栫爜瑙勫垯
+ */
+ PL_CODE_RULE(CodeTableNameConstant.PL_CODE_RULE,"pl_code_rule"),
+
+ /**
+ * 缂栫爜瑙勫垯鐨勬祦姘村��
+ */
+ PL_CODE_SERIALVALUE(CodeTableNameConstant.PL_CODE_SERIALVALUE,"pl_code_serialvalue"),
+
+ /**
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�
+ */
+ PL_CODE_SHOWFIELDCONFIG(CodeTableNameConstant.PL_CODE_SHOWFIELDCONFIG,"pl_code_showfieldconfig"),
+
+ /**
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鎼滅储鏉′欢閰嶇疆
+ */
+ PL_CODE_SRCHCONDCONFIG(CodeTableNameConstant.PL_CODE_SRCHCONDCONFIG,"pl_code_srchcondconfig"),
+
+ /**
+ * 杩戜箟璇嶇淮鎶� 瀹炰綋绫�
+ */
+ PL_CODE_SYNONYM(CodeTableNameConstant.PL_CODE_SYNONYM,"pl_code_synonym"),
+
+ /**
+ * 缂栫爜搴撳畾涔�-妯℃澘闃舵 瀹炰綋绫�
+ */
+ PL_CODE_TEMPPHASE(CodeTableNameConstant.PL_CODE_TEMPPHASE,"pl_code_tempphase"),
+
+ /**
+ * 缂栫爜淇℃伅 瀹炰綋绫�
+ */
+ PL_CODE_WUPIN(CodeTableNameConstant.PL_CODE_WUPIN,"pl_code_wupin"),
+
+ /**
+ * 闆嗘垚鏃ュ織瀵硅薄
+ */
+ PL_DOCKING_LOG(CodeTableNameConstant.PL_DOCKING_LOG,"pl_code_log"),
+
+ /**
+ * 闆嗘垚绠＄悊鎺ュ彛-闆嗘垚绯荤粺缁存姢瀵硅薄
+ */
+ PL_CODE_SYSINTBASE(CodeTableNameConstant.PL_CODE_SYSINTBASE,"pl_code_sysintbase"),
+
+ /**
+ * 闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠＄悊瀵硅薄
+ */
+ PL_CODE_SYSINTINFO(CodeTableNameConstant.PL_CODE_SYSINTINFO,"pl_code_sysintinfo")
+
+ ;
+
+ /**
+ * 鏋氫妇鐨刵ame
+ */
+ private String name;
+
+ /**
+ * 鏋氫妇鏄剧ず鏂囨湰
+ */
+ private String text;
+
+ CodeTableNameEnum(String name, String text) {
+ this.name = name;
+ this.text = text;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
index 4c4fd96..e8db33a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -9,7 +9,7 @@
import java.util.Map;
/**
- * UBCSSqlKeyword
+ * UBCSSqlKeyword,楂樼骇鏌ヨ涓嶄紶鐨勬椂鍊欓粯璁ゆ槸_equal
* map杞瑆rapper鏃剁敤鍒扮殑姣斿杞崲
* @author ludc
* @date 2023/06/06 10:01
@@ -43,8 +43,8 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.eq(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -76,7 +76,7 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.like(getColumn(k, "_equal"), v);
}
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java
index 4c6dd5e..6d999f4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java
@@ -5,13 +5,14 @@
import org.springblade.core.mp.support.Query;
import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
/**
* 鍥犱负褰撳墠妗嗘灦浣跨敤鐨勬槸query鏉ュ仛鍒嗛〉锛�
- * 鎵�浠ユ垜杩欒竟鍙傜収浠ュ墠鐨凚ladeQueryObject鏉ヤ慨鏀�
- * 涓�涓綋鍓嶆鏋朵娇鐢ㄨ捣鏉ユ柟渚夸竴鐐圭殑瀵硅薄
+ * 鎵�浠ユ垜杩欒竟鍙傜収浠ュ墠鐨凚aseQueryObject鏉ヤ慨鏀圭殑
* @author ludc
* @date 2023/5/23 13:00
*/
@@ -25,7 +26,7 @@
@JSONField
private Map<String, Object> conditionMap = new HashMap();
@JSONField
- private int page = 1;
+ private Integer page = 1;
@JSONField
private String sort;
@JSONField
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
index 3a83061..08f5c65 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
@@ -49,7 +49,7 @@
@GetMapping("/gridCodeBasicSec")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject){
+ public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(bladeQueryObject.getQuery().setAscs("ordernum"),bladeQueryObject.getConditionMap());
return R.data(codeRuleVOIPage);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
index 425b65a..07b565f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.CodeRule;
@@ -31,6 +32,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.apache.http.util.EncodingUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -39,6 +41,8 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.Collection;
import java.util.Map;
@@ -71,7 +75,7 @@
* 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
* @return baseQueryObject
*/
- @GetMapping("/gridCodeRule")
+ @GetMapping(value = "/gridCodeRule")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
index 3095155..3671ddb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
@@ -22,10 +22,8 @@
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import org.apache.commons.codec.net.QCodec;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -137,7 +135,6 @@
* @return 鎵ц缁撴灉
*/
R clearAllCode(String oid);
-
/**
* 浣跨敤涓婚敭鑾峰彇缂栫爜瑙勫垯鐨勫唴瀹�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index 3247b19..e363a31 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -26,11 +26,13 @@
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
+import com.vci.ubcs.starter.enumpack.CodeTableNameEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
+import com.vci.ubcs.starter.web.enumpck.NewAppConstantEnum;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
@@ -40,6 +42,7 @@
import com.vci.ubcs.starter.web.util.WebUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -120,15 +123,17 @@
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public IPage<CodeBasicSecVO> gridCodeBasicSec(Query query, Map<String,Object> conditionMap) throws VciBaseException {
- if(Func.isEmpty(conditionMap.get("pkCodeRule")) && Func.isEmpty(conditionMap.get("t.pkCodeRule_equal")) ){
+ public IPage<CodeBasicSecVO> gridCodeBasicSec(Query query, Map<String,Object> conditionMap) throws ServiceException {
+ if(Func.isEmpty(Func.isEmpty(conditionMap.get(CodeTableNameEnum.PL_CODE_BASICSEC.getText()+".pkCodeRule")))){
return null;
}
- // 鑱旇〃鏌ヨ
- MPJLambdaWrapper<CodeBasicSec> mpjLambdaWrapper = UBCSCondition.getMPJLambdaWrapper(conditionMap, CodeBasicSec.class)
+ // 鑱旇〃鏌ヨ ,璁剧疆琛ㄥ埆鍚嶏紝琛ㄥ埆鍚嶉粯璁ゅ氨閲囩敤琛ㄥ悕灏忓啓锛岄厤缃珮绾ф煡璇㈢殑鏃跺�欏氨闇�瑕佹牴鎹繖涓潵瀵箇here鏉′欢杩涜閰嶇疆
+ MPJLambdaWrapper<CodeBasicSec> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeBasicSec.class, CodeTableNameEnum.PL_CODE_BASICSEC.getText())
.selectAll(CodeBasicSec.class)
.selectAs(CodeClassify::getName, CodeBasicSec::getReferCodeClassifyOidName)
- .leftJoin(CodeClassify.class, CodeClassify::getOid, CodeBasicSec::getReferCodeClassifyOid);
+ .leftJoin(CodeClassify.class,CodeTableNameEnum.PL_CODE_CLASSIFY.getText(), CodeClassify::getOid, CodeBasicSec::getReferCodeClassifyOid);
+ // 娣诲姞where鏉′欢
+ UBCSSqlKeyword.buildCondition(conditionMap,mpjLambdaWrapper);
IPage<CodeBasicSec> codeBasicSecIPage = codeBasicSecMapper.selectPage(UBCSCondition.getPage(query), mpjLambdaWrapper);
return CodeBasicSecWrapper.build().pageVO(codeBasicSecIPage);
}
@@ -140,7 +145,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean batchDeleteSecByCodeRuleOid(String codeRuleOid) {
+ public boolean batchDeleteSecByCodeRuleOid(String codeRuleOid) throws ServiceException {
VciBaseUtil.alertNotNull(codeRuleOid,"缂栫爜瑙勫垯涓婚敭");
// 1銆侀�氳繃pkcoderule浣滀负鏉′欢锛屽厛鏌ヨ瑕佸垹闄ゅ熀纭�鐮佹
List<CodeBasicSec> deleteList = this.codeBasicSecMapper.selectList(Wrappers.<CodeBasicSec>query().eq("pkcoderule", codeRuleOid));
@@ -183,7 +188,7 @@
* @return 鏈夌┖鐨勫垯浼爇ey-灞炴�у悕 value-瀛楁鍚箟锛屾病鏈夌┖鐨勫垯浼� key-success value-true
*/
@Override
- public KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO) {
+ public KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO) throws ServiceException {
VciBaseUtil.alertNotNull(codeBasicSecDTO.getSecType(), "鐮佹鍒嗙被");
String secType = codeBasicSecDTO.getSecType();
HashMap<String, String> attrMap = JSONObject.parseObject(JSONObject.toJSONString(codeBasicSecDTO), HashMap.class);
@@ -346,7 +351,7 @@
* @param secType 鐮佹绫诲瀷
* @return 涓嶅彲涓虹┖鐨勫瓧娈甸泦鍚�
*/
- private Map<String, String> getNotNullableAttr(String secType) {
+ private Map<String, String> getNotNullableAttr(String secType) throws ServiceException {
Map<String, String> attrMap = new HashMap<>();
if (CodeSecTypeEnum.CODE_ATTR_SEC.getValue().equalsIgnoreCase(secType)) {
attrMap.put("name", "灞炴�х爜娈靛悕绉�");
@@ -496,7 +501,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R cloneCodeBasicSec(List<String> oidList, String pkCodeRule) {
+ public R cloneCodeBasicSec(List<String> oidList, String pkCodeRule) throws ServiceException {
boolean isLinked = checkIsLinked(pkCodeRule,null);
if (isLinked) {
return R.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�");
@@ -560,7 +565,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean upOrderNum(String oid) {
+ public boolean upOrderNum(String oid) throws ServiceException{
CodeBasicSec secDO = selectByOid(oid);
if(secDO.getOrderNum() > 1){
//绛変簬1鐨勬椂鍊欎笉鑳戒笂绉讳簡
@@ -591,7 +596,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean downOrderNum(String oid) {
+ public boolean downOrderNum(String oid) throws ServiceException {
CodeBasicSec secDO = selectByOid(oid);
Long total = codeBasicSecMapper.selectCount(Wrappers.<CodeBasicSec>query()
.lambda().eq(CodeBasicSec::getPkCodeRule,secDO.getPkCodeRule())
@@ -623,7 +628,7 @@
* @return
*/
@Override
- public List<String> getOidByCodeclassifysecOid(String codeClassifySecOid) {
+ public List<String> getOidByCodeclassifysecOid(String codeClassifySecOid)throws ServiceException {
return codeBasicSecMapper.getOidByCodeclassifysecOid(codeClassifySecOid.trim());
}
@@ -703,7 +708,7 @@
* @return 鐮佹鐨勫唴瀹�
*/
@Override
- public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid) {
+ public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid)throws ServiceException {
if(StringUtils.isBlank(ruleOid)){
return new ArrayList<>();
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 24ae819..224a3f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -57,9 +57,11 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.awt.event.ItemEvent;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.*;
@@ -912,12 +914,12 @@
attributeVO.setAttributeLength(attr.getAttributeLength());
attributeVO.setBtmTypeId(btmTypeDetail.getData().getId());
attributeVO.setBtmname(btmTypeDetail.getData().getName());
- attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,attr.getAttrDataType()));
+ attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,attr.getAttrDataType()));
boolean add = true;
if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
add = false;
}
- if(StringUtils.isNotBlank(name) && !attributeVO.getId().contains(name.replace("*",""))){
+ if(StringUtils.isNotBlank(name) && !attributeVO.getName().contains(name.replace("*",""))){
add = false;
}
if(add){
@@ -930,20 +932,31 @@
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
}
List<BtmTypeAttributeVO> defaultAttrVOS = btmTypeVOR.getData().getAttributes();
- if(!CollectionUtils.isEmpty(defaultAttrVOS)){
- defaultAttrVOS.stream().forEach(attr->{
+
+ // 鍙栦袱涓泦鍚堝樊闆�
+ List<String> ids = unDefaultAttributes.stream().map(BtmTypeAttributeVO::getId).collect(Collectors.toList());
+ defaultAttrVOS.forEach(item->{
+ if(!ids.contains(item.getId())){
+ BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
+ BeanUtils.copyProperties(item,attributeVO);
+ attributeVO.setAttrDataType(item.getAttrDataType());
+ attributeVO.setAttributeLength(item.getAttributeLength());
+ attributeVO.setBtmTypeId(btmTypeDetail.getData().getId());
+ attributeVO.setBtmname(btmTypeDetail.getData().getName());
+ attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,item.getAttrDataType()));
boolean add = true;
- if(StringUtils.isNotBlank(id) && !attr.getId().contains(id.replace("*",""))){
+ if(StringUtils.isNotBlank(id) && !item.getId().contains(id.replace("*",""))){
add = false;
}
- if(StringUtils.isNotBlank(name) && !attr.getId().contains(name.replace("*",""))){
+ if(StringUtils.isNotBlank(name) && !item.getName().contains(name.replace("*",""))){
add = false;
}
if(add){
- attributeVOS.add(attr);
+ attributeVOS.add(attributeVO);
}
- });
- }
+ }
+ });
+
DataGrid<BtmTypeAttributeVO> dataGrid = new DataGrid<>();
dataGrid.setData(attributeVOS);
dataGrid.setTotal(attributeVOS.size());
@@ -1030,20 +1043,7 @@
}
/**
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
* 涓婚搴撶殑鏍�,宸茶仈璋冧笟鍔＄被鍨嬫煡璇eign
-=======
- * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
->>>>>>> Stashed changes
-=======
- * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
->>>>>>> Stashed changes
-=======
- * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
->>>>>>> Stashed changes
- *
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
* @return 涓婚搴撴樉绀烘爲
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index a89d482..56490a2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -19,7 +19,9 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.wrapper.CodeClassifyTemplateAttrWrapper;
import com.vci.ubcs.omd.feign.IAttributeClient;
+import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
@@ -28,14 +30,17 @@
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.context.annotation.Lazy;
@@ -89,7 +94,7 @@
* 灞炴�ф湇鍔″璞�
*/
@Resource
- private IAttributeClient attributeClient;
+ private IBtmTypeClient btmTypeClient;
/**
* 鏌ヨ鎵�鏈夌殑涓婚搴撳垎绫荤殑妯℃澘灞炴��
@@ -297,34 +302,17 @@
pageHelper = new PageHelper(-1);
}
pageHelper.addDefaultAsc("ordernum");
-// IPage iPage = new IPage();
Query query = new Query();
query.setAscs("ordernum");
-// query.setSize(100);
if(pageHelper.getLimit() != -1){
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
}
-// Condition.getPage(query)
- CodeClassifyTemplateAttr codeClstempattrVO = new CodeClassifyTemplateAttr();
-// BeanUtil.toBean(map,codeClstempattrVO);
-// BeanUtil
- BeanMap beanMap = BeanMap.create(codeClstempattrVO);
-
- beanMap.putAll(conditionMap);
-// Condition.getQueryWrapper(
IPage<CodeClassifyTemplateAttr> doList = baseMapper.
- selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClstempattrVO));
-
-
+ selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class));
if (!CollectionUtils.isEmpty(doList.getRecords())) {
-// CodeClstempattrEntity codeClstempattrEntity = new CodeClstempattrEntity();
-// BeanUtils.copyProperties(conditionMap, codeClstempattrEntity);
-// List<CodeClstempattrEntity> codeClstempattrEntities = new ArrayList<>();
-// BeanUtils.copyProperties(doList,codeClstempattrEntities);
-// codeClstempattrEntities.addAll(doList);
dataGrid.setData(codeClassifyTemplateAttrDO2VOs(doList.getRecords()));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(Condition.getQueryWrapper(codeClstempattrVO)))));
+ dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class)))));
}
return dataGrid;
}
@@ -649,6 +637,7 @@
public CodeClassifyTemplateAttrVO getObjectByOid(String oid) throws VciBaseException{
return codeClassifyTemplateAttrDO2VO(selectByOid(oid));
}
+
/**
* 涓婚敭鏌ヨ鏁版嵁瀵硅薄
* @param oid 涓婚敭
@@ -697,21 +686,6 @@
}
/**
- * 鍙傜収涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- // @Override
- // public DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- // if(conditionMap == null){
- // conditionMap = new HashMap<String, String>();
- // }
- // return gridCodeClassifyTemplateAttr(conditionMap,pageHelper);
- // }
-
- /**
* 鏌ヨ杩欎釜妯℃澘锛屼笟鍔＄被鍨嬩笅鐨勬墍鏈夋湭閫夋嫨鐨勫睘鎬�
* @param baseQueryObject
* @return
@@ -736,35 +710,16 @@
//鏌ヨ妯℃澘瀵硅薄
CodeClassifyTemplate codeClassifyTemplateDO = codeClassifyTemplateMapper.selectById(templateAttrOid);
-
- //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
- // 寰呭畬鍠�
- List<BtmTypeAttributeVO> boAttrs = null; //(List<BtmTypeAttributeVO>)attributeClient.selectById(codeClassifyTemplateDO.getBtmTypeId());// this.btmService.listAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
- // codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId());
- // BeanUtils.copyProperties(codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId()),boAttrs);
- //鎶婇粯璁ょ殑灞炴�т篃娣诲姞鍒癰oAttrs
- if(boAttrs == null){
- boAttrs = new ArrayList<>();
+ // 娌℃湁妯℃澘瀵硅薄涓嶆墽琛岄�昏緫
+ if(Objects.isNull(codeClassifyTemplateDO)){
+ dataGrid.setData(new ArrayList<>());
+ dataGrid.setTotal(0);
+ return dataGrid;
}
- if(!false){
-// List<CodeOsbtmtypeattributeVO> finalBoAttrs = boAttrs;
-// attributeService.getDefaultAttributeVOs().stream().forEach(attr-> {
-// CodeOsbtmtypeattributeVO attributeVO = new CodeOsbtmtypeattributeVO();
-// BeanUtil.convert(attr, attributeVO);
-// if ("id".equalsIgnoreCase(attributeVO.getId())) {
-// attributeVO.setName("浼佷笟缂栫爜");
-// }
-// if ("name".equalsIgnoreCase(attributeVO.getId())) {
-// attributeVO.setName("闆嗗洟鐮�");
-// }
-// attributeVO.setAttrDataType(attr.getAttributeDataType());
-// attributeVO.setAttributeLength(attr.getAttrLength());
-// attributeVO.setReferBtmTypeId(attr.getBtmTypeId());
-// attributeVO.setReferBtmTypeName(attr.getBtmTypeName());
-// finalBoAttrs.add(attributeVO);
-// });
-// boAttrs = finalBoAttrs;
- Object o = null;
+ //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getAllAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
+ if(btmTypeVOR.getCode() != 200){
+ throw new ServiceException("涓氬姟绫诲瀷feign璋冪敤澶辫触锛�");
}
//杩欎釜妯℃澘涓嬪凡缁忔湁鐨勫睘鎬�
@@ -782,7 +737,7 @@
//杩囨护鎺夊凡缁忓瓨鍦ㄧ殑灞炴��
List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>();
- for (BtmTypeAttributeVO osBtmTypeAttributeVO:boAttrs){
+ for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){
if(!btmOids.contains(osBtmTypeAttributeVO.getId())){
//鐪嬬湅鏄笉鏄湁妯＄硦鏌ヨ
boolean inSearch = true;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java
index 293997b..202d615 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateAttrWrapper.java
@@ -42,7 +42,7 @@
public CodeClassifyTemplateAttrVO entityVO(CodeClassifyTemplateAttr CodeClstempattr) {
CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO = Objects.requireNonNull(BeanUtil.copy(CodeClstempattr, CodeClassifyTemplateAttrVO.class));
if(StringUtils.isNotBlank(CodeClstempattr.getAttributeDataType())){
- codeClassifyTemplateAttrVO.setAttributeDataTypeText( EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,CodeClstempattr.getAttributeDataType()));
+ codeClassifyTemplateAttrVO.setAttributeDataTypeText( EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,CodeClstempattr.getAttributeDataType()));
}
return codeClassifyTemplateAttrVO;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index 7e4bce6..8cfa427 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -1,19 +1,28 @@
#鏈嶅姟鍣ㄧ鍙�
server:
port: 36014
-
+ tomcat:
+ uri-encoding: UTF-8
+ servlet:
+ encoding:
+ enabled: true
+ charset: UTF-8
+ force: true
#鏁版嵁婧愰厤缃�
spring:
datasource:
url: ${ubcs.datasource.mdm.dev.url}
username: ${ubcs.datasource.mdm.dev.username}
password: ${ubcs.datasource.mdm.dev.password}
+ messages:
+ encoding: utf-8
+ basename: i18n/messages
#鍏抽棴椹煎嘲鍛藉悕鏄犲皠
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
#mybatis-plus-join:
-# table-alias:
+# table-alias: t
######搴旂敤鍩烘湰閰嶇疆
#app:
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
index 84d76d9..52c6de9 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
@@ -51,7 +51,7 @@
@Override
@GetMapping(GET_DETAIL)
public R<BtmTypeVO> getDetail(String oid) {
- return R.data(btmTypeService.getAllAttributeByBtmOid(oid));
+ return R.data(btmTypeService.getBtmTypeByOid(oid));
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index 4a06c65..22b2d70 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -216,7 +216,7 @@
@GetMapping( "/queryApplyState")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
- public R queryApplyState(String oids){
+ public R queryApplyState(String oids){
try {
return groupMdmInterService.queryApplyState(oids);
}catch (VciBaseException e){
diff --git a/Source/data/applogs/xxl-job/xxl-job-admin.log b/Source/data/applogs/xxl-job/xxl-job-admin.log
index 4c538f2..9a71d6b 100644
--- a/Source/data/applogs/xxl-job/xxl-job-admin.log
+++ b/Source/data/applogs/xxl-job/xxl-job-admin.log
Binary files differ
diff --git a/Source/data/applogs/xxl-job/xxl-job-admin.log.2023-06-07.zip b/Source/data/applogs/xxl-job/xxl-job-admin.log.2023-06-07.zip
new file mode 100644
index 0000000..1ced818
--- /dev/null
+++ b/Source/data/applogs/xxl-job/xxl-job-admin.log.2023-06-07.zip
Binary files differ
--
Gitblit v1.9.3