From ec407e8676f6245d88da3d9f729ad545ae3218c0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 18 七月 2023 15:20:03 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml | 14 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 7
Source/UBCS-WEB/src/views/code/code.vue | 200 +++++++++++++++++----------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 1
Document/部署说明文档/410编码资源管理系统端口开放说明.docx | 0
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 7 +
Source/UBCS/service-start.sh | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 113 +++++++++++-------
9 files changed, 197 insertions(+), 153 deletions(-)
diff --git "a/Document/\351\203\250\347\275\262\350\257\264\346\230\216\346\226\207\346\241\243/410\347\274\226\347\240\201\350\265\204\346\272\220\347\256\241\347\220\206\347\263\273\347\273\237\347\253\257\345\217\243\345\274\200\346\224\276\350\257\264\346\230\216.docx" "b/Document/\351\203\250\347\275\262\350\257\264\346\230\216\346\226\207\346\241\243/410\347\274\226\347\240\201\350\265\204\346\272\220\347\256\241\347\220\206\347\263\273\347\273\237\347\253\257\345\217\243\345\274\200\346\224\276\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..d17d2b4
--- /dev/null
+++ "b/Document/\351\203\250\347\275\262\350\257\264\346\230\216\346\226\207\346\241\243/410\347\274\226\347\240\201\350\265\204\346\272\220\347\256\241\347\220\206\347\263\273\347\273\237\347\253\257\345\217\243\345\274\200\346\224\276\350\257\264\346\230\216.docx"
Binary files differ
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index c1a1e3a..5b4a5a7 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -933,7 +933,7 @@
/** 鐮佸�肩鐞嗙浉鍏虫暟鎹� */
isShowBasicSecCodeValueMgr: false, //鐮佹鐮佸�肩鐞嗗璇濇
- codefixedsecOrCodeclassifysecOid: '', //瀛樻斁鍩虹鐮佹鐐瑰嚮鐮佸�肩鐞嗘椂鐨勫綋鍓嶈id锛岀敤浜庝繚瀛樼爜鍊兼椂浣跨敤
+ codefixedsecOrCodeclassifysec: '', //瀛樻斁鍩虹鐮佹鐐瑰嚮鐮佸�肩鐞嗘椂鐨勫綋鍓嶈id锛岀敤浜庝繚瀛樼爜鍊兼椂浣跨敤
selectedFixedOrCodeclassifyValue: '', //褰撳墠閫変腑鐨勭爜鍊兼暟鎹�
//鍥哄畾鐮佹鐮佸�艰〃鍗�
codeFixdForm: {
@@ -1201,7 +1201,7 @@
},
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
- // 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄�
+ /** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
saveSelectedParentClassify(){
//console.log(this.parentClsfyParams.parentClassifySelectionList.length);
if(this.parentClsfyParams.parentClassifySelectionList.length != 1){
@@ -1270,12 +1270,12 @@
/** 鎵撳紑灞炴�ч�夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
- // 鑾峰彇褰撳墠琚�変腑鏍戣妭鐐圭殑oid
+ /** 鑾峰彇褰撳墠琚�変腑鏍戣妭鐐圭殑oid */
nodeClick(data) {
this.currentSelectTreeData = data;
this.loadlistClassifyLinkAttr()
},
- // 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹�
+ /** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
//console.log(this.currentSelectTreeData);
@@ -1300,31 +1300,31 @@
this.selectAttrParams.selectAttrQeury = {};
})
},
- // 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
+ /** 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢 */
selectAttrSearchChange(params, done) {
this.selectAttrParams.selectAttrQeury = params;
//console.log(params); //杩欏効闇�瑕佹敼
this.loadlistClassifyLinkAttr();
done();
},
- // 涓哄睘鎬ч�夊�肩晫闈紝鍗曞嚮琛ㄦ牸琛屾椂瑙﹀彂璇ヤ簨浠�
+ /** 涓哄睘鎬ч�夊�肩晫闈紝鍗曞嚮琛ㄦ牸琛屾椂瑙﹀彂璇ヤ簨浠� */
selectionAttrRowClick(row){
this.$refs[this.selectAttrParams.ref].toggleSelection();
this.selectAttrParams.selectionChangeAttrList = row;
this.$refs[this.selectAttrParams.ref].setCurrentRow(row);
this.$refs[this.selectAttrParams.ref].toggleRowSelection(row); //閫変腑褰撳墠琛�
},
- // 灞炴�у彇鍊煎綋鍓嶉�変腑琛屽彂鐢熷彉鍖栨椂瑙﹀彂
+ /** 灞炴�у彇鍊煎綋鍓嶉�変腑琛屽彂鐢熷彉鍖栨椂瑙﹀彂 */
selectionChangeAttr(list){
this.selectAttrParams.selectionChangeAttrList = list;
this.$refs[this.selectAttrParams.ref].setCurrentRow(this.selectAttrParams.selectionChangeAttrList[list.length-1]);
},
- // 閲嶇疆浣嶅睘鎬ч�夊彇鍊艰〃鏍肩殑鎼滅储妗嗕箣鍚庣殑鍥炶皟
+ /** 閲嶇疆浣嶅睘鎬ч�夊彇鍊艰〃鏍肩殑鎼滅储妗嗕箣鍚庣殑鍥炶皟 */
searchAttrReset() {
this.selectAttrParams.selectAttrQeury = {};
this.loadlistClassifyLinkAttr()
},
- // 涓哄睘鎬ч�夊彇鍊间箣鍚庣殑鍥炴樉
+ /** 涓哄睘鎬ч�夊彇鍊间箣鍚庣殑鍥炴樉 */
selectedListClassifyLinkAttr(){
if(this.selectAttrParams.selectionChangeAttrList.length != 1){
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
@@ -1343,7 +1343,7 @@
/** 鍩虹鐮佹琛ㄤ腑鐨勭爜鍊肩鐞嗙殑鐩稿叧鏂规硶 */
- // 鐮佸�肩鐞嗗脊绐楁帶鍒�
+ /** 鐮佸�肩鐞嗗脊绐楁帶鍒�*/
openBasicSecCodeValueMgr(row){
//褰撳墠涓哄浐瀹氱爜娈电爜鍊肩鐞嗙爜鍊肩鐞�
if(row.secType === "codefixedsec"){
@@ -1354,10 +1354,10 @@
this.isShowFixedForm = false;
this.loadClassifyValueData(row);
}
- this.codefixedsecOrCodeclassifysecOid = row.oid;
+ this.codefixedsecOrCodeclassifysec = row;
this.isShowBasicSecCodeValueMgr = true;
},
- //鍔犺浇鍥哄畾鐮佹鐮佸�艰〃鏁版嵁
+ /** 鍔犺浇鍥哄畾鐮佹鐮佸�艰〃鏁版嵁*/
loadFixedValueTableData(row){
this.fixedValueOptionLoading = true;
gridCodeFixedValue(1, -1, {"codeFixedSecOid":row.oid}).then(res=>{
@@ -1366,7 +1366,7 @@
this.fixedValueOptionLoading = false;
})
},
- //鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢
+ /** 鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢*/
selectedCodeValueRow(row){
//console.log(row);
this.selectedFixedOrCodeclassifyValue = row;
@@ -1374,20 +1374,15 @@
this.codeFixdForm.description = row.description;
this.codeFixdForm.codeFixedSecOid = row.codefixedsecoid;
},
- //鏂板鐮佸��
+ /** 鏂板鐮佸��*/
addCodeSecValue(condition){
if(condition === "codefixedsec"){
- if(this.codeFixdForm.id.trim() == ''){
- this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+ if(!this.tipsCodeSecValueMessage(this.codeFixdForm.id)){
return;
}
- if(this.codeFixdForm.id.trim().length >= 12 ){
- this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�12锛�");
- return;
- }
- this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysecOid;
+ this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysec.oid;
addSaveCodeFixedValue(this.codeFixdForm).then(() => {
- this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid});
+ this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid});
this.clearFixedOrClassifyForm('codefixedsec');
this.$message({
type: "success",
@@ -1397,18 +1392,13 @@
window.console.log(error);
});
}else {
- if(this.codeClassifyForm.id.trim() == ''){
- this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+ if(!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)){
return;
}
- if(this.codeClassifyForm.id.trim().length > 4 ){
- this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�4锛�");
- return;
- }
- this.codeClassifyForm.codeClassifySecOid = this.codefixedsecOrCodeclassifysecOid;
+ this.codeClassifyForm.codeClassifySecOid = this.codefixedsecOrCodeclassifysec.oid;
// console.log(this.codeClassifyForm);
addSaveCodeClassifyValue(this.codeClassifyForm).then(() => {
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid});
this.clearFixedOrClassifyForm('codeclassifyvaluesec');
this.$message({
type: "success",
@@ -1422,7 +1412,7 @@
});
}
},
- //娓呯┖鐮佸�艰〃鍗�
+ /** 娓呯┖鐮佸�艰〃鍗� */
clearFixedOrClassifyForm(condition){
//鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
this.selectedFixedOrCodeclassifyValue = '';
@@ -1438,19 +1428,34 @@
this.codeClassifyForm = this.$options.data().codeClassifyForm;
}
},
- //淇敼鐮佸��
+ /** 娣诲姞鎴栦慨鏀圭爜鍊间箣鍓嶅鐮佸�奸暱搴︽牴鎹鍒欒繘琛屾牎楠� */
+ tipsCodeSecValueMessage(id){
+ if(id.trim() == ''){
+ this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+ return false;
+ }
+ if(id.trim().length > this.codefixedsecOrCodeclassifysec.codeSecLength ){
+ this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�" + this.codefixedsecOrCodeclassifysec.codeSecLength);
+ return false;
+ }
+ return true;
+ },
+ /** 淇敼鐮佸�� */
editCodeSecValue(condition){
if(condition=='codefixedsec'){
- //浠ュ墠鏄洿鎺ユ妸褰撳墠閫変腑琛岀殑鎵�鏈夋暟鎹兘杩涜鎻愪氦锛屼絾鍏跺疄鍙渶瑕佷紶杈撲竴浜涙瘮瑕佸弬鏁板嵆鍙紝杩欏効鍋氫簡淇敼锛岄渶瑕佺┛鍏朵粬鍙傛暟鐨勮鑷娣诲姞
+ if(!this.tipsCodeSecValueMessage(this.codeFixdForm.id)){
+ return;
+ }
+ //浠ュ墠鏄洿鎺ユ妸褰撳墠閫変腑琛岀殑鎵�鏈夋暟鎹兘杩涜鎻愪氦锛屼絾鍏跺疄鍙渶瑕佷紶杈撲竴浜涘繀瑕佸弬鏁板嵆鍙紝杩欏効鍋氫簡淇敼锛岄渶瑕佷紶鍏朵粬鍙傛暟鐨勮鑷娣诲姞
let editData = {
- "oid": this.selectedFixedOrCodeclassifyValue.oid,
- "ts": new Date().getTime(),
- "description": this.codeFixdForm.description,
- "id": this.codeFixdForm.id,
- "codeFixedSecOid": this.selectedFixedOrCodeclassifyValue.codefixedsecoid
+ "oid": this.selectedFixedOrCodeclassifyValue.oid,
+ "ts": new Date().getTime(),
+ "description": this.codeFixdForm.description,
+ "id": this.codeFixdForm.id,
+ "codeFixedSecOid": this.selectedFixedOrCodeclassifyValue.codefixedsecoid
}
editCodeFixedValue(editData).then(() => {
- this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1459,14 +1464,17 @@
window.console.log(error);
});
}else {
+ if(!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)){
+ return;
+ }
this.codeClassifyForm.oid = this.selectedFixedOrCodeclassifyValue.attributes.oid;
// 鍒嗙被鐮佹锛屽瓙鍒嗙被鍜岀埗鍒嗙被涔嬮棿涓嶈兘鐩镐簰鏇存敼
- if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
}
this.$delete(this.codeClassifyForm,"parentClassifyValueOid");
editCodeClassifyValue(this.codeClassifyForm).then(() => {
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1477,7 +1485,7 @@
}
},
- //鍒犻櫎鐮佸��
+ /** 鍒犻櫎鐮佸�� */
delCodeSecValue(condition){
//鍥哄畾鐮佹鐮佸�煎垹闄�
if(condition == 'codefixedsec'){
@@ -1493,7 +1501,7 @@
})
.then(() => {
this.selectedFixedOrCodeclassifyValue = '';
- this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.clearFixedOrClassifyForm('codefixedsec');
this.$message({
type: "success",
@@ -1501,7 +1509,7 @@
});
});
}else{
- if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
}
//鍒嗙被鐮佹鐮佸�煎垹闄�
@@ -1516,7 +1524,7 @@
})
.then(() => {
this.selectedFixedOrCodeclassifyValue = '';
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.clearFixedOrClassifyForm('codeclassifyvalue');
this.$message({
type: "success",
@@ -1525,7 +1533,7 @@
});
}
},
- //瀵瑰浐瀹氱爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
+ /** 瀵瑰浐瀹氱爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�*/
codeFixedValueOpetion(condition,row){
//console.log(this.fixedValueData[row.$index].orderNum);
const index = row.$index;
@@ -1561,9 +1569,9 @@
}
//console.log(this.fixedValueData);
},
- //瀵瑰垎绫荤爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
+ /** 瀵瑰垎绫荤爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�*/
codeClassifyValueOpetion(condition){
- if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
}
//姝ゅ娑夊強鍒版繁娴呮嫹璐濋棶棰橈紝浣嗘槸鎵ц涓婁笅绉讳繚瀛樻搷浣滀箣鍚庝細閲嶆柊鍔犺浇treedata锛屾墍浠ュ奖鍝嶄笉澶�
@@ -1590,7 +1598,7 @@
}
}
},
- //閫変腑琚皟鏁撮『搴忕殑涓や釜鏍戠殑鑺傜偣
+ /** 閫変腑琚皟鏁撮『搴忕殑涓や釜鏍戠殑鑺傜偣*/
getCodeClassifyValueTreeData(){
const currentNodeTreeData = this.selectedFixedOrCodeclassifyValue;
/**鑰冭檻鍑犵鎯呭喌锛岀涓�绉嶅綋鍓嶄笂绉粅涓嬬Щ鎿嶄綔宸茬粡鏄竟鐣岋紝
@@ -1626,12 +1634,12 @@
}
}
},
- //涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨
+ /** 涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨*/
async saveCodeFixedOrClassifyValueOption(condition,editOrderNumdata){
//淇濆瓨瀵瑰浐瀹氱爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
if(condition == "fixedValue"){
let data = {
- "codeFixedSecOid": this.codefixedsecOrCodeclassifysecOid,
+ "codeFixedSecOid": this.codefixedsecOrCodeclassifysec.oid,
"dtoList": JSON.stringify(this.fixedValueData),
}
saveOrder(data).then(() => {
@@ -1647,7 +1655,7 @@
}else {
//淇濆瓨瀵瑰垎绫荤爜鍊肩爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
await saveCodeClassifyValueOrder({
- "codeClassifySecOid": this.codefixedsecOrCodeclassifysecOid,
+ "codeClassifySecOid": this.codefixedsecOrCodeclassifysec.oid,
"dtoList": JSON.stringify(editOrderNumdata),
}).then(() => {
this.$message({
@@ -1657,11 +1665,11 @@
}, error => {
window.console.log(error);
});
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid});
}
},
- //鍒嗙被鐮佸�兼爲data鍔犺浇
+ /** 鍒嗙被鐮佸�兼爲data鍔犺浇*/
loadClassifyValueData(row){
//console.log(row);
let condtionData = {
@@ -1677,7 +1685,7 @@
//console.log(res.data);
});
},
- //鍒嗙被鐮佸�兼爲鍗曞嚮鏃惰Е鍙戠殑浜嬩欢
+ /** 鍒嗙被鐮佸�兼爲鍗曞嚮鏃惰Е鍙戠殑浜嬩欢*/
classisyValueTreeOnodeClick(node){
//console.log(node);
this.selectedFixedOrCodeclassifyValue = node;
@@ -1692,7 +1700,7 @@
* @currentRowClassOid 褰撳墠閫変腑琛宱id
* @updateClassOid 瑕佷慨鏀圭殑鍒嗙被鐮佸�紀id
*/
- checkClassUpdate(currentRowClassOid,updateClassOid){
+ checkClassUpdate(currentRowClassOid,updateClassOid){
if(currentRowClassOid!=updateClassOid){
this.$message({
type: "error",
@@ -1703,7 +1711,7 @@
},
/** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
- // 鎵撳紑楂樼骇鏌ヨ绐楀彛
+ /** 鎵撳紑楂樼骇鏌ヨ绐楀彛 */
openAdvancedQuery(condition){
if(condition=='codeRule'){
this.advancedQueryParam.options = [
@@ -1772,7 +1780,7 @@
this.advancedQueryParam.currentOpen = condition;
this.advancedQueryParam.advancedQuerySettingBox = true;
},
- // 鏌ヨ浣跨敤鑼冨洿
+ /** 鏌ヨ浣跨敤鑼冨洿*/
handleRange(){
if(!this.tipsMessage(this.selectionList)){
return;
@@ -1780,7 +1788,7 @@
this.codeRangeSettingBox = true;
this.getRangeCodeList()
},
- // 鍔犺浇浣跨敤鑼冨洿鍒楄〃
+ /** 鍔犺浇浣跨敤鑼冨洿鍒楄〃*/
getRangeCodeList(){
this.dialogLoading = true;
if(this.selectionList[0].oid==null){
@@ -1793,11 +1801,11 @@
this.dialogLoading = false;
});
},
- // 鍒锋柊浣跨敤鑼冨洿鍒楄〃
+ /** 鍒锋柊浣跨敤鑼冨洿鍒楄〃*/
refreshUseRangeChange(){
this.getRangeCodeList();
},
- // 鍚敤涓庡仠鐢�
+ /** 鍚敤涓庡仠鐢�*/
enableOrDeactivatse(oId,update){
updateStatus({"oid":oId,"ts":new Date().getTime,"update":update}).then(() => {
this.onLoad(this.page);
@@ -1809,7 +1817,7 @@
window.console.log(error);
});
},
- // 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�
+ /** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
return;
@@ -1820,7 +1828,7 @@
this.cloneCodeRuleForm.description = this.selectionList[0].description;
this.loadBasic({"oid": this.selectionList[0].oid});
},
- // 鍏嬮殕缂栫爜瑙勫垯淇濆瓨鍔熻兘
+ /** 鍏嬮殕缂栫爜瑙勫垯淇濆瓨鍔熻兘*/
saveCloneCodeRule(){
let form = this.cloneCodeRuleForm;
if(form.id.trim()==''){
@@ -1851,7 +1859,7 @@
});
//console.log(data);
},
- // 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�
+ /** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
openOtherCodeRuleDialog(){
if (!this.tipsMessage(this.selectionList)) {
return;
@@ -1862,7 +1870,7 @@
}
this.cloneOtherCodeRuleSettingBox = true;
},
- // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
+ //** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨*/
codeOtherCloneRuleRowClick(row) {
this.$refs.crudCloneCodeRuleOther.toggleSelection();
this.selectionOtherCloneCodeRuleList = row;
@@ -1870,14 +1878,14 @@
this.$refs.crudCloneCodeRuleOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
this.loadBasic(row);
},
- // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮鍩虹鐮佹瀹炵幇琛岄�夋嫨
+ /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮鍩虹鐮佹瀹炵幇琛岄�夋嫨*/
codeOtherCloneBasicRowClick(row){
this.$refs.crudCloneCodeBasicOther.toggleSelection();
this.selectionOtherCloneCodeBasicList = row;
this.$refs.crudCloneCodeBasicOther.setCurrentRow(row);
this.$refs.crudCloneCodeBasicOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
},
- // 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈腑缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
+ /** 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈腑缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
selectionOtherCloneCodeRuleChange(list) {
//console.log(list);
this.selectionOtherCloneCodeRuleList = list;
@@ -1893,7 +1901,7 @@
this.selectionOtherCloneCodeBasicList = list;
this.$refs.crudCloneCodeBasicOther.setCurrentRow(this.selectionOtherCloneCodeBasicList[list.length-1]);
},
- // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅
+ /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅*/
saveOtherCodeBasic(){
let oid = this.selectionList[0].oid;
let fromDialogPkCodebasic = this.selectionOtherCloneCodeBasicList;
@@ -1929,7 +1937,7 @@
window.console.log(error);
});
},
- // 娓呯┖鐮佸��
+ /** 娓呯┖鐮佸��*/
clearAllCodeSec(){
if(this.selectionList.length == 0){
this.$message.warning("娌℃湁閫夋嫨鏁版嵁!");
@@ -1957,7 +1965,7 @@
});
});
},
- // 娣诲姞
+ /** 娣诲姞*/
rowSave(row, done, loading) {
console.log(row);
add(row).then(() => {
@@ -1975,7 +1983,7 @@
openEdit(row){
this.$refs.crud.rowEdit(row,row.$index);
},
- // 淇敼
+ /** 淇敼*/
rowUpdate(row, index, done, loading) {
row.ts = new Date().getTime;
update(row).then(() => {
@@ -1990,7 +1998,7 @@
console.log(error);
});
},
- // 鍒犻櫎
+ /** 鍒犻櫎*/
handleDelete() {
if(!this.tipsMessage(this.selectionList)){
return;
@@ -2015,7 +2023,7 @@
this.$refs.crud.toggleSelection();
});
},
- // 鎵撳紑淇敼
+ // 鎵撳紑淇敼*/
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.ruleForm.oid).then(res => {
@@ -2041,7 +2049,7 @@
this.onLoad(this.page);
done();
},
- // 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
+ /** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
selectionChange(list) {
this.selectionList = list;
//褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�,骞剁鐢ㄧ浉鍏冲姛鑳�
@@ -2055,7 +2063,7 @@
this.loadBasic(this.selectionList[list.length-1]);
}
},
- // 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
+ /** 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨*/
codeRuleRowClick (row) {
// console.log(this.currentRuleLcStatus);
this.$refs.crud.toggleSelection();
@@ -2104,12 +2112,12 @@
/** 鍩虹鐮佹鐩稿叧鏂规硶 */
- //闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��
+ /** 闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��*/
clearBasicAddForm(){
this.form = this.$options.data().form;
// this.changeSectypeFormItems(null);
},
- // 鎵撳紑鏂板绐楀彛
+ /** 鎵撳紑鏂板绐楀彛*/
openAddBasicCodeSec(){
if(!this.tipsMessage(this.selectionList)){
return;
@@ -2121,7 +2129,7 @@
this.openBasicDialog('add',null);
this.loadCodeSecType();
},
- // 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�
+ /** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
openBasicDialog(condition,row){
//console.log(row);
if(condition == 'add') {
@@ -2146,7 +2154,7 @@
this.changeSectypeFormItems(condition == 'add' ? null:row);
this.addBasicCodeSettingBox = true;
},
- // 鏂板鍩虹鐮佹
+ /** 鏂板鍩虹鐮佹*/
async saveOrEditBasicCode(){
if(this.selectionList[0].oid == null || this.selectionList[0].oid == ''){
this.$message.warning('缂哄け蹇呰鍙傛暟锛岃閲嶆柊閫夋嫨缂栫爜瑙勫垯鍚庡啀璇�!');
@@ -2191,7 +2199,7 @@
this.addBasicCodeSettingBox = false
}
},
- // 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�
+ /** 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�*/
checkForm(){
let form = this.form;
//console.log(form);
@@ -2372,7 +2380,7 @@
}
return true;
},
- // 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁
+ /** 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁*/
tipsMessage(list){
if(list.length != 1){
this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!");
@@ -2380,7 +2388,7 @@
}
return true;
},
- // 鍩虹鐮佹鍒犻櫎
+ /** 鍩虹鐮佹鍒犻櫎*/
deleteBasicCode(){
if(!this.tipsMessage(this.selectionBasicList)){
return;
@@ -2404,7 +2412,7 @@
this.$refs.crudBasic.toggleSelection();
});
},
- // 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅
+ /** 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅*/
loadBasic(row){
if(this.cloneSettingBox){
this.cloneTableLoading = true;
@@ -2419,7 +2427,7 @@
this.sendGridCodeBasicSec({"pkCodeRule":row.oid},false);
}
},
- // 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
+ /** 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�*/
sendGridCodeBasicSec(condition,isAdancedQuery/** 鏄惁楂樼骇鏌ヨ */){
// 濡傛灉褰撳墠鍩虹鐮佹琛ㄤ腑鐨勬悳绱㈡寜閽闅愯棌锛屽氨闇�瑕佸湪姝ゅ紑鍚�
if(this.selectionList.length>=0 && !this.$refs.crudBasic.option.column[0].search){
@@ -2448,13 +2456,13 @@
}
});
},
- // 鍩虹鐮佹閫変腑鏃惰Е鍙�
+ /** 鍩虹鐮佹閫変腑鏃惰Е鍙�*/
selectionBasicChange(list) {
this.selectionBasicList = list;
this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]);
//console.log(this.selectionBasicList);
},
- // 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�
+ /** 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�*/
codeBasicSecRowClick(row){
this.$refs.crudBasic.toggleSelection();
this.selectionBasicList = row;
@@ -2469,7 +2477,7 @@
basicSearchReset(){
this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid},false);
},
- // 涓婄Щ涓嬬Щ鍩虹鐮佹
+ /** 涓婄Щ涓嬬Щ鍩虹鐮佹*/
async upOrderNum(row){
if(!this.tipsMessage(this.selectionList)){
return;
@@ -2513,11 +2521,11 @@
});
})
},
- // 鍩虹鐮佹鍒锋柊鏃舵煡璇�
+ /** 鍩虹鐮佹鍒锋柊鏃舵煡璇�*/
refreshChangeBasicSec(){
this.loadBasic(this.selectionList.at(-1));
},
- // 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌
+ /** 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌*/
hideBasicTable(hideBoolean){
this.$refs.crudBasic.option.refreshBtn = hideBoolean;
this.$refs.crudBasic.option.column[0].search = hideBoolean;
@@ -2538,7 +2546,7 @@
},
/** 绗竴灞傚璇濇鐩稿叧鏂规硶 */
- // 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�
+ /** 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�*/
openAttrSelectOrGetValue(condition){
if(condition === 'attr'){
this.isShowSelectAttrOption = true;
@@ -2564,7 +2572,7 @@
}
},
- // 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�
+ /** 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�*/
clearAttrDataByIcon(condition){
if(condition === 'attr'){
this.form.referAttributeName = '';
@@ -2583,13 +2591,13 @@
this.form.referConfig = '';
}
},
- // 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�
+ /** 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�*/
inputSelectBlur(e){
if (e.target.value) {
this.form.codeFillSeparator = e.target.value;
}
},
- // 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��
+ /** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row){
//console.log(row);
if(this.enumParam.secTypeList.length==0){
@@ -2705,7 +2713,7 @@
}
// console.log(this.form);
},
- // 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�
+ /** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/
getLocalStorageEnum(enumKey){
let enumCach = JSON.parse(localStorage.getItem(enumKey));
if(enumCach == null) {
@@ -2716,7 +2724,7 @@
}
return enumCach;
},
- // 缁熶竴鍔犺浇鎵�鏈夋灇涓炬煡璇紝涓昏鏄负閬垮厤鍒囨崲鐮佹绫诲瀷鏃惰繕鏈姞杞藉畬鎴愮殑鎯呭喌
+ /** 缁熶竴鍔犺浇鎵�鏈夋灇涓炬煡璇紝涓昏鏄负閬垮厤鍒囨崲鐮佹绫诲瀷鏃惰繕鏈姞杞藉畬鎴愮殑鎯呭喌*/
loadTotalEnum(){
this.loadCodeSecType();
this.loadCodeSecLength();
@@ -2726,7 +2734,7 @@
this.loadCodeCutType();
this.loadCodeGetValueType();
},
- //鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇�
+ /** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
loadCodeSecType(){
this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
this.loadCodeSecLength();
diff --git a/Source/UBCS/service-start.sh b/Source/UBCS/service-start.sh
index 27a55c6..14e2797 100644
--- a/Source/UBCS/service-start.sh
+++ b/Source/UBCS/service-start.sh
@@ -26,8 +26,8 @@
docker run -d -p 36004:36004 --name ubcs-flow vci-ubcs/ubcs-flow:latest
#鍚姩develop鏈嶅姟
- docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
- docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest
+# docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
+# docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest
#鍚姩jobAdmin鏈嶅姟
# docker build -f ./ubcs-ops/ubcs-xxljob-admin/Dockerfile -t vci-ubcs/ubcs-jobadmin .
diff --git a/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml b/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
index 2975e1f..695d740 100644
--- a/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
@@ -20,13 +20,13 @@
- consul
- serverAddr
# 鑷畾涔塙I鐣岄潰
- ui:
- title: BladeX Monitor
- external-views:
- - label: 鏋舵瀯瀹樼綉
- url: https://bladex.vip/
- order: 1
- iframe: true
+# ui:
+# title: BladeX Monitor
+# external-views:
+# - label: 鏋舵瀯瀹樼綉
+# url: https://bladex.vip/
+# order: 1
+# iframe: true
# 鐢ㄤ簬鍐呯綉瀹夊叏锛屽垽鏂� admin proxy
instance-proxy:
ignored-headers: "X-Forwarded-For"
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
index d55e13a..7dec639 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
@@ -49,9 +49,9 @@
*/
@GetMapping("/gridCodeFixedValue")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "CodeFixedValueVO")
+ @ApiOperation(value = "鍥哄畾鐮佹鐨勭爜鍊煎垪琛�", notes = "CodeFixedValueVO")
public R<IPage<CodeFixedValueVO>> gridCodeFixedValue(CodeFixedValueVO codeFixedValueVO, Query query){
- return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("ordernum"))));
+ return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("orderNum"))));
}
/**
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 c69312c..b600ae7 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
@@ -759,7 +759,6 @@
return codeBasicSecDO;
}
-
/**
* 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭
*
@@ -863,7 +862,10 @@
CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(Wrappers.<CodeBasicSec>query().lambda()
.eq(CodeBasicSec::getOid, codeBasicSecDO.getParentClassifySecOid())
.eq(CodeBasicSec::getSecType, codeBasicSecDO.getSecType()));
- codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName());
+ if(Func.isNotEmpty(codeBasicSec)){
+ codeBasicSecVO.setParentClassifySecOid(codeBasicSec.getOid());
+ codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName());
+ }
}
//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
if (true) {
@@ -872,4 +874,5 @@
}
return codeBasicSecVO;
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
index 46ce3a2..62f4143 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
@@ -66,7 +66,6 @@
*/
@Override
public List<Tree> treeCodeClassifyValue(TreeQueryObject treeQueryObject) throws VciBaseException {
- // List<CodeClassifyValueDO> doList =selectCodeClassifyValueDOByTree(treeQueryObject);
List<CodeClassifyValue> doList = selectCodeClassifyValueDO4Tree(treeQueryObject);
List<CodeClassifyValueVO> voList = CodeClassifyValueWrapper.build().listVO(doList);
TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index b0bb55c..57abd45 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -38,6 +38,7 @@
import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
@@ -443,8 +444,7 @@
}
// 鍙戝竷鏃跺皢鐮佹绫诲瀷鎸夌収瀛楃涓插垎闅旂殑褰㈠紡鎷兼帴骞跺瓨鍌�
String secTypeStr = codeBasicSecService.listCodeBasicSecByRuleOid(codeRuleDO.getOid()).stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
- codeRuleDO.setBasicSecTypes(secTypeStr);
- count = codeRuleMapper.update(null,wrapper.set(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue()));
+ count = codeRuleMapper.update(null,wrapper.set(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue()).set(CodeRule::getBasicSecTypes,secTypeStr));
} else {
return R.fail("鏆備笉鏀寔鐨勬搷浣滅被鍨�");
}
@@ -507,76 +507,105 @@
@Override
public R checkLikeCodeRule(String oid) throws VciBaseException {
// 1銆佹煡璇㈠嚭褰撳墠瑕佸彂甯冪殑瑙勫垯
- CodeRuleVO codeRuleVO = getObjectHasSecByOid(oid);
- // 褰撳墠鍙戝竷鐨勮鍒欎笉瀛樺湪鐮佹淇℃伅
- if(Func.isEmpty(codeRuleVO.getSecVOList())){
- return R.data(null);
+ CodeRuleVO releaseCodeRule = getObjectHasSecByOid(oid);
+ // 褰撳墠鍙戝竷鐨勮鍒欎笉瀛樺湪鐮佹淇℃伅锛岀洿鎺ョ┖淇℃伅杩斿洖
+ if(Func.isEmpty(releaseCodeRule.getSecVOList())){
+ return R.success("");
}
// 2銆佹壘鍑轰笌褰撳墠鍙戝竷鐨勮鍒欑爜娈甸『搴忎竴鑷寸殑瑙勫垯
- String secTypes = codeRuleVO.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
- //鍏堟煡璇㈠嚭鎵�鏈夊凡鍙戝竷鐨勭紪鐮佽鍒�
- List<CodeRule> codeRuleList = codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda().eq(CodeRule::getLcStatus, FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED));
+ String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
+ // 鏌ヨ鍑烘墍鏈夊凡鍙戝竷鐨勭紪鐮佽鍒欎腑鐮佹绫诲瀷椤哄簭涓庡綋鍓嶈鍙戝竷鐨勮鍒欓『搴忎竴鑷寸殑缂栫爜瑙勫垯锛屾鏃跺凡杩戣繃婊ゆ帀澶ч儴鍒嗚鍒欙紝杩愮畻閲忓噺灏�
+ List<CodeRule> codeRuleList = codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda()
+ .eq(CodeRule::getLcStatus, FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED)
+ .eq(CodeRule::getBasicSecTypes,secTypes)
+ );
+ // 涓虹┖锛岃瘉鏄庝笉瀛樺湪绫诲悓鐨勭紪鐮佽鍒欑洿鎺ヨ繑鍥�
+ if(Func.isEmpty(codeRuleList)){
+ return R.success("");
+ }
+ // 鏌ヨ鍑哄熀纭�鐮佹鍒楄〃锛堟寜鐓rderNum鍗囧簭鎺掑簭锛�
List<CodeRuleVO> codeRuleVOS = codeRuleDO2VOs(codeRuleList, true);
- // 婊¤冻鐮佹绫诲瀷椤哄簭涓�鑷寸殑瑕佹眰鐨勭紪鐮佽鍒欙紝鍙互杩涘叆涓嬩竴姝ユ瘮杈冭鍒�
- List<CodeRuleVO> codeRuleVOStream = codeRuleVOS.parallelStream().filter(item -> {
- // 瀵笲asicSec浣跨敤orderNum鎺掑簭(鏌ヨ鐨勬椂鍊欏叾瀹炲凡缁忔帓杩囦竴娆″簭浜�)锛屽苟灏唖ecType鐢ㄩ�楀彿鍒嗛殧鎷兼帴鎴愪竴涓瓧绗︿覆
- String itemSecTypes = item.getSecVOList().parallelStream().sorted(Comparator.comparing(CodeBasicSecVO::getOrderNum)).map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
- if (secTypes.equals(itemSecTypes)) {
- return true;
- }
- return false;
- }).collect(Collectors.toList());
// 3銆佸悇绫荤爜娈靛垎鍒繘琛屾瘮瀵�
- codeRuleVOStream.parallelStream().filter(item->{
- item.getSecVOList().stream().filter(basicSec->{
- switch (basicSec.getSecType()){
+ List<CodeRuleVO> lastCodeRule = new ArrayList<>();
+ codeRuleVOS.stream().forEach(item->{
+ List<CodeBasicSecVO> secVOList = item.getSecVOList();
+ boolean flag = true;
+ for (int index = 0; index < secVOList.size(); index++) {
+ // 褰撳墠瑕佸彂甯冪殑瑙勫垯鍖呭惈鐨勭爜娈典俊鎭�
+ CodeBasicSecVO releaseBasicSec = releaseCodeRule.getSecVOList().get(index);
+ // 宸插彂甯冪殑瑙勫垯鍖呭惈鐨勭爜娈典俊鎭�
+ CodeBasicSecVO releasedBasicSec = secVOList.get(index);
+ // 鍥犱负鐮佹椤哄簭閮芥槸鎸夌収OrderNum鎺掑簭鐨勶紝鎵�浠ョ洿鎺ユ寜鐓т笅鏍囦袱涓ゆ瘮杈冨氨鍙互浜�
+ switch (releasedBasicSec.getSecType()){
// 灞炴�х爜娈碉紝姣斿灞炴�у拰灞炴�ф墍鍦ㄥ垎绫�(referCodeClassifyOid)
case "codeattrsec":
- List<CodeBasicSecVO> codeattrsec = this.getBasicSecBySecType("codeattrsec", codeRuleVO);
-
+ if(!releasedBasicSec.getReferCodeClassifyOid().equals(releaseBasicSec.getReferCodeClassifyOid())){
+ flag = false;
+ }
break;
// 鍙彉鐮佹锛屾瘮瀵圭爜娈甸暱搴︼紝缂栫爜琛ヤ綅鏂瑰紡鍜岃ˉ浣嶆椂鐨勫瓧绗�
case "codevariablesec":
+ if(!(releasedBasicSec.getCodeSecLength().equals(releaseBasicSec.getCodeSecLength())
+ && releasedBasicSec.getCodeFillType().equals(releaseBasicSec.getCodeFillType())
+ && releasedBasicSec.getCodeFillSeparator().equals(releaseBasicSec.getCodeFillSeparator()))){
+ flag = false;
+ }
break;
// 鍥哄畾鐮佹姣斿鎸夊崌搴忔帓搴忕殑鐮佸�硷紝
case "codefixedsec":
+ if(Func.isNotEmpty(releasedBasicSec.getFixedValueVOList()) && Func.isNotEmpty(releaseBasicSec.getFixedValueVOList())){
+ // 灏唂ixedValue鎸夌収閫楀彿鍒嗛殧鎷兼帴璧锋潵锛屼互渚挎瘮杈冿紝鐢变簬鏌ヨ鏃跺凡鎸夌収orderNum鎺掕繃搴忎簡锛屾墍浠ヤ笉闇�瑕佸啀娆℃帓搴�
+ String reledFixedValues = releasedBasicSec.getFixedValueVOList().stream().map(CodeFixedValueVO::getId).collect(Collectors.joining(","));
+ String releFixedValues = releaseBasicSec.getFixedValueVOList().stream().map(CodeFixedValueVO::getId).collect(Collectors.joining(","));
+ if(reledFixedValues.equals(releFixedValues)){
+ flag = false;
+ }
+ }
break;
// 鍒嗙被鐮佹姣斿鎸夊崌搴忔帓搴忕爜鍊�
case "codeclassifysec":
+ if(!releasedBasicSec.getReferCodeClassifyOid().equals(releaseBasicSec.getReferCodeClassifyOid())){
+ flag = false;
+ }
break;
// 鏃ユ湡鐮佹姣斿鏃ユ湡鏍煎紡
case "codedatesec":
+ if(!releasedBasicSec.getCodeDateFormatStr().equals(releaseBasicSec.getCodeDateFormatStr())){
+ flag = false;
+ }
break;
- // 寮曠敤鐮佹锛屾瘮瀵瑰弬鐓у簲鐢ㄧ殑涓氬姟绫诲瀷
+ // 寮曠敤鐮佹锛屾瘮瀵瑰弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷
case "coderefersec":
+ if(!releasedBasicSec.getReferBtmId().equals(releaseBasicSec.getReferBtmId())){
+ flag = false;
+ }
break;
// 灞傜骇鐮佹锛屾瘮瀵瑰眰绾х被鍨嬨�佸眰绾х殑鍊笺�佸瓧绗︽埅鍙栫被鍨嬨�佸彇鍊肩被鍨�
case "codelevelsec":
+ if(!(releasedBasicSec.getCodeLevelType().equals(releaseBasicSec.getCodeLevelType())
+ && releasedBasicSec.getCodeLevelValue().equals(releaseBasicSec.getCodeLevelValue())
+ && releasedBasicSec.getValueCutType().equals(releaseBasicSec.getValueCutType())
+ && releasedBasicSec.getCodeGetValueType().equals(releaseBasicSec.getCodeGetValueType()))){
+ flag = false;
+ }
break;
- case "codeserialsec":
// 娴佹按鐮佹姣斿鐮佹鐨勯暱搴�
-
+ case "codeserialsec":
+ if(!releasedBasicSec.getCodeFillLength().equals(releaseBasicSec.getCodeFillLength())){
+ flag = false;
+ }
break;
- default:
- return false;
}
- return false;
- });
- return false;
+ }
+ // 婊¤冻鎵�鏈夌爜娈电被鍨嬫瘮瀵规潯浠剁殑瑙勫垯
+ if (flag) {
+ lastCodeRule.add(item);
+ }
});
- // 鏈�鍚庡皢缁撴灉杩涜杩斿洖
+ // 鏈�鍚庡皢缁撴灉杩涜澶勭悊骞惰繑鍥�
+
return null;
- }
-
- private List<CodeBasicSecVO> getBasicSecBySecType(String secType,CodeRuleVO codeRuleVO){
- List<CodeBasicSecVO> codeBasicSecVOList = codeRuleVO.getSecVOList().parallelStream().filter(item -> {
- if (item.getSecType().equals(secType)) {
- return true;
- }
- return false;
- }).collect(Collectors.toList());
- return codeBasicSecVOList;
}
/**
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 053c478..2b5de9c 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
@@ -45,8 +45,13 @@
cronTime: "0 0/1 * * * ?"
dataParamName: dataString
dataTranTemp: D:\desktop
+#缁熶竴鎺ュ彛鐩稿叧閰嶇疆
code:
- checkConfig: false
+ universalinterface:
+ checkSystemConfig: false
+ attrconfig:
+ #绯荤粺闆嗘垚
+ system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
#mybatis-plus-join:
# table-alias: t
--
Gitblit v1.9.3