diff --git a/app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml b/app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml index cdf2b1f..6ef8ca3 100644 --- a/app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml +++ b/app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml @@ -154,5 +154,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 551f1fc..2d99057 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.1 platform_group=io.sc platform_version=8.1.44 platform_plugin_version=8.1.44 -platform_core_frontend_version=8.1.254 +platform_core_frontend_version=8.1.263 ########################################################### # product dependencies version @@ -87,4 +87,4 @@ zip4j_version=2.11.5 ########################################################### # asciidoc deploy directory,the path must end with '/' ########################################################### -asciidoc_deploy_dir=/Users/wangshaoping/wspsc/website/www/books/ +asciidoc_deploy_dir=D:/work/path/nginx-1.16.1/web/ diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java index b4c563a..f07a196 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java @@ -148,11 +148,7 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl import { ref, reactive } from 'vue'; import { useQuasar } from 'quasar'; -import { axios, Environment, NotifyManager, Formater } from 'platform-core'; +import { useI18n } from 'vue-i18n'; +import { axios, noErrorAxios, Environment, NotifyManager, Formater, Tools } from 'platform-core'; import { SelectCustomerFlag } from './CustRating.ts'; +const { t } = useI18n(); const $q = useQuasar(); const dialogRef = ref(); const customerGridRef = ref(); @@ -55,18 +57,30 @@ const dialogButtons = [ if (state.flag === SelectCustomerFlag.RATING) { // 发起评级 showLoading(); - axios - .post(Environment.apiContextPath('api/irbs/companyRating/generateRating/' + rows[0]['custNo'])) + const requestParams = { + method: 'POST', + headers: { 'content-type': 'application/json;charset=utf-8;' }, + url: Environment.apiContextPath('api/irbs/companyRating/generateRating/' + rows[0]['custNo']), + }; + noErrorAxios(requestParams) .then((resp) => { hideLoading(); - if (resp && resp['code'] === 200 && resp['data']) { - emit('refresh'); - dialogRef.value.hide(); - } + emit('refresh'); + dialogRef.value.hide(); + NotifyManager.info('发起成功'); }) .catch((error) => { - hideLoading(); - console.info('error-------------', error); + const response = error?.response; + const status = response?.status; + const data = response?.data; + //其他错误 + if (status === 500 && data.exception === 'java.lang.RuntimeException' && !Tools.isEmpty(data.errorMessage)) { + NotifyManager.error(data.errorMessage); + } else if (status === 500) { + NotifyManager.error(t(data?.errorMessageI18nKey)); + } else { + NotifyManager.error(t(status)); + } }); } else if (state.flag === SelectCustomerFlag.COGNIZANCE) { // 查询是否有在途流程 diff --git a/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue b/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue index 2e1f30f..36fc0f9 100644 --- a/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue +++ b/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue @@ -181,7 +181,7 @@ const debtActions = ['add', 'edit', 'remove']; const dialogHide = () => { state.status = 'edit'; - state.dialogTitle = '模拟计算'; + state.dialogTitle = '人工风险暴露分类'; state.tab = 'cust'; }; @@ -197,7 +197,7 @@ const loadCustInfo = (data) => { axios .get(Environment.apiContextPath('api/irbs/companyCustomer?pageable=false'), { params: urlSearchParams }) .then((resp) => { - if (resp.data?.content) { + if (resp.data?.content && resp.data?.content.length > 0) { const custInfo = resp.data.content[0]; state.custInfo = []; state.custInfo.push({ label: '客户号', value: custInfo['custNo'] }); @@ -208,6 +208,16 @@ const loadCustInfo = (data) => { state.custInfo.push({ label: '客户类型', value: custInfo['custTypeCd'] }); state.custInfo.push({ label: '成立时间', value: custInfo['buildDt'] }); state.custInfo.push({ label: '企业规模', value: custInfo['corpSizeCd'] }); + } else { + state.custInfo = []; + state.custInfo.push({ label: '客户号', value: data['custNo'] }); + state.custInfo.push({ label: '客户名称', value: data['custName'] }); + state.custInfo.push({ label: '客户经理编号', value: '009083' }); + state.custInfo.push({ label: '客户经理名称', value: '沈辉' }); + state.custInfo.push({ label: '行业类型', value: '' }); + state.custInfo.push({ label: '客户类型', value: '' }); + state.custInfo.push({ label: '成立时间', value: '1993-03-21' }); + state.custInfo.push({ label: '企业规模', value: '大型' }); } }) .catch((error) => { diff --git a/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue b/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue index 63edd21..21de635 100644 --- a/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue +++ b/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue @@ -55,7 +55,8 @@ const handmadeExposureDialogRef = ref(); const riskExposureAdjustGrid = { buttons: [ - ['query', 'separator', 'moreQuery'], + 'query', + 'separator', 'reset', 'separator', /*{ @@ -67,7 +68,7 @@ const riskExposureAdjustGrid = { },*/ { extend: 'edit', - label: '编辑', + label: '审批', enableIf: (args) => { if (args.selected && (args.selected['processStatus'] === 'TO_BE_CHECKED' || args.selected['processStatus'] === 'RETURNED')) { return true; diff --git a/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue b/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue index fc3a3db..f5fd573 100644 --- a/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue +++ b/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue @@ -10,15 +10,12 @@ :query-form-fields="riskExposureGrid.queryFormFields" :columns="riskExposureGrid.columns" :toolbar-actions="riskExposureGrid.buttons" - :pagination="{ - sortBy: 'lastModifyDate', - descending: true, - }" :query-criteria="{ fieldName: 'dataStatus', operator: 'equals', value: '1', }" + :sort-by="['-lastModifyDate']" > diff --git a/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue b/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue index 3945751..6870868 100644 --- a/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue +++ b/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue @@ -50,7 +50,8 @@ const handmadeExposureDialogRef = ref(); const riskExposureGrid = { buttons: [ - ['query', 'separator', 'moreQuery'], + 'query', + 'separator', 'reset', 'separator', /*{ @@ -62,7 +63,7 @@ const riskExposureGrid = { },*/ { extend: 'edit', - label: '编辑', + label: '审批', enableIf: (args) => { if (args.selected && (args.selected['processStatus'] === 'TO_BE_CHECKED' || args.selected['processStatus'] === 'RETURNED')) { return true; diff --git a/irbs.frontend/src/views/workbench/Task.ts b/irbs.frontend/src/views/workbench/Task.ts index 129e7b6..7c7fd34 100644 --- a/irbs.frontend/src/views/workbench/Task.ts +++ b/irbs.frontend/src/views/workbench/Task.ts @@ -5,4 +5,5 @@ export const ProcessDefKey = { RATING: 'COMPANY_CUSTOMER_RATING', // 评级流程 DEFAULT_COGNIZANCE_F: 'DEFAULT_CUSTOMER_F', // 分支行违约认定流程 DEFAULT_REBIRTH_F: 'REBIRTH_CUSTOMER_F', // 分支行违约认定流程 + RISK_EXPOSURE_FLOW: 'RISK_EXPOSURE_FLOW', // 违约暴露分类流程 }; diff --git a/irbs.frontend/src/views/workbench/TodoTask.vue b/irbs.frontend/src/views/workbench/TodoTask.vue index 59a5150..86e64bd 100644 --- a/irbs.frontend/src/views/workbench/TodoTask.vue +++ b/irbs.frontend/src/views/workbench/TodoTask.vue @@ -18,6 +18,7 @@ + @@ -27,12 +28,14 @@ import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, Noti import RatingDialog from '@/views/custRating/RatingDialog.vue'; import CognizanceDialog from '@/views/default/CognizanceDialog.vue'; import RebirthDialog from '@/views/default/RebirthDialog.vue'; +import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue'; import { ProcessDefKey } from './Task.ts'; const gridRef = ref(); const ratingDialogRef = ref(); const cognizanceDialogRef = ref(); const rebirthDialogRef = ref(); +const handmadeExposureDialogRef = ref(); const grid = { queryFormFields: [ @@ -65,6 +68,9 @@ const grid = { } else if (args.selected['PROC_DEF_KEY'] === ProcessDefKey.DEFAULT_REBIRTH_F) { // 打开违约重生流程窗口 openRebirthDialog(args.selected); + } else if (args.selected['PROC_DEF_KEY'] === ProcessDefKey.RISK_EXPOSURE_FLOW) { + // 打开违约暴露分类流程窗口 + openRiskExposureDialog(args.selected); } }, }, @@ -121,6 +127,20 @@ const openRebirthDialog = (task) => { console.info('error====', error); }); }; +const openRiskExposureDialog = (task) => { + // const urlSearchParams = new URLSearchParams(); + // urlSearchParams.append('criteria', JSON.stringify({ fieldName: 'id', operator: 'equals', value: task['BUSINESS_ID'] })); + // axios + // .get(Environment.apiContextPath('api/irbs/riskExposure?pageable=false'), { params: urlSearchParams }) + // .then((resp) => { + // if (resp.data?.content) { + // handmadeExposureDialogRef.value.show({ ...resp.data.content[0], taskId: task['ID'] }); + // } + // }) + // .catch((error) => { + // console.info('error====', error); + // }); +}; const refresh = () => { gridRef.value.refresh(); diff --git a/irbs.help.doc/asciidoc/resources/images/default/1.png b/irbs.help.doc/asciidoc/resources/images/default/1.png new file mode 100644 index 0000000..d2831c0 Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/1.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/2.png b/irbs.help.doc/asciidoc/resources/images/default/2.png new file mode 100644 index 0000000..9e1e005 Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/2.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/3.png b/irbs.help.doc/asciidoc/resources/images/default/3.png new file mode 100644 index 0000000..e818d6a Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/3.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/4.png b/irbs.help.doc/asciidoc/resources/images/default/4.png new file mode 100644 index 0000000..ffedbdb Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/4.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/5.png b/irbs.help.doc/asciidoc/resources/images/default/5.png new file mode 100644 index 0000000..dc4bf2a Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/5.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/6.png b/irbs.help.doc/asciidoc/resources/images/default/6.png new file mode 100644 index 0000000..bc79bbf Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/6.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/7.png b/irbs.help.doc/asciidoc/resources/images/default/7.png new file mode 100644 index 0000000..09c9c38 Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/7.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/8.png b/irbs.help.doc/asciidoc/resources/images/default/8.png new file mode 100644 index 0000000..a63ad5a Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/8.png differ diff --git a/irbs.help.doc/asciidoc/resources/images/default/9.png b/irbs.help.doc/asciidoc/resources/images/default/9.png new file mode 100644 index 0000000..b027290 Binary files /dev/null and b/irbs.help.doc/asciidoc/resources/images/default/9.png differ diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptModelBinomialCheckService.java b/irbs.reports/src/main/java/irbs/reports/service/RptModelBinomialCheckService.java index fca7f19..0f373a7 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptModelBinomialCheckService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptModelBinomialCheckService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptModelBinomialCheckService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorDiffService.java b/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorDiffService.java index de24e68..be4831f 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorDiffService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorDiffService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptModelMonitorDiffService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorStableService.java b/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorStableService.java index db0640a..fc2d0eb 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorStableService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorStableService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptModelMonitorStableService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingAdjustService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingAdjustService.java index f3127f8..7029096 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingAdjustService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingAdjustService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingAdjustService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingDistributionService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingDistributionService.java index 1eaae92..3b476d3 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingDistributionService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingDistributionService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingDistributionService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingIndustryFocusDistService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingIndustryFocusDistService.java index c991760..8098a35 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingIndustryFocusDistService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingIndustryFocusDistService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingIndustryFocusDistService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingLoanBalanceMigrateService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingLoanBalanceMigrateService.java index b4b08e1..fa71622 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingLoanBalanceMigrateService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingLoanBalanceMigrateService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingLoanBalanceMigrateService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingModelFocusDistService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingModelFocusDistService.java index 0cafb60..959c8ef 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingModelFocusDistService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingModelFocusDistService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingModelFocusDistService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingNumberMigrateService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingNumberMigrateService.java index d6e0c02..87899b6 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingNumberMigrateService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingNumberMigrateService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingNumberMigrateService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingOrgFocusDistService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingOrgFocusDistService.java index 3363522..c875cf1 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingOrgFocusDistService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingOrgFocusDistService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingOrgFocusDistService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/RptRatingOverturnService.java b/irbs.reports/src/main/java/irbs/reports/service/RptRatingOverturnService.java index 0e4c961..7c1af8b 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/RptRatingOverturnService.java +++ b/irbs.reports/src/main/java/irbs/reports/service/RptRatingOverturnService.java @@ -8,5 +8,5 @@ import java.util.List; public interface RptRatingOverturnService { - public List query(QueryParams queryParams) throws SQLException; + public List query(QueryParams queryParams) throws Exception; } diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelBinomialCheckServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelBinomialCheckServiceImpl.java index 8541e0e..78f392b 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelBinomialCheckServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelBinomialCheckServiceImpl.java @@ -1,6 +1,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptModelBinomialCheckVo; @@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.HashMap; @@ -31,8 +33,11 @@ public class RptModelBinomialCheckServiceImpl implements RptModelBinomialCheckSe private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; + @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); @@ -41,9 +46,10 @@ public class RptModelBinomialCheckServiceImpl implements RptModelBinomialCheckSe if(StringUtil.isEmpty(queryParams.getModelCode())){ queryParams.setModelCode("WHM8"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorBinomialCheck", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorBinomialCheck", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorDiffServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorDiffServiceImpl.java index 49fa31f..5a7435d 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorDiffServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorDiffServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptModelMonitorDiffVo; @@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -31,8 +33,11 @@ public class RptModelMonitorDiffServiceImpl implements RptModelMonitorDiffServic private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; + @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); @@ -45,9 +50,10 @@ public class RptModelMonitorDiffServiceImpl implements RptModelMonitorDiffServic if(StringUtil.isEmpty(queryParams.getModelCode())){ queryParams.setModelCode("WHM18"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorDiff", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorDiff", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorStableServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorStableServiceImpl.java index bbb86cd..d65610d 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorStableServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorStableServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptModelMonitorStableVo; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -30,8 +32,11 @@ public class RptModelMonitorStableServiceImpl implements RptModelMonitorStableSe private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; + @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); @@ -40,9 +45,10 @@ public class RptModelMonitorStableServiceImpl implements RptModelMonitorStableSe if(StringUtil.isEmpty(queryParams.getModelCode())){ queryParams.setModelCode("WHM18"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorStable", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorStable", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingAdjustServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingAdjustServiceImpl.java index 1e3bdfc..0af41fe 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingAdjustServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingAdjustServiceImpl.java @@ -1,6 +1,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptRatingAdjustVo; @@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.HashMap; @@ -31,15 +33,19 @@ public class RptRatingAdjustServiceImpl implements RptRatingAdjustService { private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; + @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingAdjust", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingAdjust", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingDistributionServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingDistributionServiceImpl.java index 2b05471..a6277be 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingDistributionServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingDistributionServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptRatingDistributionVo; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.text.MessageFormat; @@ -31,15 +33,19 @@ public class RptRatingDistributionServiceImpl implements RptRatingDistributionSe private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; + @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingDistribution", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingDistribution", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingIndustryFocusDistServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingIndustryFocusDistServiceImpl.java index 735a427..861f4de 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingIndustryFocusDistServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingIndustryFocusDistServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptRatingIndustryFocusDistVo; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -30,15 +32,19 @@ public class RptRatingIndustryFocusDistServiceImpl implements RptRatingIndustryF private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; + @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingIndustryFocusDist", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingIndustryFocusDist", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingLoanBalanceMigrateServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingLoanBalanceMigrateServiceImpl.java index 13ebc8f..8c1712a 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingLoanBalanceMigrateServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingLoanBalanceMigrateServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptRatingLoanBalanceMigrateVo; @@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -31,15 +33,18 @@ public class RptRatingLoanBalanceMigrateServiceImpl implements RptRatingLoanBala private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingLoanBalanceMigrate", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingLoanBalanceMigrate", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingModelFocusDistServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingModelFocusDistServiceImpl.java index bbe56e3..96df8a1 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingModelFocusDistServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingModelFocusDistServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptRatingDistributionVoRowMapper; @@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -31,15 +33,18 @@ public class RptRatingModelFocusDistServiceImpl implements RptRatingModelFocusDi private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingModelFocusDist", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingModelFocusDist", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingNumberMigrateServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingNumberMigrateServiceImpl.java index ce43bf7..323a6c2 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingNumberMigrateServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingNumberMigrateServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptRatingNumberMigrateVo; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -30,15 +32,18 @@ public class RptRatingNumberMigrateServiceImpl implements RptRatingNumberMigrate private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingNumberMigrate", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingNumberMigrate", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOrgFocusDistServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOrgFocusDistServiceImpl.java index ab763a3..9ce2ea1 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOrgFocusDistServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOrgFocusDistServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptRatingOrgFocusDistVo; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -30,15 +32,18 @@ public class RptRatingOrgFocusDistServiceImpl implements RptRatingOrgFocusDistSe private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOrgFocusDist", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOrgFocusDist", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOverturnServiceImpl.java b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOverturnServiceImpl.java index d8026e5..f05de23 100644 --- a/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOverturnServiceImpl.java +++ b/irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOverturnServiceImpl.java @@ -2,6 +2,7 @@ package irbs.reports.service.impl; import dm.jdbc.util.StringUtil; import io.sc.platform.core.util.DateUtil; +import io.sc.platform.jdbc.DatabaseType; import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.support.RptModelMonitorDiffVo; @@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import javax.sql.DataSource; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.Date; @@ -33,15 +35,18 @@ public class RptRatingOverturnServiceImpl implements RptRatingOverturnService { private JdbcTemplate jdbcTemplate; @Autowired private ReportSqlConfigRepository reportSqlConfigRepository; + @Autowired + private DataSource dataSource; @Override - public List query(QueryParams queryParams) throws SQLException { + public List query(QueryParams queryParams) throws Exception { //设置默认查询条件,默认查询当前所在月份的数据 if(StringUtil.isEmpty(queryParams.getRatingMonth())){ queryParams.setRatingMonth("2023-07-01"); } - DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); - String dataBaseType = md.getDatabaseProductName(); - ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOverturn", dataBaseType); +// DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); +// String dataBaseType = md.getDatabaseProductName(); + DatabaseType type = DatabaseType.fromMetaData(dataSource); + ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOverturn", type.getProductName()); if(reportSqlConfig != null){ String sql = reportSqlConfig.getSqlText(); Map params = new HashMap<>(); diff --git a/irbs.riskExposure/src/main/java/irbs/riskExposure/controller/RiskExposureController.java b/irbs.riskExposure/src/main/java/irbs/riskExposure/controller/RiskExposureController.java index 08e1a15..d8ad49b 100644 --- a/irbs.riskExposure/src/main/java/irbs/riskExposure/controller/RiskExposureController.java +++ b/irbs.riskExposure/src/main/java/irbs/riskExposure/controller/RiskExposureController.java @@ -3,8 +3,11 @@ package irbs.riskExposure.controller; import io.sc.platform.flowable.controller.support.ProcessProperties; import io.sc.platform.flowable.support.CompleteTaskException; import io.sc.platform.flowable.support.CompleteTaskResponse; +import io.sc.platform.mvc.controller.support.RestCrudController; import io.sc.platform.orm.service.support.QueryParameter; import irbs.riskExposure.jpa.entity.RiskExposure; +import irbs.riskExposure.jpa.repository.RiskExposureRepository; +import irbs.riskExposure.jpa.vo.RiskExposureVo; import irbs.riskExposure.service.RiskExposureAdjustService; import irbs.riskExposure.service.RiskExposureProcessService; import irbs.riskExposure.service.RiskExposureService; @@ -16,7 +19,7 @@ import java.util.Map; @RestController @RequestMapping("/api/irbs/riskExposure") -public class RiskExposureController { +public class RiskExposureController extends RestCrudController { @Autowired private RiskExposureService riskExposureService; diff --git a/irbs.riskExposure/src/main/java/irbs/riskExposure/jpa/entity/RiskExposure.java b/irbs.riskExposure/src/main/java/irbs/riskExposure/jpa/entity/RiskExposure.java index b3745bb..58159e8 100644 --- a/irbs.riskExposure/src/main/java/irbs/riskExposure/jpa/entity/RiskExposure.java +++ b/irbs.riskExposure/src/main/java/irbs/riskExposure/jpa/entity/RiskExposure.java @@ -1,5 +1,6 @@ package irbs.riskExposure.jpa.entity; +import io.sc.platform.orm.api.vo.CorporationAuditorVo; import io.sc.platform.orm.entity.CorporationAuditorEntity; import irbs.riskExposure.jpa.vo.RiskExposureVo; import org.hibernate.annotations.GenericGenerator; @@ -136,6 +137,11 @@ public class RiskExposure extends CorporationAuditorEntity { @Transient private String taskId; + @Override + public void toVo(CorporationAuditorVo vo) { + super.toVo(vo); + } + public String getId() { return id; } diff --git a/settings.gradle b/settings.gradle index 5b65661..1c68e67 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ include 'irbs.defaultManager' include 'irbs.deptRating' include 'irbs.feature' include 'irbs.frontend' +include 'irbs.help.doc' include 'irbs.reports' include 'irbs.riskExposure' include 'irbs.feature' \ No newline at end of file