From fc6ab71d6b6269ef31202662458a5287ef1f7ba9 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 09 十一月 2023 19:11:00 +0800 Subject: [PATCH] 最大流水号提交 --- Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java | 4 Source/UBCS-WEB/src/views/code/code.vue | 257 +++++++++++++++++++++--------------------- Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java | 8 Source/UBCS/ubcs-ops/ubcs-log/pom.xml | 24 ++- Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 13 - 5 files changed, 157 insertions(+), 149 deletions(-) diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue index e12a0bb..a1f04e3 100644 --- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue +++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue @@ -54,7 +54,7 @@ deep: true }, }, - mounted() { + mounted() { }, data() { return { @@ -172,12 +172,12 @@ return acc; }, {}); - const arrCode = Object.entries(filteredObj).map(([key, value]) => { + /*const arrCode = Object.entries(filteredObj).map(([key, value]) => { return { secOid: key, secValue: value } - }) + })*/ this.ruleFormFlag = Object.values(codeApplyForm).every(value => { return value !== null && value !== undefined && value !== ''; @@ -186,17 +186,14 @@ this.loading=true; let params = {}; params['codeRuleOid'] = this.ruleOid; - - Object.keys(arrCode).forEach((key) => { - params[key] = arrCode[key]; + Object.keys(filteredObj).forEach((key) => { + params[key] = filteredObj[key]; }); - getMaxSerialNumber(params).then(res => { this.formModel.maxSecNum = res.data.data; this.loading=false; this.maxNum=res.data.data }); - } }, diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue index c9e7ac1..5210e2d 100644 --- a/Source/UBCS-WEB/src/views/code/code.vue +++ b/Source/UBCS-WEB/src/views/code/code.vue @@ -3465,154 +3465,155 @@ </script> <style> -[class^="icon-"] { - font-size: 12px !important; -} + [class^="icon-"] { + font-size: 12px !important; + } -.code-rule-crud > .avue-crud__search, -.code-basic-crud > .avue-crud__search { - margin-bottom: -15px; -} + .code-rule-crud > .avue-crud__search, + .code-basic-crud > .avue-crud__search { + margin-bottom: -15px; + } -.clone-input-textarea > .el-form-item__content { - width: 495px; -} + .clone-input-textarea > .el-form-item__content { + width: 495px; + } -.clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; -} + .clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; + } -.fixed-avue-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; -} + .fixed-avue-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; + } -.other-clone-codebasic-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; -} + .other-clone-codebasic-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; + } -.other-clone-coderule-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; -} + .other-clone-coderule-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; + } -.el-table--small .el-table__cell { - padding: 3px 0; -} + .el-table--small .el-table__cell { + padding: 3px 0; + } -.classify_value_box > .el-scrollbar { - height: 95%; -} + .classify_value_box > .el-scrollbar { + height: 95%; + } -.basic-container > .el-card > .el-card__body { - margin: -10px 0; -} + .basic-container > .el-card > .el-card__body { + margin: -10px 0; + } -.code-basicsec-container { - padding: 1px 6px; -} + .code-basicsec-container { + padding: 1px 6px; + } -.horizontal-line { - /* margin-top: 19px !important; */ - margin-bottom: -20px !important; - width: 100%; - height: 2px; -} + .horizontal-line { + /* margin-top: 19px !important; */ + margin-bottom: -20px !important; + width: 100%; + height: 2px; + } -.el-card__body > .treeBox { - height: 56vh; -} + .el-card__body > .treeBox { + height: 56vh; + } -.el-col-5 > .box { - height: 56vh; -} + .el-col-5 > .box { + height: 56vh; + } -.operator_, -filter, -.layui-btn { - width: 60px; -} + .operator_, + filter, + .layui-btn { + width: 60px; + } -.left > .el-form-item > .el-form-item__content > .el-input-number { - width: 120px; -} + .left > .el-form-item > .el-form-item__content > .el-input-number { + width: 120px; + } -.left - > .el-form-item - > .el-form-item__content - > .el-input-number - > .el-input - > .el-input__inner { - width: 120px; -} + .left + > .el-form-item + > .el-form-item__content + > .el-input-number + > .el-input + > .el-input__inner { + width: 120px; + } -.el-col > .el-card > .el-card__header { - background: rgb(213 231 239); - border-radius: inherit; -} + .el-col > .el-card > .el-card__header { + background: rgb(213 231 239); + border-radius: inherit; + } -/** 鏂板鐮佹 */ -.add-basicsec-dialog > .el-dialog > .el-dialog__body { - padding: 20px 20px 4px; - margin-bottom: 30px; -} + /** 鏂板鐮佹 */ + .add-basicsec-dialog > .el-dialog > .el-dialog__body { + padding: 20px 20px 4px; + margin-bottom: 30px; + } -.add-basicsec-total { - width: 100%; - height: 500px; -} + .add-basicsec-total { + width: 100%; + height: 500px; + } -.add-basicsec-total .el-input__inner, -.add-basicsec-total .el-textarea__inner { - width: 220px; -} + .add-basicsec-total .el-input__inner, + .add-basicsec-total .el-textarea__inner { + width: 220px; + } -.add-basicsec-total > .add-basicsec-form { - display: flex; - flex-direction: row; - width: 100%; - height: 100%; - align-items: center; - justify-content: space-around; -} - -.add-basicsec-form > .el-divider--vertical { - width: 2px; - height: 78%; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -.left { - /* float: left; */ - width: 45%; - height: 100%; -} - -.right { - /* float: right; */ - margin-right: 2vw; - height: 100%; - width: auto; -} - -.add-basicsec-form > .left > .el-form-item, -.add-basicsec-form > .right > div > .el-form-item{ - margin-bottom: 12px; -} - -/* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */ -.el-dialog__footer { - /* width: 100%; */ - border-top: 1px solid #e9e7e7; - padding: 5px 10px 10px; -} - -.seloption { - margin-left: 10px; -} - -/* .code-total > .basic-container__card { + .add-basicsec-total > .add-basicsec-form { + display: flex; + flex-direction: row; + width: 100%; height: 100%; - } */ + align-items: center; + justify-content: space-around; + } + + .add-basicsec-form > .el-divider--vertical { + width: 2px; + height: 78%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + } + + .left { + /* float: left; */ + width: 45%; + height: 100%; + } + + .right { + /* float: right; */ + margin-right: 2vw; + height: 100%; + width: auto; + } + + .add-basicsec-form > .left > .el-form-item, + .add-basicsec-form > .right > div > .el-form-item{ + margin-bottom: 12px; + } + + /* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */ + .el-dialog__footer { + /* width: 100%; */ + border-top: 1px solid #e9e7e7; + padding: 5px 10px 10px; + } + + .seloption { + margin-left: 10px; + } + + /* .code-total > .basic-container__card { + height: 100%; + } */ + </style> diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java index dc07d45..0b9022e 100644 --- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java +++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java @@ -16,7 +16,7 @@ public class SystemLog { /** - * 鏈嶅姟鍚嶇О + * 鏃ュ織鎵�灞炴湇鍔″悕绉� */ private String serviceName; @@ -26,7 +26,7 @@ private String serviceId; /** - * 鏃ュ織璺緞 + * 鏃ュ織鏂囦欢鎵�鍦ㄧ殑璺緞 */ private String logPath; @@ -43,11 +43,11 @@ /** * 鏃ュ織鍒涘缓鏃堕棿 */ - private Date createTime; + private String createTime; /** * 鏃ュ織鐨勬渶鍚庝慨鏀规椂闂� */ - private Date lastmodifier; + private String lastmodifier; } diff --git a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml index fe4d4a3..918a217 100644 --- a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml +++ b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml @@ -29,15 +29,15 @@ <groupId>org.springblade</groupId> <artifactId>blade-starter-tenant</artifactId> </dependency> - <dependency> - <groupId>com.oracle.database.jdbc</groupId> - <artifactId>ojdbc8</artifactId> - </dependency> - <dependency> - <groupId>cn.easyproject</groupId> - <artifactId>orai18n</artifactId> - <version>${orai18n.version}</version> - </dependency> +<!-- <dependency>--> +<!-- <groupId>com.oracle.database.jdbc</groupId>--> +<!-- <artifactId>ojdbc8</artifactId>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>cn.easyproject</groupId>--> +<!-- <artifactId>orai18n</artifactId>--> +<!-- <version>${orai18n.version}</version>--> +<!-- </dependency>--> <dependency> <groupId>com.vci.ubcs</groupId> <artifactId>ubcs-log-api</artifactId> @@ -50,6 +50,12 @@ <version>3.0.1.RELEASE</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>com.vci.ubcs</groupId> + <artifactId>ubcs-omd-api</artifactId> + <version>3.0.1.RELEASE</version> + <scope>compile</scope> + </dependency> </dependencies> <build> 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 c3b6d33..6552189 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 @@ -140,6 +140,10 @@ * 妯℃澘鐨勬寜閽敤閫� */ CODE_TEMPLATE_BUTTON_USE("codeTemplateButtonUse"), + /** + * 鍚勪釜鏈嶅姟鐨勫姛鑳介鍩熶腑鏂囩畝浠� + */ + SERCIVE_NAME_ROLE("serviceNameRole"), ; -- Gitblit v1.9.3