Browse Source

修改长度

main
likunming 8 months ago
parent
commit
667c9da5fa
  1. 26
      app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml
  2. 4
      gradle.properties
  3. 33
      irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java
  4. 2
      irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/ModelLibServiceImpl.java
  5. 3
      irbs.cust.rating/src/main/resources/META-INF/platform/plugins/liquibase.json
  6. 32
      irbs.frontend/src/views/custRating/LaunchRatingDialog.vue
  7. 14
      irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue
  8. 5
      irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue
  9. 5
      irbs.frontend/src/views/riskExposure/RiskExposureApply.vue
  10. 5
      irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue
  11. 1
      irbs.frontend/src/views/workbench/Task.ts
  12. 20
      irbs.frontend/src/views/workbench/TodoTask.vue
  13. BIN
      irbs.help.doc/asciidoc/resources/images/default/1.png
  14. BIN
      irbs.help.doc/asciidoc/resources/images/default/2.png
  15. BIN
      irbs.help.doc/asciidoc/resources/images/default/3.png
  16. BIN
      irbs.help.doc/asciidoc/resources/images/default/4.png
  17. BIN
      irbs.help.doc/asciidoc/resources/images/default/5.png
  18. BIN
      irbs.help.doc/asciidoc/resources/images/default/6.png
  19. BIN
      irbs.help.doc/asciidoc/resources/images/default/7.png
  20. BIN
      irbs.help.doc/asciidoc/resources/images/default/8.png
  21. BIN
      irbs.help.doc/asciidoc/resources/images/default/9.png
  22. 2
      irbs.reports/src/main/java/irbs/reports/service/RptModelBinomialCheckService.java
  23. 2
      irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorDiffService.java
  24. 2
      irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorStableService.java
  25. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingAdjustService.java
  26. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingDistributionService.java
  27. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingIndustryFocusDistService.java
  28. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingLoanBalanceMigrateService.java
  29. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingModelFocusDistService.java
  30. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingNumberMigrateService.java
  31. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingOrgFocusDistService.java
  32. 2
      irbs.reports/src/main/java/irbs/reports/service/RptRatingOverturnService.java
  33. 14
      irbs.reports/src/main/java/irbs/reports/service/impl/RptModelBinomialCheckServiceImpl.java
  34. 14
      irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorDiffServiceImpl.java
  35. 14
      irbs.reports/src/main/java/irbs/reports/service/impl/RptModelMonitorStableServiceImpl.java
  36. 14
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingAdjustServiceImpl.java
  37. 14
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingDistributionServiceImpl.java
  38. 14
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingIndustryFocusDistServiceImpl.java
  39. 13
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingLoanBalanceMigrateServiceImpl.java
  40. 13
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingModelFocusDistServiceImpl.java
  41. 13
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingNumberMigrateServiceImpl.java
  42. 13
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOrgFocusDistServiceImpl.java
  43. 13
      irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingOverturnServiceImpl.java
  44. 5
      irbs.riskExposure/src/main/java/irbs/riskExposure/controller/RiskExposureController.java
  45. 6
      irbs.riskExposure/src/main/java/irbs/riskExposure/jpa/entity/RiskExposure.java
  46. 1
      settings.gradle

26
app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml

@ -154,5 +154,31 @@
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange"> <customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_TEMP_GRID_FIELD_IRS.csv"/> <param name="dataFile" value="classpath:/liquibase/data/irbs/SYS_TEMP_GRID_FIELD_IRS.csv"/>
</customChange> </customChange>
<!-- 上农POC start-->
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/ENT_INFO.csv"/>
</customChange>
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/REPORT_RECORD.csv"/>
</customChange>
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/REPORT_DATA.csv"/>
</customChange>
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/CUSTOMER_FSRECORD.csv"/>
</customChange>
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/DEFAULT_APP.csv"/>
</customChange>
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/DEFAULT_EVENT.csv"/>
</customChange>
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/DEFAULT_EVENT_TYPE.csv"/>
</customChange>
<customChange class="io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange">
<param name="dataFile" value="classpath:/liquibase/data/irbs/shrcb/DEFAULT_EVENT_APP_RELA.csv"/>
</customChange>
<!-- 上农POC end-->
</changeSet> </changeSet>
</databaseChangeLog> </databaseChangeLog>

4
gradle.properties

@ -38,7 +38,7 @@ application_version=1.0.1
platform_group=io.sc platform_group=io.sc
platform_version=8.1.44 platform_version=8.1.44
platform_plugin_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 # product dependencies version
@ -87,4 +87,4 @@ zip4j_version=2.11.5
########################################################### ###########################################################
# asciidoc deploy directory,the path must end with '/' # 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/

33
irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java

@ -148,11 +148,7 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl<CompanyRating, Stri
// 生成步骤 // 生成步骤
ratingStepService.genAndSaveRatingSteps(companyRating); ratingStepService.genAndSaveRatingSteps(companyRating);
try { initCompanyRating(companyRating, customer, modelCode);
initCompanyRating(companyRating, customer, modelCode);
} catch (Exception e) {
throw e;
}
} }
return companyRating; return companyRating;
} }
@ -266,22 +262,17 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl<CompanyRating, Stri
} }
public void initCompanyRating(CompanyRating companyRating, RatingCompanyCustomer ratingCustomer, String modelCode) throws Exception { public void initCompanyRating(CompanyRating companyRating, RatingCompanyCustomer ratingCustomer, String modelCode) throws Exception {
try { updRatingStep(companyRating,RatingStepType.IN_INIT.getText());
updRatingStep(companyRating,RatingStepType.IN_INIT.getText()); // 计算财报指标
// 计算财报指标 financeReportIndexService.calculateFinanceIndex(ratingCustomer);
financeReportIndexService.calculateFinanceIndex(ratingCustomer); // 获取模型资源
// 获取模型资源 ModelResource modelResource = modelCode==null?modelLibService.getModelResource(ratingCustomer, false):modelLibService.getModelResource(modelCode);
ModelResource modelResource = modelCode==null?modelLibService.getModelResource(ratingCustomer, false):modelLibService.getModelResource(modelCode); // 初始化评级步骤指标、调整项
// 初始化评级步骤指标、调整项 ratingStepService.genAndSaveStepIndices(companyRating, modelResource);
ratingStepService.genAndSaveStepIndices(companyRating, modelResource); // 启动流程
// 启动流程 startProcess(companyRating);
startProcess(companyRating); // 补充完整并保存待评级数据
// 补充完整并保存待评级数据 completeAndSaveRating(companyRating, modelResource);
completeAndSaveRating(companyRating, modelResource);
} catch (Exception e) {
e.printStackTrace();
throw e;
}
} }
/** /**

2
irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/ModelLibServiceImpl.java

@ -81,7 +81,7 @@ public class ModelLibServiceImpl implements ModelLibService {
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println(e); System.out.println(e);
throw new Exception("调用评级模型选择计算出错," + e.getMessage()); throw new RuntimeException("调用评级模型选择计算出错," + e.getMessage());
} }
// 解析获得模型路由结果 // 解析获得模型路由结果

3
irbs.cust.rating/src/main/resources/META-INF/platform/plugins/liquibase.json

@ -32,7 +32,8 @@
"locations":[ "locations":[
"liquibase/20240321_CUST_RATING_DDL.xml", "liquibase/20240321_CUST_RATING_DDL.xml",
"liquibase/20240326_INDUSTRY_DDL.xml", "liquibase/20240326_INDUSTRY_DDL.xml",
"liquibase/20240327_FINANCE_REPORT_DDL.xml" "liquibase/20240327_FINANCE_REPORT_DDL.xml",
"liquibase/RE_1.0.0_20220515__SN IRS Database Schema DDL.xml"
] ]
} }
] ]

32
irbs.frontend/src/views/custRating/LaunchRatingDialog.vue

@ -21,9 +21,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive } from 'vue'; import { ref, reactive } from 'vue';
import { useQuasar } from 'quasar'; 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'; import { SelectCustomerFlag } from './CustRating.ts';
const { t } = useI18n();
const $q = useQuasar(); const $q = useQuasar();
const dialogRef = ref(); const dialogRef = ref();
const customerGridRef = ref(); const customerGridRef = ref();
@ -55,18 +57,30 @@ const dialogButtons = [
if (state.flag === SelectCustomerFlag.RATING) { if (state.flag === SelectCustomerFlag.RATING) {
// //
showLoading(); showLoading();
axios const requestParams = {
.post(Environment.apiContextPath('api/irbs/companyRating/generateRating/' + rows[0]['custNo'])) method: 'POST',
headers: { 'content-type': 'application/json;charset=utf-8;' },
url: Environment.apiContextPath('api/irbs/companyRating/generateRating/' + rows[0]['custNo']),
};
noErrorAxios(requestParams)
.then((resp) => { .then((resp) => {
hideLoading(); hideLoading();
if (resp && resp['code'] === 200 && resp['data']) { emit('refresh');
emit('refresh'); dialogRef.value.hide();
dialogRef.value.hide(); NotifyManager.info('发起成功');
}
}) })
.catch((error) => { .catch((error) => {
hideLoading(); const response = error?.response;
console.info('error-------------', error); 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) { } else if (state.flag === SelectCustomerFlag.COGNIZANCE) {
// //

14
irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue

@ -181,7 +181,7 @@ const debtActions = ['add', 'edit', 'remove'];
const dialogHide = () => { const dialogHide = () => {
state.status = 'edit'; state.status = 'edit';
state.dialogTitle = '模拟计算'; state.dialogTitle = '人工风险暴露分类';
state.tab = 'cust'; state.tab = 'cust';
}; };
@ -197,7 +197,7 @@ const loadCustInfo = (data) => {
axios axios
.get(Environment.apiContextPath('api/irbs/companyCustomer?pageable=false'), { params: urlSearchParams }) .get(Environment.apiContextPath('api/irbs/companyCustomer?pageable=false'), { params: urlSearchParams })
.then((resp) => { .then((resp) => {
if (resp.data?.content) { if (resp.data?.content && resp.data?.content.length > 0) {
const custInfo = resp.data.content[0]; const custInfo = resp.data.content[0];
state.custInfo = []; state.custInfo = [];
state.custInfo.push({ label: '客户号', value: custInfo['custNo'] }); 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['custTypeCd'] });
state.custInfo.push({ label: '成立时间', value: custInfo['buildDt'] }); state.custInfo.push({ label: '成立时间', value: custInfo['buildDt'] });
state.custInfo.push({ label: '企业规模', value: custInfo['corpSizeCd'] }); 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) => { .catch((error) => {

5
irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue

@ -55,7 +55,8 @@ const handmadeExposureDialogRef = ref();
const riskExposureAdjustGrid = { const riskExposureAdjustGrid = {
buttons: [ buttons: [
['query', 'separator', 'moreQuery'], 'query',
'separator',
'reset', 'reset',
'separator', 'separator',
/*{ /*{
@ -67,7 +68,7 @@ const riskExposureAdjustGrid = {
},*/ },*/
{ {
extend: 'edit', extend: 'edit',
label: '编辑', label: '审批',
enableIf: (args) => { enableIf: (args) => {
if (args.selected && (args.selected['processStatus'] === 'TO_BE_CHECKED' || args.selected['processStatus'] === 'RETURNED')) { if (args.selected && (args.selected['processStatus'] === 'TO_BE_CHECKED' || args.selected['processStatus'] === 'RETURNED')) {
return true; return true;

5
irbs.frontend/src/views/riskExposure/RiskExposureApply.vue

@ -10,15 +10,12 @@
:query-form-fields="riskExposureGrid.queryFormFields" :query-form-fields="riskExposureGrid.queryFormFields"
:columns="riskExposureGrid.columns" :columns="riskExposureGrid.columns"
:toolbar-actions="riskExposureGrid.buttons" :toolbar-actions="riskExposureGrid.buttons"
:pagination="{
sortBy: 'lastModifyDate',
descending: true,
}"
:query-criteria="{ :query-criteria="{
fieldName: 'dataStatus', fieldName: 'dataStatus',
operator: 'equals', operator: 'equals',
value: '1', value: '1',
}" }"
:sort-by="['-lastModifyDate']"
></w-grid> ></w-grid>
<LaunchExposureDialog ref="launchExposureDialogRef" @refresh="refreshTable"></LaunchExposureDialog> <LaunchExposureDialog ref="launchExposureDialogRef" @refresh="refreshTable"></LaunchExposureDialog>
<HandmadeExposureDialog ref="handmadeExposureDialogRef" @refresh="refreshTable"></HandmadeExposureDialog> <HandmadeExposureDialog ref="handmadeExposureDialogRef" @refresh="refreshTable"></HandmadeExposureDialog>

5
irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue

@ -50,7 +50,8 @@ const handmadeExposureDialogRef = ref();
const riskExposureGrid = { const riskExposureGrid = {
buttons: [ buttons: [
['query', 'separator', 'moreQuery'], 'query',
'separator',
'reset', 'reset',
'separator', 'separator',
/*{ /*{
@ -62,7 +63,7 @@ const riskExposureGrid = {
},*/ },*/
{ {
extend: 'edit', extend: 'edit',
label: '编辑', label: '审批',
enableIf: (args) => { enableIf: (args) => {
if (args.selected && (args.selected['processStatus'] === 'TO_BE_CHECKED' || args.selected['processStatus'] === 'RETURNED')) { if (args.selected && (args.selected['processStatus'] === 'TO_BE_CHECKED' || args.selected['processStatus'] === 'RETURNED')) {
return true; return true;

1
irbs.frontend/src/views/workbench/Task.ts

@ -5,4 +5,5 @@ export const ProcessDefKey = {
RATING: 'COMPANY_CUSTOMER_RATING', // 评级流程 RATING: 'COMPANY_CUSTOMER_RATING', // 评级流程
DEFAULT_COGNIZANCE_F: 'DEFAULT_CUSTOMER_F', // 分支行违约认定流程 DEFAULT_COGNIZANCE_F: 'DEFAULT_CUSTOMER_F', // 分支行违约认定流程
DEFAULT_REBIRTH_F: 'REBIRTH_CUSTOMER_F', // 分支行违约认定流程 DEFAULT_REBIRTH_F: 'REBIRTH_CUSTOMER_F', // 分支行违约认定流程
RISK_EXPOSURE_FLOW: 'RISK_EXPOSURE_FLOW', // 违约暴露分类流程
}; };

20
irbs.frontend/src/views/workbench/TodoTask.vue

@ -18,6 +18,7 @@
<RatingDialog ref="ratingDialogRef" @refresh="refresh"></RatingDialog> <RatingDialog ref="ratingDialogRef" @refresh="refresh"></RatingDialog>
<CognizanceDialog ref="cognizanceDialogRef" @refresh="refresh"></CognizanceDialog> <CognizanceDialog ref="cognizanceDialogRef" @refresh="refresh"></CognizanceDialog>
<RebirthDialog ref="rebirthDialogRef" @refresh="refresh"></RebirthDialog> <RebirthDialog ref="rebirthDialogRef" @refresh="refresh"></RebirthDialog>
<HandmadeExposureDialog ref="handmadeExposureDialogRef" @refresh="refresh"></HandmadeExposureDialog>
</div> </div>
</template> </template>
@ -27,12 +28,14 @@ import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, Noti
import RatingDialog from '@/views/custRating/RatingDialog.vue'; import RatingDialog from '@/views/custRating/RatingDialog.vue';
import CognizanceDialog from '@/views/default/CognizanceDialog.vue'; import CognizanceDialog from '@/views/default/CognizanceDialog.vue';
import RebirthDialog from '@/views/default/RebirthDialog.vue'; import RebirthDialog from '@/views/default/RebirthDialog.vue';
import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue';
import { ProcessDefKey } from './Task.ts'; import { ProcessDefKey } from './Task.ts';
const gridRef = ref(); const gridRef = ref();
const ratingDialogRef = ref(); const ratingDialogRef = ref();
const cognizanceDialogRef = ref(); const cognizanceDialogRef = ref();
const rebirthDialogRef = ref(); const rebirthDialogRef = ref();
const handmadeExposureDialogRef = ref();
const grid = { const grid = {
queryFormFields: [ queryFormFields: [
@ -65,6 +68,9 @@ const grid = {
} else if (args.selected['PROC_DEF_KEY'] === ProcessDefKey.DEFAULT_REBIRTH_F) { } else if (args.selected['PROC_DEF_KEY'] === ProcessDefKey.DEFAULT_REBIRTH_F) {
// //
openRebirthDialog(args.selected); 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); 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 = () => { const refresh = () => {
gridRef.value.refresh(); gridRef.value.refresh();

BIN
irbs.help.doc/asciidoc/resources/images/default/1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 270 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/4.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/5.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/6.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/7.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/8.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

BIN
irbs.help.doc/asciidoc/resources/images/default/9.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 KiB

2
irbs.reports/src/main/java/irbs/reports/service/RptModelBinomialCheckService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptModelBinomialCheckService { public interface RptModelBinomialCheckService {
public List<RptModelBinomialCheckVo> query(QueryParams queryParams) throws SQLException; public List<RptModelBinomialCheckVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorDiffService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptModelMonitorDiffService { public interface RptModelMonitorDiffService {
public List<RptModelMonitorDiffVo> query(QueryParams queryParams) throws SQLException; public List<RptModelMonitorDiffVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptModelMonitorStableService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptModelMonitorStableService { public interface RptModelMonitorStableService {
public List<RptModelMonitorStableVo> query(QueryParams queryParams) throws SQLException; public List<RptModelMonitorStableVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingAdjustService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingAdjustService { public interface RptRatingAdjustService {
public List<RptRatingAdjustVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingAdjustVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingDistributionService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingDistributionService { public interface RptRatingDistributionService {
public List<RptRatingDistributionVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingDistributionVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingIndustryFocusDistService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingIndustryFocusDistService { public interface RptRatingIndustryFocusDistService {
public List<RptRatingIndustryFocusDistVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingIndustryFocusDistVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingLoanBalanceMigrateService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingLoanBalanceMigrateService { public interface RptRatingLoanBalanceMigrateService {
public List<RptRatingLoanBalanceMigrateVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingLoanBalanceMigrateVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingModelFocusDistService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingModelFocusDistService { public interface RptRatingModelFocusDistService {
public List<RptRatingModelFocusDistVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingModelFocusDistVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingNumberMigrateService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingNumberMigrateService { public interface RptRatingNumberMigrateService {
public List<RptRatingNumberMigrateVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingNumberMigrateVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingOrgFocusDistService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingOrgFocusDistService { public interface RptRatingOrgFocusDistService {
public List<RptRatingOrgFocusDistVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingOrgFocusDistVo> query(QueryParams queryParams) throws Exception;
} }

2
irbs.reports/src/main/java/irbs/reports/service/RptRatingOverturnService.java

@ -8,5 +8,5 @@ import java.util.List;
public interface RptRatingOverturnService { public interface RptRatingOverturnService {
public List<RptRatingOverturnVo> query(QueryParams queryParams) throws SQLException; public List<RptRatingOverturnVo> query(QueryParams queryParams) throws Exception;
} }

14
irbs.reports/src/main/java/irbs/reports/service/impl/RptModelBinomialCheckServiceImpl.java

@ -1,6 +1,7 @@
package irbs.reports.service.impl; package irbs.reports.service.impl;
import dm.jdbc.util.StringUtil; import dm.jdbc.util.StringUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptModelBinomialCheckVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
@ -31,8 +33,11 @@ public class RptModelBinomialCheckServiceImpl implements RptModelBinomialCheckSe
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptModelBinomialCheckVo> query(QueryParams queryParams) throws SQLException { public List<RptModelBinomialCheckVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
@ -41,9 +46,10 @@ public class RptModelBinomialCheckServiceImpl implements RptModelBinomialCheckSe
if(StringUtil.isEmpty(queryParams.getModelCode())){ if(StringUtil.isEmpty(queryParams.getModelCode())){
queryParams.setModelCode("WHM8"); queryParams.setModelCode("WHM8");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorBinomialCheck", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorBinomialCheck", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

14
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptModelMonitorDiffVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -31,8 +33,11 @@ public class RptModelMonitorDiffServiceImpl implements RptModelMonitorDiffServic
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptModelMonitorDiffVo> query(QueryParams queryParams) throws SQLException { public List<RptModelMonitorDiffVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
@ -45,9 +50,10 @@ public class RptModelMonitorDiffServiceImpl implements RptModelMonitorDiffServic
if(StringUtil.isEmpty(queryParams.getModelCode())){ if(StringUtil.isEmpty(queryParams.getModelCode())){
queryParams.setModelCode("WHM18"); queryParams.setModelCode("WHM18");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorDiff", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorDiff", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

14
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptModelMonitorStableVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -30,8 +32,11 @@ public class RptModelMonitorStableServiceImpl implements RptModelMonitorStableSe
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptModelMonitorStableVo> query(QueryParams queryParams) throws SQLException { public List<RptModelMonitorStableVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
@ -40,9 +45,10 @@ public class RptModelMonitorStableServiceImpl implements RptModelMonitorStableSe
if(StringUtil.isEmpty(queryParams.getModelCode())){ if(StringUtil.isEmpty(queryParams.getModelCode())){
queryParams.setModelCode("WHM18"); queryParams.setModelCode("WHM18");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorStable", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptModelMonitorStable", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

14
irbs.reports/src/main/java/irbs/reports/service/impl/RptRatingAdjustServiceImpl.java

@ -1,6 +1,7 @@
package irbs.reports.service.impl; package irbs.reports.service.impl;
import dm.jdbc.util.StringUtil; import dm.jdbc.util.StringUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptRatingAdjustVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
@ -31,15 +33,19 @@ public class RptRatingAdjustServiceImpl implements RptRatingAdjustService {
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingAdjustVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingAdjustVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingAdjust", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingAdjust", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

14
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptRatingDistributionVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.MessageFormat; import java.text.MessageFormat;
@ -31,15 +33,19 @@ public class RptRatingDistributionServiceImpl implements RptRatingDistributionSe
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingDistributionVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingDistributionVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingDistribution", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingDistribution", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

14
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptRatingIndustryFocusDistVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -30,15 +32,19 @@ public class RptRatingIndustryFocusDistServiceImpl implements RptRatingIndustryF
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingIndustryFocusDistVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingIndustryFocusDistVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingIndustryFocusDist", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingIndustryFocusDist", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

13
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptRatingLoanBalanceMigrateVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -31,15 +33,18 @@ public class RptRatingLoanBalanceMigrateServiceImpl implements RptRatingLoanBala
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingLoanBalanceMigrateVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingLoanBalanceMigrateVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingLoanBalanceMigrate", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingLoanBalanceMigrate", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

13
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptRatingDistributionVoRowMapper; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -31,15 +33,18 @@ public class RptRatingModelFocusDistServiceImpl implements RptRatingModelFocusDi
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingModelFocusDistVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingModelFocusDistVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingModelFocusDist", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingModelFocusDist", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

13
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptRatingNumberMigrateVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -30,15 +32,18 @@ public class RptRatingNumberMigrateServiceImpl implements RptRatingNumberMigrate
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingNumberMigrateVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingNumberMigrateVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingNumberMigrate", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingNumberMigrate", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

13
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptRatingOrgFocusDistVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -30,15 +32,18 @@ public class RptRatingOrgFocusDistServiceImpl implements RptRatingOrgFocusDistSe
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingOrgFocusDistVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingOrgFocusDistVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOrgFocusDist", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOrgFocusDist", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

13
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 dm.jdbc.util.StringUtil;
import io.sc.platform.core.util.DateUtil; import io.sc.platform.core.util.DateUtil;
import io.sc.platform.jdbc.DatabaseType;
import irbs.reports.jpa.entity.ReportSqlConfig; import irbs.reports.jpa.entity.ReportSqlConfig;
import irbs.reports.jpa.repository.ReportSqlConfigRepository; import irbs.reports.jpa.repository.ReportSqlConfigRepository;
import irbs.reports.jpa.support.RptModelMonitorDiffVo; 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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Date; import java.util.Date;
@ -33,15 +35,18 @@ public class RptRatingOverturnServiceImpl implements RptRatingOverturnService {
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Autowired @Autowired
private ReportSqlConfigRepository reportSqlConfigRepository; private ReportSqlConfigRepository reportSqlConfigRepository;
@Autowired
private DataSource dataSource;
@Override @Override
public List<RptRatingOverturnVo> query(QueryParams queryParams) throws SQLException { public List<RptRatingOverturnVo> query(QueryParams queryParams) throws Exception {
//设置默认查询条件,默认查询当前所在月份的数据 //设置默认查询条件,默认查询当前所在月份的数据
if(StringUtil.isEmpty(queryParams.getRatingMonth())){ if(StringUtil.isEmpty(queryParams.getRatingMonth())){
queryParams.setRatingMonth("2023-07-01"); queryParams.setRatingMonth("2023-07-01");
} }
DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData(); // DatabaseMetaData md = jdbcTemplate.getDataSource().getConnection().getMetaData();
String dataBaseType = md.getDatabaseProductName(); // String dataBaseType = md.getDatabaseProductName();
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOverturn", dataBaseType); DatabaseType type = DatabaseType.fromMetaData(dataSource);
ReportSqlConfig reportSqlConfig = reportSqlConfigRepository.findByReportIdAndDataBaseType("rptRatingOverturn", type.getProductName());
if(reportSqlConfig != null){ if(reportSqlConfig != null){
String sql = reportSqlConfig.getSqlText(); String sql = reportSqlConfig.getSqlText();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();

5
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.controller.support.ProcessProperties;
import io.sc.platform.flowable.support.CompleteTaskException; import io.sc.platform.flowable.support.CompleteTaskException;
import io.sc.platform.flowable.support.CompleteTaskResponse; import io.sc.platform.flowable.support.CompleteTaskResponse;
import io.sc.platform.mvc.controller.support.RestCrudController;
import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.service.support.QueryParameter;
import irbs.riskExposure.jpa.entity.RiskExposure; 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.RiskExposureAdjustService;
import irbs.riskExposure.service.RiskExposureProcessService; import irbs.riskExposure.service.RiskExposureProcessService;
import irbs.riskExposure.service.RiskExposureService; import irbs.riskExposure.service.RiskExposureService;
@ -16,7 +19,7 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/api/irbs/riskExposure") @RequestMapping("/api/irbs/riskExposure")
public class RiskExposureController { public class RiskExposureController extends RestCrudController<RiskExposureVo, RiskExposure, String, RiskExposureRepository, RiskExposureService> {
@Autowired @Autowired
private RiskExposureService riskExposureService; private RiskExposureService riskExposureService;

6
irbs.riskExposure/src/main/java/irbs/riskExposure/jpa/entity/RiskExposure.java

@ -1,5 +1,6 @@
package irbs.riskExposure.jpa.entity; package irbs.riskExposure.jpa.entity;
import io.sc.platform.orm.api.vo.CorporationAuditorVo;
import io.sc.platform.orm.entity.CorporationAuditorEntity; import io.sc.platform.orm.entity.CorporationAuditorEntity;
import irbs.riskExposure.jpa.vo.RiskExposureVo; import irbs.riskExposure.jpa.vo.RiskExposureVo;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
@ -136,6 +137,11 @@ public class RiskExposure extends CorporationAuditorEntity<RiskExposureVo> {
@Transient @Transient
private String taskId; private String taskId;
@Override
public void toVo(CorporationAuditorVo vo) {
super.toVo(vo);
}
public String getId() { public String getId() {
return id; return id;
} }

1
settings.gradle

@ -4,6 +4,7 @@ include 'irbs.defaultManager'
include 'irbs.deptRating' include 'irbs.deptRating'
include 'irbs.feature' include 'irbs.feature'
include 'irbs.frontend' include 'irbs.frontend'
include 'irbs.help.doc'
include 'irbs.reports' include 'irbs.reports'
include 'irbs.riskExposure' include 'irbs.riskExposure'
include 'irbs.feature' include 'irbs.feature'
Loading…
Cancel
Save