From 89db259e759c2fce975dde5831234a51c1f46268 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Mon, 24 Jun 2024 14:58:39 +0800 Subject: [PATCH] update --- app.platform/build.gradle | 10 +- .../api/enums/EconomicCapitalCalMethod.java | 7 + .../erm/economiccapital/api/ResultRwaVo.java | 215 +++++++++++ .../erm/economiccapital/api/SchemaVo.java | 61 ++++ .../resources/erm/api/i18n/enums.properties | 7 +- .../erm/api/i18n/enums_tw_CN.properties | 7 +- .../erm/api/i18n/enums_zh_CN.properties | 7 +- erm.frontend/.npmrc | 2 +- erm.frontend/package.json | 226 ++++++------ erm.frontend/src/components/index.ts | 4 + erm.frontend/src/i18n/messages.json | 3 + erm.frontend/src/i18n/messages_tw_CN.json | 3 + erm.frontend/src/i18n/messages_zh_CN.json | 5 + erm.frontend/src/menus/menus.json | 7 + erm.frontend/src/routes/routes.json | 31 ++ .../src/views/economicCapital/Result.vue | 4 + .../src/views/economicCapital/Schema.vue | 75 ++++ .../jpa/entity/ResultRwaEntity.java | 340 ++++++++++++++++++ .../jpa/entity/SchemaEntity.java | 112 ++++++ .../META-INF/platform/plugins/liquibase.json | 4 +- ...21020__ERM Economic Capital Schema DDL.xml | 85 +++++ gradle.properties | 4 +- io.sc.engine.mv.frontend/.npmrc | 2 +- io.sc.engine.mv.frontend/package.json | 2 +- .../CfgDataExtractorWebController.java | 6 +- io.sc.engine.rule.frontend/.npmrc | 2 +- io.sc.engine.rule.frontend/package.json | 2 +- io.sc.engine.st.frontend/.npmrc | 2 +- io.sc.engine.st.frontend/package.json | 2 +- io.sc.platform.core.frontend/.npmrc | 2 +- io.sc.platform.core.frontend/package.json | 2 +- .../template-project/.npmrc | 2 +- .../template-project/package.json | 4 +- .../src/views/testcase/math/MathEditor.vue | 3 +- .../io/sc/platform/core/i18n/words.properties | 1 + .../platform/core/i18n/words_tw_CN.properties | 1 + .../platform/core/i18n/words_zh_CN.properties | 1 + .../asciidoc/9999-appendix/appendix.adoc | 3 +- .../docker-install/docker-install.adoc | 4 + .../docker-install/ubuntu/ubuntu.adoc | 47 +++ .../asciidoc/9999-appendix/linux/linux.adoc | 16 +- .../9999-appendix/linux/tools/tools.adoc | 27 ++ .../9999-appendix/linux/ubuntu/ubuntu.adoc | 21 ++ io.sc.platform.developer.frontend/.npmrc | 2 +- .../package.json | 2 +- .../src/views/backend/ExportLiquibase.vue | 8 +- .../templates/pgp/app/build.gradle | 12 +- .../templates/pgp/setup/gradle.properties | 4 +- .../build.gradle | 2 +- .../exporter/LiquibaseDataCsvExporter.java | 35 +- io.sc.platform.lcdp.frontend/.npmrc | 2 +- io.sc.platform.lcdp.frontend/package.json | 2 +- .../service/impl/ConfigureServiceImpl.java | 12 +- io.sc.platform.mvc.frontend/.npmrc | 2 +- io.sc.platform.mvc.frontend/package.json | 2 +- io.sc.platform.poi/build.gradle | 2 +- io.sc.platform.security.frontend/package.json | 2 +- io.sc.platform.system.frontend/.npmrc | 2 +- io.sc.platform.system.frontend/package.json | 2 +- .../src/views/menu/Menu.vue | 2 +- io.sc.standard.frontend/.npmrc | 2 +- io.sc.standard.frontend/package.json | 2 +- 62 files changed, 1265 insertions(+), 205 deletions(-) create mode 100644 erm.api/src/main/java/erm/api/enums/EconomicCapitalCalMethod.java create mode 100644 erm.api/src/main/java/erm/economiccapital/api/ResultRwaVo.java create mode 100644 erm.api/src/main/java/erm/economiccapital/api/SchemaVo.java create mode 100644 erm.frontend/src/views/economicCapital/Result.vue create mode 100644 erm.frontend/src/views/economicCapital/Schema.vue create mode 100644 erm/src/main/java/erm/economiccapital/jpa/entity/ResultRwaEntity.java create mode 100644 erm/src/main/java/erm/economiccapital/jpa/entity/SchemaEntity.java create mode 100644 erm/src/main/resources/liquibase/economiccapital/erm.capitalpan_1.0.0_20221020__ERM Economic Capital Schema DDL.xml create mode 100644 io.sc.platform.developer.doc/asciidoc/9999-appendix/docker-install/docker-install.adoc create mode 100644 io.sc.platform.developer.doc/asciidoc/9999-appendix/docker-install/ubuntu/ubuntu.adoc create mode 100644 io.sc.platform.developer.doc/asciidoc/9999-appendix/linux/tools/tools.adoc create mode 100644 io.sc.platform.developer.doc/asciidoc/9999-appendix/linux/ubuntu/ubuntu.adoc diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 2ebf2916..7314c171 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -30,11 +30,11 @@ dependencies { // project(":io.sc.engine.rule.server"), // project(":io.sc.engine.rule.sample"), // -// project(":io.sc.engine.st"), -// project(":io.sc.engine.st.frontend"), -// -// project(":erm"), -// project(":erm.frontend"), + project(":io.sc.engine.st"), + project(":io.sc.engine.st.frontend"), + + project(":erm"), + project(":erm.frontend"), project(":io.sc.standard"), ) diff --git a/erm.api/src/main/java/erm/api/enums/EconomicCapitalCalMethod.java b/erm.api/src/main/java/erm/api/enums/EconomicCapitalCalMethod.java new file mode 100644 index 00000000..8588a48b --- /dev/null +++ b/erm.api/src/main/java/erm/api/enums/EconomicCapitalCalMethod.java @@ -0,0 +1,7 @@ +package erm.api.enums; + +public enum EconomicCapitalCalMethod { + WEIGHT_ADJUST, // 系数调整法 + IRS, // 内评法 + ADVANCED; // 高级法 +} diff --git a/erm.api/src/main/java/erm/economiccapital/api/ResultRwaVo.java b/erm.api/src/main/java/erm/economiccapital/api/ResultRwaVo.java new file mode 100644 index 00000000..91c1e899 --- /dev/null +++ b/erm.api/src/main/java/erm/economiccapital/api/ResultRwaVo.java @@ -0,0 +1,215 @@ +package erm.economiccapital.api; + +import erm.api.enums.EconomicCapitalCalMethod; +import io.sc.platform.orm.api.vo.BaseVo; +import io.sc.platform.orm.api.vo.CorporationAuditorVo; + +public class ResultRwaVo extends BaseVo { + private String id; + private String debtId; + private String custId; + private String custName; + private String orgName; + private String busCategory; + private String prodName; + private String stripline; + private Double assetEquity; + private Double ccf; + private String eadBigType; + private String eadSmallType; + private Double ead; + private Double uncoverageEad; + private Double rwa; + private Double rwaMitigation; + private Double weightIrs; + private Double weightArea; + private Double weightIndustry; + private Double weightProd; + private Double weightTerm; + private Double ecRwa; + private Double ecRwaAdjusted; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getDebtId() { + return debtId; + } + + public void setDebtId(String debtId) { + this.debtId = debtId; + } + + public String getCustId() { + return custId; + } + + public void setCustId(String custId) { + this.custId = custId; + } + + public String getCustName() { + return custName; + } + + public void setCustName(String custName) { + this.custName = custName; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getBusCategory() { + return busCategory; + } + + public void setBusCategory(String busCategory) { + this.busCategory = busCategory; + } + + public String getProdName() { + return prodName; + } + + public void setProdName(String prodName) { + this.prodName = prodName; + } + + public String getStripline() { + return stripline; + } + + public void setStripline(String stripline) { + this.stripline = stripline; + } + + public Double getAssetEquity() { + return assetEquity; + } + + public void setAssetEquity(Double assetEquity) { + this.assetEquity = assetEquity; + } + + public Double getCcf() { + return ccf; + } + + public void setCcf(Double ccf) { + this.ccf = ccf; + } + + public String getEadBigType() { + return eadBigType; + } + + public void setEadBigType(String eadBigType) { + this.eadBigType = eadBigType; + } + + public String getEadSmallType() { + return eadSmallType; + } + + public void setEadSmallType(String eadSmallType) { + this.eadSmallType = eadSmallType; + } + + public Double getEad() { + return ead; + } + + public void setEad(Double ead) { + this.ead = ead; + } + + public Double getUncoverageEad() { + return uncoverageEad; + } + + public void setUncoverageEad(Double uncoverageEad) { + this.uncoverageEad = uncoverageEad; + } + + public Double getRwa() { + return rwa; + } + + public void setRwa(Double rwa) { + this.rwa = rwa; + } + + public Double getRwaMitigation() { + return rwaMitigation; + } + + public void setRwaMitigation(Double rwaMitigation) { + this.rwaMitigation = rwaMitigation; + } + + public Double getWeightIrs() { + return weightIrs; + } + + public void setWeightIrs(Double weightIrs) { + this.weightIrs = weightIrs; + } + + public Double getWeightArea() { + return weightArea; + } + + public void setWeightArea(Double weightArea) { + this.weightArea = weightArea; + } + + public Double getWeightIndustry() { + return weightIndustry; + } + + public void setWeightIndustry(Double weightIndustry) { + this.weightIndustry = weightIndustry; + } + + public Double getWeightProd() { + return weightProd; + } + + public void setWeightProd(Double weightProd) { + this.weightProd = weightProd; + } + + public Double getWeightTerm() { + return weightTerm; + } + + public void setWeightTerm(Double weightTerm) { + this.weightTerm = weightTerm; + } + + public Double getEcRwa() { + return ecRwa; + } + + public void setEcRwa(Double ecRwa) { + this.ecRwa = ecRwa; + } + + public Double getEcRwaAdjusted() { + return ecRwaAdjusted; + } + + public void setEcRwaAdjusted(Double ecRwaAdjusted) { + this.ecRwaAdjusted = ecRwaAdjusted; + } +} diff --git a/erm.api/src/main/java/erm/economiccapital/api/SchemaVo.java b/erm.api/src/main/java/erm/economiccapital/api/SchemaVo.java new file mode 100644 index 00000000..546fe480 --- /dev/null +++ b/erm.api/src/main/java/erm/economiccapital/api/SchemaVo.java @@ -0,0 +1,61 @@ +package erm.economiccapital.api; + +import erm.api.enums.EconomicCapitalCalMethod; +import io.sc.platform.orm.api.vo.CorporationAuditorVo; + +public class SchemaVo extends CorporationAuditorVo { + private String id; + private String code; + private String name; + private String description; + private Boolean enable; + private EconomicCapitalCalMethod calMethod; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean getEnable() { + return enable; + } + + public void setEnable(Boolean enable) { + this.enable = enable; + } + + public EconomicCapitalCalMethod getCalMethod() { + return calMethod; + } + + public void setCalMethod(EconomicCapitalCalMethod calMethod) { + this.calMethod = calMethod; + } +} diff --git a/erm.api/src/main/resources/erm/api/i18n/enums.properties b/erm.api/src/main/resources/erm/api/i18n/enums.properties index 4b2dc283..b58eee21 100644 --- a/erm.api/src/main/resources/erm/api/i18n/enums.properties +++ b/erm.api/src/main/resources/erm/api/i18n/enums.properties @@ -7,4 +7,9 @@ erm.api.enums.RiskPolicy.EXPANSION=Expansion # \u5229\u76CA\u76F8\u5173\u65B9 erm.api.enums.StakeHolder.SHAREHOLDER=Shareholder -erm.api.enums.StakeHolder.SUPERVISION=Supervision \ No newline at end of file +erm.api.enums.StakeHolder.SUPERVISION=Supervision + +# \u7ECF\u6D4E\u8D44\u672C\u8BA1\u7B97\u65B9\u6CD5 +erm.api.enums.EconomicCapitalCalMethod.WEIGHT_ADJUST=Weight Adjust +erm.api.enums.EconomicCapitalCalMethod.IRS=IRS +erm.api.enums.EconomicCapitalCalMethod.ADVANCED=Advanced \ No newline at end of file diff --git a/erm.api/src/main/resources/erm/api/i18n/enums_tw_CN.properties b/erm.api/src/main/resources/erm/api/i18n/enums_tw_CN.properties index f029c0f9..10ee1433 100644 --- a/erm.api/src/main/resources/erm/api/i18n/enums_tw_CN.properties +++ b/erm.api/src/main/resources/erm/api/i18n/enums_tw_CN.properties @@ -7,4 +7,9 @@ erm.api.enums.RiskPolicy.EXPANSION=\u64F4\u5F35 # \u5229\u76CA\u76F8\u5173\u65B9 erm.api.enums.StakeHolder.SHAREHOLDER=\u80A1\u6771 -erm.api.enums.StakeHolder.SUPERVISION=\u76E3\u7BA1 \ No newline at end of file +erm.api.enums.StakeHolder.SUPERVISION=\u76E3\u7BA1 + +# \u7ECF\u6D4E\u8D44\u672C\u8BA1\u7B97\u65B9\u6CD5 +erm.api.enums.EconomicCapitalCalMethod.WEIGHT_ADJUST=\u4FC2\u6578\u8ABF\u6574\u6CD5 +erm.api.enums.EconomicCapitalCalMethod.IRS=\u5167\u8A55\u6CD5 +erm.api.enums.EconomicCapitalCalMethod.ADVANCED=\u9AD8\u7D1A\u6CD5 \ No newline at end of file diff --git a/erm.api/src/main/resources/erm/api/i18n/enums_zh_CN.properties b/erm.api/src/main/resources/erm/api/i18n/enums_zh_CN.properties index 18f5d3f2..f36722a7 100644 --- a/erm.api/src/main/resources/erm/api/i18n/enums_zh_CN.properties +++ b/erm.api/src/main/resources/erm/api/i18n/enums_zh_CN.properties @@ -7,4 +7,9 @@ erm.api.enums.RiskPolicy.EXPANSION=\u6269\u5F20 # \u5229\u76CA\u76F8\u5173\u65B9 erm.api.enums.StakeHolder.SHAREHOLDER=\u80A1\u4E1C -erm.api.enums.StakeHolder.SUPERVISION=\u76D1\u7BA1 \ No newline at end of file +erm.api.enums.StakeHolder.SUPERVISION=\u76D1\u7BA1 + +# \u7ECF\u6D4E\u8D44\u672C\u8BA1\u7B97\u65B9\u6CD5 +erm.api.enums.EconomicCapitalCalMethod.WEIGHT_ADJUST=\u7CFB\u6570\u8C03\u6574\u6CD5 +erm.api.enums.EconomicCapitalCalMethod.IRS=\u5185\u8BC4\u6CD5 +erm.api.enums.EconomicCapitalCalMethod.ADVANCED=\u9AD8\u7EA7\u6CD5 \ No newline at end of file diff --git a/erm.frontend/.npmrc b/erm.frontend/.npmrc index c1c0b295..dd3810ca 100644 --- a/erm.frontend/.npmrc +++ b/erm.frontend/.npmrc @@ -8,4 +8,4 @@ email= # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 2c4b7091..4f29bd45 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,114 +1,116 @@ { - "name": "erm.frontend", - "version": "8.1.44", - "description": "", - "private": false, - "keywords": [], - "author": "", - "license": "ISC", - "scripts": { - "dev": "nodemon", - "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack serve --config webpack.env.serve.cjs", - "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack --config webpack.env.build.cjs", - "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", - "sync": "platform sync", - "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml" - }, - "engines": { - "node": ">=18", - "pnpm": ">=7" - }, - "publishConfig": { - "registry": "http://nexus.sc.io:8000/repository/npm-releases/", - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.24.4", - "@babel/preset-env": "7.24.4", - "@babel/preset-typescript": "7.24.1", - "@babel/plugin-transform-class-properties": "7.24.1", - "@babel/plugin-transform-object-rest-spread": "7.24.1", - "@quasar/app-webpack": "3.12.5", - "@quasar/cli": "2.4.0", - "@types/mockjs": "1.0.10", - "@types/node": "20.12.7", - "@typescript-eslint/eslint-plugin": "7.7.1", - "@typescript-eslint/parser": "7.7.1", - "@vue/compiler-sfc": "3.4.24", - "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.19", - "babel-loader": "9.1.3", - "clean-webpack-plugin": "4.0.0", - "copy-webpack-plugin": "12.0.2", - "cross-env": "7.0.3", - "css-loader": "7.1.1", - "eslint": "8.56.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-vue": "9.25.0", - "eslint-webpack-plugin": "4.1.0", - "html-webpack-plugin": "5.6.0", - "json5": "2.2.3", - "mini-css-extract-plugin": "2.9.0", - "nodemon": "3.1.0", - "postcss": "8.4.38", - "postcss-import": "16.1.0", - "postcss-loader": "8.1.1", - "postcss-preset-env": "9.5.9", - "prettier": "3.2.5", - "sass": "1.75.0", - "sass-loader": "14.2.1", - "typescript": "5.4.5", - "vue-loader": "17.4.2", - "webpack": "5.91.0", - "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0", - "@vue/babel-plugin-jsx": "1.2.2" - }, - "dependencies": { - "@codemirror/autocomplete": "6.16.0", - "@codemirror/commands": "6.5.0", - "@codemirror/lang-html": "6.4.9", - "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.2", - "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.6.3", - "@codemirror/lang-xml": "6.1.0", - "@codemirror/language": "6.10.1", - "@codemirror/search": "6.5.6", - "@codemirror/state": "6.4.1", - "@codemirror/view": "6.26.3", - "@maxgraph/core": "0.10.0", - "@quasar/extras": "1.16.11", - "@vueuse/core": "10.9.0", - "axios": "1.6.8", - "codemirror": "6.0.1", - "dayjs": "1.11.10", - "echarts": "5.5.0", - "exceljs": "4.4.0", - "file-saver": "2.0.5", - "luckyexcel": "1.0.1", - "mockjs": "1.1.0", - "pinia": "2.1.7", - "platform-core": "8.1.229", - "quasar": "2.15.3", - "tailwindcss": "3.4.3", - "vue": "3.4.24", - "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.13.1", - "vue-router": "4.3.2", - "@univerjs/core": "0.1.13", - "@univerjs/design": "0.1.13", - "@univerjs/docs": "0.1.13", - "@univerjs/docs-ui": "0.1.13", - "@univerjs/engine-formula": "0.1.13", - "@univerjs/engine-render": "0.1.13", - "@univerjs/facade": "0.1.13", - "@univerjs/sheets": "0.1.13", - "@univerjs/sheets-formula": "0.1.13", - "@univerjs/sheets-ui": "0.1.13", - "@univerjs/ui": "0.1.13" - } + "name": "erm.frontend", + "version": "8.1.44", + "description": "", + "private": false, + "keywords": [ + + ], + "author": "", + "license": "ISC", + "scripts": { + "dev": "nodemon", + "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack serve --config webpack.env.serve.cjs", + "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack --config webpack.env.build.cjs", + "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", + "sync": "platform sync", + "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml" + }, + "engines": { + "node": ">=18", + "pnpm": ">=7" + }, + "publishConfig": { + "registry": "http://nexus.sc.io:8000/repository/npm-releases/", + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.24.4", + "@babel/preset-env": "7.24.4", + "@babel/preset-typescript": "7.24.1", + "@babel/plugin-transform-class-properties": "7.24.1", + "@babel/plugin-transform-object-rest-spread": "7.24.1", + "@quasar/app-webpack": "3.12.5", + "@quasar/cli": "2.4.0", + "@types/mockjs": "1.0.10", + "@types/node": "20.12.7", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", + "@vue/compiler-sfc": "3.4.24", + "@webpack-cli/serve": "2.0.5", + "autoprefixer": "10.4.19", + "babel-loader": "9.1.3", + "clean-webpack-plugin": "4.0.0", + "copy-webpack-plugin": "12.0.2", + "cross-env": "7.0.3", + "css-loader": "7.1.1", + "eslint": "8.56.0", + "eslint-config-prettier": "9.1.0", + "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-vue": "9.25.0", + "eslint-webpack-plugin": "4.1.0", + "html-webpack-plugin": "5.6.0", + "json5": "2.2.3", + "mini-css-extract-plugin": "2.9.0", + "nodemon": "3.1.0", + "postcss": "8.4.38", + "postcss-import": "16.1.0", + "postcss-loader": "8.1.1", + "postcss-preset-env": "9.5.9", + "prettier": "3.2.5", + "sass": "1.75.0", + "sass-loader": "14.2.1", + "typescript": "5.4.5", + "vue-loader": "17.4.2", + "webpack": "5.91.0", + "webpack-bundle-analyzer": "4.10.2", + "webpack-cli": "5.1.4", + "webpack-dev-server": "5.0.4", + "webpack-merge": "5.10.0", + "@vue/babel-plugin-jsx": "1.2.2" + }, + "dependencies": { + "@codemirror/autocomplete": "6.16.0", + "@codemirror/commands": "6.5.0", + "@codemirror/lang-html": "6.4.9", + "@codemirror/lang-java": "6.0.1", + "@codemirror/lang-javascript": "6.2.2", + "@codemirror/lang-json": "6.0.1", + "@codemirror/lang-sql": "6.6.3", + "@codemirror/lang-xml": "6.1.0", + "@codemirror/language": "6.10.1", + "@codemirror/search": "6.5.6", + "@codemirror/state": "6.4.1", + "@codemirror/view": "6.26.3", + "@maxgraph/core": "0.10.0", + "@quasar/extras": "1.16.11", + "@vueuse/core": "10.9.0", + "axios": "1.6.8", + "codemirror": "6.0.1", + "dayjs": "1.11.10", + "echarts": "5.5.0", + "exceljs": "4.4.0", + "file-saver": "2.0.5", + "luckyexcel": "1.0.1", + "mockjs": "1.1.0", + "pinia": "2.1.7", + "platform-core": "8.1.231", + "quasar": "2.15.3", + "tailwindcss": "3.4.3", + "vue": "3.4.24", + "vue-dompurify-html": "5.0.1", + "vue-i18n": "9.13.1", + "vue-router": "4.3.2", + "@univerjs/core": "0.1.13", + "@univerjs/design": "0.1.13", + "@univerjs/docs": "0.1.13", + "@univerjs/docs-ui": "0.1.13", + "@univerjs/engine-formula": "0.1.13", + "@univerjs/engine-render": "0.1.13", + "@univerjs/facade": "0.1.13", + "@univerjs/sheets": "0.1.13", + "@univerjs/sheets-formula": "0.1.13", + "@univerjs/sheets-ui": "0.1.13", + "@univerjs/ui": "0.1.13" + } } \ No newline at end of file diff --git a/erm.frontend/src/components/index.ts b/erm.frontend/src/components/index.ts index 29a1a004..0e84845b 100644 --- a/erm.frontend/src/components/index.ts +++ b/erm.frontend/src/components/index.ts @@ -29,6 +29,8 @@ import component_erm_assessment_managementResult from '@/views/assessment/Manage import component_erm_assessment_selfEvaluation from '@/views/assessment/SelfEvaluation.vue'; import component_erm_assessment_reEvaluation from '@/views/assessment/ReEvaluation.vue'; import component_erm_assessment_additional from '@/views/assessment/Additional.vue'; +import component_erm_economicCapital_schema from '@/views/economicCapital/Schema.vue'; +import component_erm_economicCapital_result from '@/views/economicCapital/Result.vue'; import component_erm_capitalPlan_strategicTarget from '@/views/capitalPlan/StrategicTarget.vue'; import component_erm_capitalPlan_parameter from '@/views/capitalPlan/Parameter.vue'; import component_erm_capitalPlan_result from '@/views/capitalPlan/Result.vue'; @@ -68,6 +70,8 @@ const localComponents = { 'component.erm.assessment.selfEvaluation': component_erm_assessment_selfEvaluation, 'component.erm.assessment.reEvaluation': component_erm_assessment_reEvaluation, 'component.erm.assessment.additional': component_erm_assessment_additional, + 'component.erm.economicCapital.schema': component_erm_economicCapital_schema, + 'component.erm.economicCapital.result': component_erm_economicCapital_result, 'component.erm.capitalPlan.strategicTarget': component_erm_capitalPlan_strategicTarget, 'component.erm.capitalPlan.parameter': component_erm_capitalPlan_parameter, 'component.erm.capitalPlan.result': component_erm_capitalPlan_result, diff --git a/erm.frontend/src/i18n/messages.json b/erm.frontend/src/i18n/messages.json index 566c8c8e..e30a4270 100644 --- a/erm.frontend/src/i18n/messages.json +++ b/erm.frontend/src/i18n/messages.json @@ -34,6 +34,9 @@ "menu.erm.assessment.selfEvaluation" : "Management Self Evaluation", "menu.erm.assessment.reEvaluation" : "Management Re Evaluation", "menu.erm.assessment.additional" : "Capital Additional", + "menu.erm.economicCapital": "Economic Capital", + "menu.erm.economicCapital.schema": "Schema", + "menu.erm.economicCapital.result": "Result", "menu.erm.capitalPlan" : "Capital Plan", "menu.erm.capitalPlan.strategicTarget" : "Strategic Objectives", "menu.erm.capitalPlan.parameter" : "Parameter", diff --git a/erm.frontend/src/i18n/messages_tw_CN.json b/erm.frontend/src/i18n/messages_tw_CN.json index 8bedbaf2..87f73ea2 100644 --- a/erm.frontend/src/i18n/messages_tw_CN.json +++ b/erm.frontend/src/i18n/messages_tw_CN.json @@ -34,6 +34,9 @@ "menu.erm.assessment.selfEvaluation" : "管理能力自評估", "menu.erm.assessment.reEvaluation" : "管理能力復評估", "menu.erm.assessment.additional" : "資本附加結果", + "menu.erm.economicCapital": "經濟資本", + "menu.erm.economicCapital.schema": "計算方案", + "menu.erm.economicCapital.result": "計算結果", "menu.erm.capitalPlan" : "資本規劃", "menu.erm.capitalPlan.strategicTarget" : "戰略目標", "menu.erm.capitalPlan.parameter" : "參數管理", diff --git a/erm.frontend/src/i18n/messages_zh_CN.json b/erm.frontend/src/i18n/messages_zh_CN.json index 37f80f90..e87fdb9d 100644 --- a/erm.frontend/src/i18n/messages_zh_CN.json +++ b/erm.frontend/src/i18n/messages_zh_CN.json @@ -34,6 +34,9 @@ "menu.erm.assessment.selfEvaluation" : "管理能力自评估", "menu.erm.assessment.reEvaluation" : "管理能力复评估", "menu.erm.assessment.additional" : "资本附加结果", + "menu.erm.economicCapital": "经济资本", + "menu.erm.economicCapital.schema": "计算方案", + "menu.erm.economicCapital.result": "计算结果", "menu.erm.capitalPlan" : "资本规划", "menu.erm.capitalPlan.strategicTarget": "战略目标", "menu.erm.capitalPlan.parameter" : "参数管理", @@ -139,6 +142,8 @@ "erm.appetite.spread.coreIndicator.grid.entity.referenceValue": "参考值(定量传导)", "erm.appetite.spread.coreIndicator.grid.entity.lastYearValue": "上年度指标值", + + "erm.capitalPlan.strategicTarget.grid.title": "战略目标", "erm.capitalPlan.strategicTarget.grid.entity.t": "T 年", "erm.capitalPlan.strategicTarget.grid.entity.t1": "T+1 年", diff --git a/erm.frontend/src/menus/menus.json b/erm.frontend/src/menus/menus.json index f838edf5..a92bea9b 100644 --- a/erm.frontend/src/menus/menus.json +++ b/erm.frontend/src/menus/menus.json @@ -95,6 +95,13 @@ /*全面风险管理/风险评估/资本附加结果*/ {"type":"ROUTE", "order":300, "parentId":"menu.erm.assessment", "id":"menu.erm.assessment.additional", "titleI18nKey":"menu.erm.assessment.additional", "icon":"bi-briefcase", "routeName":"route.erm.assessment.additional"}, + /*全面风险管理/经济资本*/ + {"type":"GROUP", "order":550, "parentId":"menu.erm", "id":"menu.erm.economicCapital", "titleI18nKey":"menu.erm.economicCapital", "icon":"bi-textarea"}, + /*全面风险管理/经济资本/计算方案*/ + {"type":"ROUTE", "order":50, "parentId":"menu.erm.economicCapital", "id":"menu.erm.economicCapital.schema", "titleI18nKey":"menu.erm.economicCapital.schema", "icon":"bi-gear", "routeName":"route.erm.economicCapital.schema"}, + /*全面风险管理/经济资本/计算结果*/ + {"type":"ROUTE", "order":100, "parentId":"menu.erm.economicCapital", "id":"menu.erm.economicCapital.result", "titleI18nKey":"menu.erm.economicCapital.result", "icon":"bi-gear", "routeName":"route.erm.economicCapital.result"}, + /*全面风险管理/资本规划*/ {"type":"GROUP", "order":600, "parentId":"menu.erm", "id":"menu.erm.capitalPlan", "titleI18nKey":"menu.erm.capitalPlan", "icon":"bi-textarea"}, /*全面风险管理/资本规划/战略目标*/ diff --git a/erm.frontend/src/routes/routes.json b/erm.frontend/src/routes/routes.json index 7406872a..0be72c75 100644 --- a/erm.frontend/src/routes/routes.json +++ b/erm.frontend/src/routes/routes.json @@ -404,6 +404,37 @@ ] } }, + { + "name": "route.erm.economicCapital.schema", + "path": "erm/economicCapital/schema", + "parent": "/", + "priority": 0, + "module": "erm.frontend", + "component": "component.erm.economicCapital.schema", + "componentPath": "@/views/economicCapital/Schema.vue", + "redirect": null, + "meta": { + "permissions": [ + "/erm/economicCapital/**/*" + ] + } + }, + { + "name": "route.erm.economicCapital.result", + "path": "erm/economicCapital/result", + "parent": "/", + "priority": 0, + "module": "erm.frontend", + "component": "component.erm.economicCapital.result", + "componentPath": "@/views/economicCapital/Result.vue", + "redirect": null, + "meta": { + "permissions": [ + "/erm/economicCapital/**/*" + ] + } + }, + { "name": "route.erm.capitalPlan.strategicTarget", "path": "erm/capitalPlan/strategicTarget", diff --git a/erm.frontend/src/views/economicCapital/Result.vue b/erm.frontend/src/views/economicCapital/Result.vue new file mode 100644 index 00000000..e7d1f3a7 --- /dev/null +++ b/erm.frontend/src/views/economicCapital/Result.vue @@ -0,0 +1,4 @@ + + diff --git a/erm.frontend/src/views/economicCapital/Schema.vue b/erm.frontend/src/views/economicCapital/Schema.vue new file mode 100644 index 00000000..8969affb --- /dev/null +++ b/erm.frontend/src/views/economicCapital/Schema.vue @@ -0,0 +1,75 @@ + + diff --git a/erm/src/main/java/erm/economiccapital/jpa/entity/ResultRwaEntity.java b/erm/src/main/java/erm/economiccapital/jpa/entity/ResultRwaEntity.java new file mode 100644 index 00000000..ad239b1a --- /dev/null +++ b/erm/src/main/java/erm/economiccapital/jpa/entity/ResultRwaEntity.java @@ -0,0 +1,340 @@ +package erm.economiccapital.jpa.entity; + +import erm.api.enums.EconomicCapitalCalMethod; +import erm.economiccapital.api.ResultRwaVo; +import erm.economiccapital.api.SchemaVo; +import io.sc.platform.orm.converter.NumericBooleanConverter; +import io.sc.platform.orm.entity.BaseEntity; +import io.sc.platform.orm.entity.CorporationAuditorEntity; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import javax.validation.constraints.Size; + +@Entity(name="erm.economiccapital.jpa.entity.ResultRwaEntity") +@Table(name="RP_EC_RESULT_RWA") +public class ResultRwaEntity extends BaseEntity { + //ID，主键 + @Id + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "uuid2") + @Column(name="ID_", length=36) + @Size(max=36) + private String id; + + //债项ID + @Column(name="DEBT_ID_",length=255) + @Size(min=1,max=255) + private String debtId; + + //客户ID + @Column(name="CUST_ID_",length=255) + @Size(min=1,max=255) + private String custId; + + //客户名称 + @Column(name="CUST_NAME_",length=255) + @Size(min=1,max=255) + private String custName; + + //机构名称 + @Column(name="ORG_NAME_",length=255) + @Size(min=1,max=255) + private String orgName; + + //业务品种 + @Column(name="BUS_CATEGORY_",length=255) + @Size(min=1,max=255) + private String busCategory; + + //产品名称 + @Column(name="PROD_NAME_",length=255) + @Size(min=1,max=255) + private String prodName; + + //条线 + @Column(name="STRIPLINE_",length=255) + @Size(min=1,max=255) + private String stripline; + + //资产净额 + @Column(name="ASSET_EQUITY_") + private Double assetEquity; + + //CCF + @Column(name="CCF_") + private Double ccf; + + //风险暴露大类 + @Column(name="EAD_BIG_TYPE_",length=255) + @Size(min=1,max=255) + private String eadBigType; + + //风险暴露小类 + @Column(name="EAD_SMALL_TYPE_",length=255) + @Size(min=1,max=255) + private String eadSmallType; + + //EAD + @Column(name="EAD_") + private Double ead; + + //权重法未覆盖EAD + @Column(name="UNCOVERAGE_EAD_") + private Double uncoverageEad; + + //RWA + @Column(name="RWA_") + private Double rwa; + + //经济资本再缓释后RWA + @Column(name="RWA_MITIGATION_") + private Double rwaMitigation; + + //评级调整系数 + @Column(name="WEIGHT_IRS_") + private Double weightIrs; + + //区域调整系数 + @Column(name="WEIGHT_AREA_") + private Double weightArea; + + //行业调整系数 + @Column(name="WEIGHT_INDUSTRY_") + private Double weightIndustry; + + //产品调整系数 + @Column(name="WEIGHT_PROD_") + private Double weightProd; + + //期限调整系数 + @Column(name="WEIGHT_TERM_") + private Double weightTerm; + + //经济资本RWA + @Column(name="EC_RWA_") + private Double ecRwa; + + //调整后经济资本RWA + @Column(name="EC_RWA_ADJUSTED") + private Double ecRwaAdjusted; + + @Override + public ResultRwaVo toVo() { + ResultRwaVo vo =new ResultRwaVo(); + super.toVo(vo); + vo.setId(this.getId()); + vo.setDebtId(this.getDebtId()); + vo.setCustId(this.getCustId()); + vo.setCustName(this.getCustName()); + vo.setOrgName(this.getOrgName()); + vo.setBusCategory(this.getBusCategory()); + vo.setProdName(this.getProdName()); + vo.setStripline(this.getStripline()); + vo.setAssetEquity(this.getAssetEquity()); + vo.setCcf(this.getCcf()); + vo.setEadBigType(this.getEadBigType()); + vo.setEadSmallType(this.getEadSmallType()); + vo.setEad(this.getEad()); + vo.setUncoverageEad(this.getUncoverageEad()); + vo.setRwa(this.getRwa()); + vo.setRwaMitigation(this.getRwaMitigation()); + vo.setWeightIrs(this.getWeightIrs()); + vo.setWeightArea(this.getWeightArea()); + vo.setWeightIndustry(this.getWeightIndustry()); + vo.setWeightProd(this.getWeightProd()); + vo.setWeightTerm(this.getWeightTerm()); + vo.setEcRwa(this.getEcRwa()); + vo.setEcRwaAdjusted(this.getEcRwaAdjusted()); + return vo; + } + + public ResultRwaEntity(){} + public ResultRwaEntity(String id){ + this.id =id; + } + + public @Size(max = 36) String getId() { + return id; + } + + public void setId(@Size(max = 36) String id) { + this.id = id; + } + + public @Size(min = 1, max = 255) String getDebtId() { + return debtId; + } + + public void setDebtId(@Size(min = 1, max = 255) String debtId) { + this.debtId = debtId; + } + + public @Size(min = 1, max = 255) String getCustId() { + return custId; + } + + public void setCustId(@Size(min = 1, max = 255) String custId) { + this.custId = custId; + } + + public @Size(min = 1, max = 255) String getCustName() { + return custName; + } + + public void setCustName(@Size(min = 1, max = 255) String custName) { + this.custName = custName; + } + + public @Size(min = 1, max = 255) String getOrgName() { + return orgName; + } + + public void setOrgName(@Size(min = 1, max = 255) String orgName) { + this.orgName = orgName; + } + + public @Size(min = 1, max = 255) String getBusCategory() { + return busCategory; + } + + public void setBusCategory(@Size(min = 1, max = 255) String busCategory) { + this.busCategory = busCategory; + } + + public @Size(min = 1, max = 255) String getProdName() { + return prodName; + } + + public void setProdName(@Size(min = 1, max = 255) String prodName) { + this.prodName = prodName; + } + + public @Size(min = 1, max = 255) String getStripline() { + return stripline; + } + + public void setStripline(@Size(min = 1, max = 255) String stripline) { + this.stripline = stripline; + } + + public Double getAssetEquity() { + return assetEquity; + } + + public void setAssetEquity(Double assetEquity) { + this.assetEquity = assetEquity; + } + + public Double getCcf() { + return ccf; + } + + public void setCcf(Double ccf) { + this.ccf = ccf; + } + + public Double getEad() { + return ead; + } + + public @Size(min = 1, max = 255) String getEadBigType() { + return eadBigType; + } + + public void setEadBigType(@Size(min = 1, max = 255) String eadBigType) { + this.eadBigType = eadBigType; + } + + public @Size(min = 1, max = 255) String getEadSmallType() { + return eadSmallType; + } + + public void setEadSmallType(@Size(min = 1, max = 255) String eadSmallType) { + this.eadSmallType = eadSmallType; + } + + public void setEad(Double ead) { + this.ead = ead; + } + + public Double getUncoverageEad() { + return uncoverageEad; + } + + public void setUncoverageEad(Double uncoverageEad) { + this.uncoverageEad = uncoverageEad; + } + + public Double getRwa() { + return rwa; + } + + public void setRwa(Double rwa) { + this.rwa = rwa; + } + + public Double getRwaMitigation() { + return rwaMitigation; + } + + public void setRwaMitigation(Double rwaMitigation) { + this.rwaMitigation = rwaMitigation; + } + + public Double getWeightIrs() { + return weightIrs; + } + + public void setWeightIrs(Double weightIrs) { + this.weightIrs = weightIrs; + } + + public Double getWeightArea() { + return weightArea; + } + + public void setWeightArea(Double weightArea) { + this.weightArea = weightArea; + } + + public Double getWeightIndustry() { + return weightIndustry; + } + + public void setWeightIndustry(Double weightIndustry) { + this.weightIndustry = weightIndustry; + } + + public Double getWeightProd() { + return weightProd; + } + + public void setWeightProd(Double weightProd) { + this.weightProd = weightProd; + } + + public Double getWeightTerm() { + return weightTerm; + } + + public void setWeightTerm(Double weightTerm) { + this.weightTerm = weightTerm; + } + + public Double getEcRwa() { + return ecRwa; + } + + public void setEcRwa(Double ecRwa) { + this.ecRwa = ecRwa; + } + + public Double getEcRwaAdjusted() { + return ecRwaAdjusted; + } + + public void setEcRwaAdjusted(Double ecRwaAdjusted) { + this.ecRwaAdjusted = ecRwaAdjusted; + } +} diff --git a/erm/src/main/java/erm/economiccapital/jpa/entity/SchemaEntity.java b/erm/src/main/java/erm/economiccapital/jpa/entity/SchemaEntity.java new file mode 100644 index 00000000..3efa067a --- /dev/null +++ b/erm/src/main/java/erm/economiccapital/jpa/entity/SchemaEntity.java @@ -0,0 +1,112 @@ +package erm.economiccapital.jpa.entity; + +import erm.api.enums.EconomicCapitalCalMethod; +import erm.economiccapital.api.SchemaVo; +import io.sc.platform.orm.converter.NumericBooleanConverter; +import io.sc.platform.orm.entity.CorporationAuditorEntity; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import javax.validation.constraints.Size; + +@Entity(name="erm.economiccapital.jpa.entity.SchemaEntity") +@Table(name="RP_EC_SCHEMA") +public class SchemaEntity extends CorporationAuditorEntity { + //ID，主键 + @Id + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "uuid2") + @Column(name="ID_", length=36) + @Size(max=36) + private String id; + + //代码 + @Column(name="CODE_",nullable=false,length=255) + @Size(max=255) + private String code; + + //名称 + @Column(name="NAME_",nullable=false, length=255) + @Size(min=1,max=255) + private String name; + + //描述 + @Column(name="DESCRIPTION_",nullable=false, length=255) + @Size(min=1,max=255) + private String description; + + @Column(name="ENABLE_") + @Convert(converter= NumericBooleanConverter.class) + private Boolean enable; + + // 计算方法 + @Column(name="CAL_METHOD_",length=20) + @Size(max=20) + private EconomicCapitalCalMethod calMethod; + + @Override + public SchemaVo toVo() { + SchemaVo vo =new SchemaVo(); + super.toVo(vo); + vo.setId(this.getId()); + vo.setCode(this.getCode()); + vo.setName(this.getName()); + vo.setDescription(this.getDescription()); + vo.setEnable(this.getEnable()); + vo.setCalMethod(this.getCalMethod()); + return vo; + } + + public SchemaEntity(){} + public SchemaEntity(String id){ + this.id =id; + } + + public @Size(max = 36) String getId() { + return id; + } + + public void setId(@Size(max = 36) String id) { + this.id = id; + } + + public @Size(max = 255) String getCode() { + return code; + } + + public void setCode(@Size(max = 255) String code) { + this.code = code; + } + + public @Size(min = 1, max = 255) String getName() { + return name; + } + + public void setName(@Size(min = 1, max = 255) String name) { + this.name = name; + } + + public @Size(min = 1, max = 255) String getDescription() { + return description; + } + + public void setDescription(@Size(min = 1, max = 255) String description) { + this.description = description; + } + + public Boolean getEnable() { + return enable; + } + + public void setEnable(Boolean enable) { + this.enable = enable; + } + + public @Size(max = 20) EconomicCapitalCalMethod getCalMethod() { + return calMethod; + } + + public void setCalMethod(@Size(max = 20) EconomicCapitalCalMethod calMethod) { + this.calMethod = calMethod; + } +} diff --git a/erm/src/main/resources/META-INF/platform/plugins/liquibase.json b/erm/src/main/resources/META-INF/platform/plugins/liquibase.json index c844f485..988d0c13 100644 --- a/erm/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/erm/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -23,7 +23,9 @@ "liquibase/appetite/erm.appetite_1.0.0_20221020__ERM Appetite Database Data.xml", "liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Schema DDL.xml", - "liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Database Data.xml" + "liquibase/capitalplan/erm.capitalpan_1.0.0_20221020__ERM Capital Plan Database Data.xml", + + "liquibase/economiccapital/erm.capitalpan_1.0.0_20221020__ERM Economic Capital Schema DDL.xml" ] } ] diff --git a/erm/src/main/resources/liquibase/economiccapital/erm.capitalpan_1.0.0_20221020__ERM Economic Capital Schema DDL.xml b/erm/src/main/resources/liquibase/economiccapital/erm.capitalpan_1.0.0_20221020__ERM Economic Capital Schema DDL.xml new file mode 100644 index 00000000..f7aebd01 --- /dev/null +++ b/erm/src/main/resources/liquibase/economiccapital/erm.capitalpan_1.0.0_20221020__ERM Economic Capital Schema DDL.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle.properties b/gradle.properties index a6d84582..334e9902 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,8 +37,8 @@ application_version=1.0.0 ########################################################### platform_group=io.sc platform_version=8.1.44 -platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.229 +platform_plugin_version=8.1.44 +platform_core_frontend_version=8.1.231 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/.npmrc b/io.sc.engine.mv.frontend/.npmrc index c1c0b295..dd3810ca 100644 --- a/io.sc.engine.mv.frontend/.npmrc +++ b/io.sc.engine.mv.frontend/.npmrc @@ -8,4 +8,4 @@ email= # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index f22ed03d..e113fbd8 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.229", + "platform-core": "8.1.231", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", diff --git a/io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgDataExtractorWebController.java b/io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgDataExtractorWebController.java index df1c78ea..e972d644 100644 --- a/io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgDataExtractorWebController.java +++ b/io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgDataExtractorWebController.java @@ -6,9 +6,11 @@ import io.sc.engine.mv.configure.service.CfgDataExtractorService; import io.sc.engine.mv.configure.vo.CfgDataExtractorVo; import io.sc.platform.mvc.controller.support.RestCrudController; import io.sc.platform.system.ds.jpa.repository.DsRepository; -import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 数据抽取器接口配置控制器 diff --git a/io.sc.engine.rule.frontend/.npmrc b/io.sc.engine.rule.frontend/.npmrc index c1c0b295..dd3810ca 100644 --- a/io.sc.engine.rule.frontend/.npmrc +++ b/io.sc.engine.rule.frontend/.npmrc @@ -8,4 +8,4 @@ email= # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index ed4512e5..e39133fb 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.229", + "platform-core": "8.1.231", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", diff --git a/io.sc.engine.st.frontend/.npmrc b/io.sc.engine.st.frontend/.npmrc index c1c0b295..dd3810ca 100644 --- a/io.sc.engine.st.frontend/.npmrc +++ b/io.sc.engine.st.frontend/.npmrc @@ -8,4 +8,4 @@ email= # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index dcd648ed..9853f3c8 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.229", + "platform-core": "8.1.231", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", diff --git a/io.sc.platform.core.frontend/.npmrc b/io.sc.platform.core.frontend/.npmrc index c1c0b295..dd3810ca 100644 --- a/io.sc.platform.core.frontend/.npmrc +++ b/io.sc.platform.core.frontend/.npmrc @@ -8,4 +8,4 @@ email= # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 6c6561cb..7ec02d87 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.229", + "version": "8.1.231", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/template-project/.npmrc b/io.sc.platform.core.frontend/template-project/.npmrc index c1c0b295..dd3810ca 100644 --- a/io.sc.platform.core.frontend/template-project/.npmrc +++ b/io.sc.platform.core.frontend/template-project/.npmrc @@ -8,4 +8,4 @@ email= # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index d88eba28..2d18dea0 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.229", + "version": "8.1.231", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -104,7 +104,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.229", + "platform-core": "8.1.231", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/math/MathEditor.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/math/MathEditor.vue index 38a4da59..b6f16bbe 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/testcase/math/MathEditor.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/math/MathEditor.vue @@ -6,8 +6,7 @@