From 02d028fc2cf43f264bd9559b09f14602eda48a92 Mon Sep 17 00:00:00 2001 From: likunming Date: Thu, 30 May 2024 10:36:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AF=84=E7=BA=A7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.irbs/build.gradle | 8 +- build.gradle | 52 +- gradle.properties | 9 +- irbs.cust.rating/build.gradle | 2 +- irbs.defaultManager/build.gradle | 2 +- irbs.frontend/.npmrc | 4 +- irbs.frontend/package.json | 209 +++-- irbs.frontend/src/views/IrbsHome.vue | 1130 +++++--------------------- 8 files changed, 372 insertions(+), 1044 deletions(-) diff --git a/app.irbs/build.gradle b/app.irbs/build.gradle index c4844a6..1242c88 100644 --- a/app.irbs/build.gradle +++ b/app.irbs/build.gradle @@ -15,10 +15,10 @@ dependencies { "io.sc:io.sc.platform.app:${platform_version}", "io.sc:io.sc.platform.security.loginform:${platform_version}", - "io.sc:io.sc.platform.page.config:${platform_version}", - "io.sc:rwa.params:${platform_version}", - "io.sc:rwa.report:${platform_version}", - "io.sc:app.rwa.frontend:${platform_version}", + "io.sc:io.sc.platform.page.config:${rwa_version}", + "io.sc:rwa.params:${rwa_version}", + "io.sc:rwa.report:${rwa_version}", + "io.sc:app.rwa.frontend:${rwa_version}", project(":irbs.frontend"), project(":irbs.cust.rating"), diff --git a/build.gradle b/build.gradle index a77b9c7..16f0ad3 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,6 @@ subprojects { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" exclude group: "org.slf4j", module: "slf4j-jdk14" exclude group: "org.slf4j", module: "slf4j-nop" - //exclude group: "com.oracle.database.jdbc", module: "ojdbc8" } dependencyManagement { @@ -100,15 +99,14 @@ subprojects { compileTestJava.options.encoding ="${java_encoding}" tasks.withType(JavaCompile) { - //options.compilerArgs += ["-Xdoclint:none", "-Xlint:none", "-nowarn"] options.compilerArgs += ["-Xlint:deprecation","-Xlint:unchecked"] } /*----------------------------------------------------------------- * 配置项目基本信息 *----------------------------------------------------------------*/ - group ="${platform_group}" - version ="${platform_version}" + group ="${application_group}" + version ="${application_version}" if(file('package.json').exists()){ mkdir 'java-src/main/java'; @@ -184,7 +182,6 @@ subprojects { sources { include '*.adoc' } - //outputDir = file("$buildDir/resources/main/help/" + project.name) outputDir = file("dist/help/" + project.name) resources { from(sourceDir) { @@ -235,8 +232,6 @@ subprojects { doLast{ //打包时移除 jrebel 相关的文件 delete "$buildDir/resources/main/rebel.xml" - // - } } @@ -269,18 +264,35 @@ subprojects { *----------------------------------------------------------------*/ task jrebelIdea() {} tasks.jrebelIdea.doLast { - File resourcesFile =file('src/main/resources') - if(resourcesFile!=null && resourcesFile.exists()){ - File rebelFile = file('src/main/resources/rebel.xml') - rebelFile.withWriter('UTF-8') { writer -> - writer.write('\n'); - writer.write('\n'); - writer.write('\t\n'); - if(file(project.name + '/src/main').exists()){ - writer.write('\t\t\n'); + if(isFrontendProject(file('.'))) { + File resourcesFile = file('java-src/main/resources') + if (resourcesFile != null && resourcesFile.exists()) { + File rebelFile = file('java-src/main/resources/rebel.xml') + rebelFile.withWriter('UTF-8') { writer -> + writer.write('\n'); + writer.write('\n'); + writer.write('\t\n'); + if (file(project.name + '/java-src/main').exists()) { + writer.write('\t\t\n'); + } + writer.write('\t\n'); + writer.write(''); + } + } + }else { + File resourcesFile = file('src/main/resources') + if (resourcesFile != null && resourcesFile.exists()) { + File rebelFile = file('src/main/resources/rebel.xml') + rebelFile.withWriter('UTF-8') { writer -> + writer.write('\n'); + writer.write('\n'); + writer.write('\t\n'); + if (file(project.name + '/src/main').exists()) { + writer.write('\t\t\n'); + } + writer.write('\t\n'); + writer.write(''); } - writer.write('\t\n'); - writer.write(''); } } } @@ -636,13 +648,13 @@ subprojects { frontendNpmInstall.dependsOn(frontendUpdatePackageJson) frontendNpmSync.dependsOn(frontendNpmInstall) frontendNpmBuild.dependsOn(frontendNpmSync) - frontendNpmProd.dependsOn(frontendNpmInstall) + frontendNpmProd.dependsOn(frontendNpmSync) // 资源处理前进行前端模块的构建 // 设置方式: 通过命令行 -D 传入目标环境参数 // gradle bootwar -Dfrontend=dev # 采用 pnpm build 构建前端 // gradle bootwar -Dfrontend=prod # 采用 pnpm prod 构建前端 - // gradle bootwar -Dfrontend # 不构建前端, 仅生成后端需要的文件 + // gradle bootwar -Dfrontend=none # 不构建前端, 仅生成后端需要的文件 def isFrontend =System.getProperty("frontend")?:"prod"; if(isFrontend=="dev"){ frontendGenerateThymeleafTemplate.dependsOn(frontendNpmBuild); diff --git a/gradle.properties b/gradle.properties index e440c03..ce79ff6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,10 +36,15 @@ application_version=1.0.1 # platform ########################################################### platform_group=io.sc -platform_version=8.1.37 +platform_version=8.1.41 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.188 +platform_core_frontend_version=8.1.217 + +########################################################### +# product dependencies version +########################################################### rule_engine_version=3.10.2 +rwa_version=1.0.2 ########################################################### # dependencies version diff --git a/irbs.cust.rating/build.gradle b/irbs.cust.rating/build.gradle index e335c0b..8a4bf97 100644 --- a/irbs.cust.rating/build.gradle +++ b/irbs.cust.rating/build.gradle @@ -3,7 +3,7 @@ dependencies { "io.sc:io.sc.platform.mvc:${platform_version}", "org.wsp:org.wsp.engine.rule.client:${rule_engine_version}", "io.sc:io.sc.platform.flowable:${platform_version}", - "io.sc:io.sc.platform.page.config:${platform_version}", + "io.sc:io.sc.platform.page.config:${rwa_version}", project(":irbs.defaultManager"), ) diff --git a/irbs.defaultManager/build.gradle b/irbs.defaultManager/build.gradle index 6378675..47a6b96 100644 --- a/irbs.defaultManager/build.gradle +++ b/irbs.defaultManager/build.gradle @@ -2,6 +2,6 @@ dependencies { api( "io.sc:io.sc.platform.mvc:${platform_version}", "io.sc:io.sc.platform.flowable:${platform_version}", - "io.sc:io.sc.platform.page.config:${platform_version}", + "io.sc:io.sc.platform.page.config:${rwa_version}", ) } diff --git a/irbs.frontend/.npmrc b/irbs.frontend/.npmrc index febd503..c1c0b29 100644 --- a/irbs.frontend/.npmrc +++ b/irbs.frontend/.npmrc @@ -1,5 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 -registry=http://124.222.99.204:8000/repository/npm-public/ +registry=http://nexus.sc.io:8000/repository/npm-public/ # 用户邮箱 email= @@ -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 -//124.222.99.204: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.193db44c-7ca5-3cb6-a990-d24b93fb0d10 \ No newline at end of file diff --git a/irbs.frontend/package.json b/irbs.frontend/package.json index f794adb..3939e30 100644 --- a/irbs.frontend/package.json +++ b/irbs.frontend/package.json @@ -1,106 +1,105 @@ { - "name": "irbs.frontend", - "version": "8.1.27", - "description": "", - "private": false, - "keywords": [ - - ], - "author": "", - "license": "ISC", - "scripts": { - "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml", - "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" - }, - "engines": { - "node": ">=18", - "pnpm": ">=7" - }, - "publishConfig": { - "registry": "http://nexus.sc.io:8000/repository/npm-releases/", - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.23.7", - "@babel/preset-env": "7.23.7", - "@babel/preset-typescript": "7.23.3", - "@babel/plugin-transform-class-properties": "7.23.3", - "@babel/plugin-transform-object-rest-spread": "7.23.4", - "@quasar/app-webpack": "3.12.1", - "@quasar/cli": "2.3.0", - "@types/mockjs": "1.0.10", - "@types/node": "20.10.6", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", - "@vue/compiler-sfc": "3.4.3", - "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.16", - "babel-loader": "9.1.3", - "clean-webpack-plugin": "4.0.0", - "copy-webpack-plugin": "11.0.0", - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "eslint": "8.56.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.2", - "eslint-plugin-vue": "9.19.2", - "eslint-webpack-plugin": "4.0.1", - "html-webpack-plugin": "5.6.0", - "json5": "2.2.3", - "mini-css-extract-plugin": "2.7.6", - "nodemon": "3.0.2", - "postcss": "8.4.32", - "postcss-import": "16.0.0", - "postcss-loader": "7.3.4", - "postcss-preset-env": "9.3.0", - "prettier": "3.1.1", - "sass": "1.69.7", - "sass-loader": "13.3.3", - "typescript": "5.3.3", - "vue-loader": "17.4.2", - "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.10.1", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1", - "webpack-merge": "5.10.0", - "@vue/babel-plugin-jsx": "1.1.5" - }, - "dependencies": { - "@quasar/extras": "1.16.9", - "@vueuse/core": "10.7.1", - "axios": "1.6.3", - "dayjs": "1.11.10", - "echarts": "5.4.3", - "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.188", - "quasar": "2.14.2", - "tailwindcss": "3.4.0", - "vue": "3.4.3", - "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.8.0", - "vue-router": "4.2.5", - "lodash": "4.17.21", - "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.3", - "@codemirror/lang-html": "6.4.7", - "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.1", - "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.4", - "@codemirror/lang-xml": "6.0.2", - "@codemirror/language": "6.10.0", - "@codemirror/search": "6.5.5", - "@codemirror/state": "6.4.0", - "@codemirror/view": "6.23.0", - "codemirror": "6.0.1", - "vue-codemirror6": "1.2.0" - } -} + "name": "irbs.frontend", + "version": "1.0.1", + "description": "", + "private": false, + "keywords": [], + "author": "", + "license": "ISC", + "scripts": { + "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml", + "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" + }, + "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": { + "@quasar/extras": "1.16.11", + "@vueuse/core": "10.9.0", + "axios": "1.6.8", + "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.217", + "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", + "lodash": "4.17.21", + "@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", + "codemirror": "6.0.1", + "vue-codemirror6": "1.2.0", + "@maxgraph/core": "0.10.0" + } +} \ No newline at end of file diff --git a/irbs.frontend/src/views/IrbsHome.vue b/irbs.frontend/src/views/IrbsHome.vue index f207a7a..52bb012 100644 --- a/irbs.frontend/src/views/IrbsHome.vue +++ b/irbs.frontend/src/views/IrbsHome.vue @@ -1,43 +1,38 @@ - From b80c34a7842d4d87a9271282307b44eab9f4ce26 Mon Sep 17 00:00:00 2001 From: likunming Date: Thu, 30 May 2024 10:37:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AF=84=E7=BA=A7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rating/controller/HomeController.java | 45 ++++++ .../irbs/cust/rating/service/HomeService.java | 17 +++ .../rating/service/impl/HomeServiceImpl.java | 52 +++++++ irbs.frontend/public/configure.js | 2 +- irbs.frontend/src/components/index.ts | 128 +++++++++--------- irbs.frontend/util-components-generator.cjs | 6 +- irbs.frontend/webpack.env.serve.cjs | 2 +- 7 files changed, 183 insertions(+), 69 deletions(-) create mode 100644 irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java create mode 100644 irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java create mode 100644 irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java new file mode 100644 index 0000000..dabd76b --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java @@ -0,0 +1,45 @@ +package irbs.cust.rating.controller; + +import irbs.cust.rating.jpa.support.KeyValueWrapper; +import irbs.cust.rating.service.HomeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 首页控制器 + * @author likunming + */ +@RestController +@RequestMapping("/api/irbs/home") +public class HomeController { + + @Autowired + private HomeService homeService; + + /** + * 首页，敞口分布统计 + * + * @throws Exception 异常 + */ + @RequestMapping(value = "ratingModelExposure", method = RequestMethod.GET) + @ResponseBody + public List ratingModelExposure() throws Exception { + return homeService.getRatingModelExposureList(); + } + + /** + * 首页，评级分布统计 + * + * @throws Exception 异常 + */ + @RequestMapping(value = "ratingLevelExposure", method = RequestMethod.GET) + @ResponseBody + public List ratingLevelExposureList() throws Exception { + return homeService.getRatingLevelExposureList(); + } +} diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java new file mode 100644 index 0000000..0ec6b9c --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java @@ -0,0 +1,17 @@ +package irbs.cust.rating.service; + +import irbs.cust.rating.jpa.support.KeyValueWrapper; + +import java.util.List; + +/** + * 客户评级流程处理服务 + * @author likunming + * + */ +public interface HomeService { + + public List getRatingModelExposureList() throws Exception; + + public List getRatingLevelExposureList() throws Exception; +} diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java new file mode 100644 index 0000000..d95b009 --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java @@ -0,0 +1,52 @@ +package irbs.cust.rating.service.impl; + +import irbs.cust.rating.jpa.support.KeyValueWrapper; +import irbs.cust.rating.service.HomeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +public class HomeServiceImpl implements HomeService { + + @Autowired + NamedParameterJdbcTemplate namedParameterJdbcTemplate; + + @Override + public List getRatingModelExposureList() throws Exception { + String querySql = "select MODEL_NAME, count(*) MODEL_NUMBER from NS_COMPANY_RATING where MODEL_CODE IS NOT NULL "; + querySql += " group by MODEL_CODE, MODEL_NAME order by CAST(substr(MODEL_CODE,4) as DECIMAL) asc "; + List query = namedParameterJdbcTemplate.query(querySql, + (rs, rowNum) -> { + KeyValueWrapper kv = new KeyValueWrapper(); + kv.setKey(rs.getString("MODEL_NAME")); + kv.setValue(rs.getString("MODEL_NUMBER")); + return kv; + }); + return query; + } + + @Override + public List getRatingLevelExposureList() throws Exception { + String querySql1 = "select p.FINAL_LEVEL,count(*) FINAL_NUMBER from (" + + "select distinct(cust_no) as cust_no,FINAL_LEVEL from NS_COMPANY_RATING " + + "WHERE cust_no is not null and FINAL_LEVEL IS NOT NULL AND RATING_STATUS = '010' "; + String querySql2 = "select 'D' FINAL_LEVEL, COUNT(*) FINAL_NUMBER from (" + + "select distinct(cust_no) as cust_no from P_IRS_DEFAULT_COGNIZANCE " + + "where ((VALID = '1' and DEFAULT_TYPE ='02') or (VALID <> '0' and DEFAULT_TYPE = '01')) and cust_no is not null "; + querySql1 += ") p GROUP BY p.FINAL_LEVEL"; + querySql2 += ") q"; + String querySql = querySql1 + " UNION ALL " + querySql2; + List query = namedParameterJdbcTemplate.query(querySql, + (rs, rowNum) -> { + KeyValueWrapper kv = new KeyValueWrapper(); + kv.setKey(rs.getString("FINAL_LEVEL")); + kv.setValue(rs.getString("FINAL_NUMBER")); + return kv; + }); + return query; + } +} diff --git a/irbs.frontend/public/configure.js b/irbs.frontend/public/configure.js index 6960180..cffade3 100644 --- a/irbs.frontend/public/configure.js +++ b/irbs.frontend/public/configure.js @@ -6,7 +6,7 @@ window.APP.configure ={ webContextPath: '[(@{/})]'.startsWith('[')? '/' : '[(@{/})]', // 默认后端 API 请求的服务地址前缀 apiContextPaths: { - DEFAULT: '[(@{/})]'.startsWith('[')? 'http://localhost:8081/' : '[(@{/})]', + DEFAULT: '[(@{/})]'.startsWith('[')? 'http://localhost:8080/' : '[(@{/})]', }, // 是否启用本地 mock enableLocalMock : false, diff --git a/irbs.frontend/src/components/index.ts b/irbs.frontend/src/components/index.ts index 7e1ea78..129e39a 100644 --- a/irbs.frontend/src/components/index.ts +++ b/irbs.frontend/src/components/index.ts @@ -2,72 +2,72 @@ * 此文件为自动生成文件,请勿修改 */ -import home from '@/views/IrbsHome.vue'; -import irbsHome from '@/views/IrbsHome.vue'; -import todoTask from '@/views/workbench/TodoTask.vue'; -import doneTask from '@/views/workbench/DoneTask.vue'; -import endTask from '@/views/workbench/EndTask.vue'; -import custRating from '@/views/custRating/CustRating.vue'; -import custSeparateRating from '@/views/custRating/CustSeparateRating.vue'; -import financialRating from '@/views/custRating/FinancialRating.vue'; -import cognizanceApply from '@/views/default/CognizanceApply.vue'; -import rebirthApply from '@/views/default/RebirthApply.vue'; -import lgdQuery from '@/views/debtRating/LgdQuery.vue'; -import riskExposureApply from '@/views/riskExposure/RiskExposureApply.vue'; -import riskExposureApproval from '@/views/riskExposure/RiskExposureApproval.vue'; -import custRatingHist from '@/views/query/CustRatingHist.vue'; -import defaultHist from '@/views/query/DefaultHist.vue'; -import riskExposureHist from '@/views/query/RiskExposureHist.vue'; -import custInfo from '@/views/query/CustInfo.vue'; -import resultQuery from '@/views/model/ResultQuery.vue'; -import pressureTest from '@/views/model/PressureTest.vue'; -import ratingAdjustment from '@/views/config/RatingAdjustment.vue'; -import debtFactors from '@/views/config/DebtFactors.vue'; -import rptRatingDistribution from '@/views/report/RptRatingDistribution.vue'; -import rptRatingModelFocusDist from '@/views/report/RptRatingModelFocusDist.vue'; -import rptRatingOrgFocusDist from '@/views/report/RptRatingOrgFocusDist.vue'; -import rptRatingNumberMigrate from '@/views/report/RptRatingNumberMigrate.vue'; -import rptRatingLoanBalanceMigrate from '@/views/report/RptRatingLoanBalanceMigrate.vue'; -import rptRatingIndustryFocusDist from '@/views/report/RptRatingIndustryFocusDist.vue'; -import rptModelMonitorDiff from '@/views/report/RptModelMonitorDiff.vue'; -import rptModelMonitorStable from '@/views/report/RptModelMonitorStable.vue'; -import rptRatingOverturn from '@/views/report/RptRatingOverturn.vue'; -import rptRatingAdjust from '@/views/report/RptRatingAdjust.vue'; -import rptModelMonitorBinomialCheck from '@/views/report/RptModelMonitorBinomialCheck.vue'; +import irbs_home from '@/views/IrbsHome.vue'; +import irbs_irbsHome from '@/views/IrbsHome.vue'; +import irbs_todoTask from '@/views/workbench/TodoTask.vue'; +import irbs_doneTask from '@/views/workbench/DoneTask.vue'; +import irbs_endTask from '@/views/workbench/EndTask.vue'; +import irbs_custRating from '@/views/custRating/CustRating.vue'; +import irbs_custSeparateRating from '@/views/custRating/CustSeparateRating.vue'; +import irbs_financialRating from '@/views/custRating/FinancialRating.vue'; +import irbs_cognizanceApply from '@/views/default/CognizanceApply.vue'; +import irbs_rebirthApply from '@/views/default/RebirthApply.vue'; +import irbs_lgdQuery from '@/views/debtRating/LgdQuery.vue'; +import irbs_riskExposureApply from '@/views/riskExposure/RiskExposureApply.vue'; +import irbs_riskExposureApproval from '@/views/riskExposure/RiskExposureApproval.vue'; +import irbs_custRatingHist from '@/views/query/CustRatingHist.vue'; +import irbs_defaultHist from '@/views/query/DefaultHist.vue'; +import irbs_riskExposureHist from '@/views/query/RiskExposureHist.vue'; +import irbs_custInfo from '@/views/query/CustInfo.vue'; +import irbs_resultQuery from '@/views/model/ResultQuery.vue'; +import irbs_pressureTest from '@/views/model/PressureTest.vue'; +import irbs_ratingAdjustment from '@/views/config/RatingAdjustment.vue'; +import irbs_debtFactors from '@/views/config/DebtFactors.vue'; +import irbs_report_rptRatingDistribution from '@/views/report/RptRatingDistribution.vue'; +import irbs_report_rptRatingModelFocusDist from '@/views/report/RptRatingModelFocusDist.vue'; +import irbs_report_rptRatingOrgFocusDist from '@/views/report/RptRatingOrgFocusDist.vue'; +import irbs_report_rptRatingNumberMigrate from '@/views/report/RptRatingNumberMigrate.vue'; +import irbs_report_rptRatingLoanBalanceMigrate from '@/views/report/RptRatingLoanBalanceMigrate.vue'; +import irbs_report_rptRatingIndustryFocusDist from '@/views/report/RptRatingIndustryFocusDist.vue'; +import irbs_report_rptModelMonitorDiff from '@/views/report/RptModelMonitorDiff.vue'; +import irbs_report_rptModelMonitorStable from '@/views/report/RptModelMonitorStable.vue'; +import irbs_report_rptRatingOverturn from '@/views/report/RptRatingOverturn.vue'; +import irbs_report_rptRatingAdjust from '@/views/report/RptRatingAdjust.vue'; +import irbs_report_rptModelMonitorBinomialCheck from '@/views/report/RptModelMonitorBinomialCheck.vue'; const localComponents = { - 'irbs.home': home, - 'irbs.irbsHome': irbsHome, - 'irbs.todoTask': todoTask, - 'irbs.doneTask': doneTask, - 'irbs.endTask': endTask, - 'irbs.custRating': custRating, - 'irbs.custSeparateRating': custSeparateRating, - 'irbs.financialRating': financialRating, - 'irbs.cognizanceApply': cognizanceApply, - 'irbs.rebirthApply': rebirthApply, - 'irbs.lgdQuery': lgdQuery, - 'irbs.riskExposureApply': riskExposureApply, - 'irbs.riskExposureApproval': riskExposureApproval, - 'irbs.custRatingHist': custRatingHist, - 'irbs.defaultHist': defaultHist, - 'irbs.riskExposureHist': riskExposureHist, - 'irbs.custInfo': custInfo, - 'irbs.resultQuery': resultQuery, - 'irbs.pressureTest': pressureTest, - 'irbs.ratingAdjustment': ratingAdjustment, - 'irbs.debtFactors': debtFactors, - 'irbs.report.rptRatingDistribution': rptRatingDistribution, - 'irbs.report.rptRatingModelFocusDist': rptRatingModelFocusDist, - 'irbs.report.rptRatingOrgFocusDist': rptRatingOrgFocusDist, - 'irbs.report.rptRatingNumberMigrate': rptRatingNumberMigrate, - 'irbs.report.rptRatingLoanBalanceMigrate': rptRatingLoanBalanceMigrate, - 'irbs.report.rptRatingIndustryFocusDist': rptRatingIndustryFocusDist, - 'irbs.report.rptModelMonitorDiff': rptModelMonitorDiff, - 'irbs.report.rptModelMonitorStable': rptModelMonitorStable, - 'irbs.report.rptRatingOverturn': rptRatingOverturn, - 'irbs.report.rptRatingAdjust': rptRatingAdjust, - 'irbs.report.rptModelMonitorBinomialCheck': rptModelMonitorBinomialCheck, + 'irbs.home': irbs_home, + 'irbs.irbsHome': irbs_irbsHome, + 'irbs.todoTask': irbs_todoTask, + 'irbs.doneTask': irbs_doneTask, + 'irbs.endTask': irbs_endTask, + 'irbs.custRating': irbs_custRating, + 'irbs.custSeparateRating': irbs_custSeparateRating, + 'irbs.financialRating': irbs_financialRating, + 'irbs.cognizanceApply': irbs_cognizanceApply, + 'irbs.rebirthApply': irbs_rebirthApply, + 'irbs.lgdQuery': irbs_lgdQuery, + 'irbs.riskExposureApply': irbs_riskExposureApply, + 'irbs.riskExposureApproval': irbs_riskExposureApproval, + 'irbs.custRatingHist': irbs_custRatingHist, + 'irbs.defaultHist': irbs_defaultHist, + 'irbs.riskExposureHist': irbs_riskExposureHist, + 'irbs.custInfo': irbs_custInfo, + 'irbs.resultQuery': irbs_resultQuery, + 'irbs.pressureTest': irbs_pressureTest, + 'irbs.ratingAdjustment': irbs_ratingAdjustment, + 'irbs.debtFactors': irbs_debtFactors, + 'irbs.report.rptRatingDistribution': irbs_report_rptRatingDistribution, + 'irbs.report.rptRatingModelFocusDist': irbs_report_rptRatingModelFocusDist, + 'irbs.report.rptRatingOrgFocusDist': irbs_report_rptRatingOrgFocusDist, + 'irbs.report.rptRatingNumberMigrate': irbs_report_rptRatingNumberMigrate, + 'irbs.report.rptRatingLoanBalanceMigrate': irbs_report_rptRatingLoanBalanceMigrate, + 'irbs.report.rptRatingIndustryFocusDist': irbs_report_rptRatingIndustryFocusDist, + 'irbs.report.rptModelMonitorDiff': irbs_report_rptModelMonitorDiff, + 'irbs.report.rptModelMonitorStable': irbs_report_rptModelMonitorStable, + 'irbs.report.rptRatingOverturn': irbs_report_rptRatingOverturn, + 'irbs.report.rptRatingAdjust': irbs_report_rptRatingAdjust, + 'irbs.report.rptModelMonitorBinomialCheck': irbs_report_rptModelMonitorBinomialCheck, }; export default localComponents; diff --git a/irbs.frontend/util-components-generator.cjs b/irbs.frontend/util-components-generator.cjs index dcf297d..884a774 100644 --- a/irbs.frontend/util-components-generator.cjs +++ b/irbs.frontend/util-components-generator.cjs @@ -13,7 +13,7 @@ content +='/**\n'; content +=' * 此文件为自动生成文件,请勿修改\n'; content +=' */\n\n'; for(const route of routesJson){ - const componentName =route.component.substring(route.component.lastIndexOf('.')+1); + const componentName =route.component.replaceAll('.','_'); const componentPath =route.componentPath; content +=`import ${componentName} from '${componentPath}';\n`; } @@ -21,7 +21,7 @@ for(const route of routesJson){ content +='\n'; content +='const localComponents = { \n'; for(const route of routesJson){ - const componentName =route.component.substring(route.component.lastIndexOf('.')+1); + const componentName =route.component.replaceAll('.','_'); content +=`'${route.component}': ${componentName},\n`; } content +='}\n\n'; @@ -29,4 +29,4 @@ content +='export default localComponents;\n'; fs.writeFileSync('./src/components/index.ts', content); -console.info('components generated!'); \ No newline at end of file +console.info('components generated!'); diff --git a/irbs.frontend/webpack.env.serve.cjs b/irbs.frontend/webpack.env.serve.cjs index b8f89d2..e3f793b 100644 --- a/irbs.frontend/webpack.env.serve.cjs +++ b/irbs.frontend/webpack.env.serve.cjs @@ -19,7 +19,7 @@ module.exports = (env)=> merge(common, mf,{ directory: path.join(__dirname, 'public'), }, compress: false, - port: 3001, + port: 3000, hot: true, // 保证在出现 404 错误时，能够导航到 index.html historyApiFallback: true, From eb97414060392d64c92f35d7d722c29a23c1bf97 Mon Sep 17 00:00:00 2001 From: likunming Date: Thu, 30 May 2024 10:37:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AF=84=E7=BA=A7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rating/jpa/support/KeyValueWrapper.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/KeyValueWrapper.java diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/KeyValueWrapper.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/KeyValueWrapper.java new file mode 100644 index 0000000..9cb67d2 --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/KeyValueWrapper.java @@ -0,0 +1,23 @@ +package irbs.cust.rating.jpa.support; + +public class KeyValueWrapper { + + private String key; + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +}