diff --git a/app.irbs/build.gradle b/app.irbs/build.gradle index 9d5d122..0ae6492 100644 --- a/app.irbs/build.gradle +++ b/app.irbs/build.gradle @@ -29,12 +29,9 @@ dependencies { "io.sc:io.sc.engine.st:${platform_version}", "io.sc:io.sc.engine.st.frontend:${platform_version}", - "io.sc:io.sc.platform.page.config:${rwa_version}", // "io.sc:rwa.params:${rwa_version}", // "io.sc:rwa.report:${rwa_version}", - "io.sc:app.rwa.frontend:${rwa_version}", - - +// "io.sc:app.rwa.frontend:${rwa_version}", project(":irbs.frontend"), project(":irbs.cust.rating"), 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 10dd0ee..7aa946e 100644 --- a/app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml +++ b/app.irbs/src/main/resources/liquibase/IRBS_20240627_DATA.xml @@ -29,10 +29,10 @@ - + @@ -146,13 +146,13 @@ - + - + - + diff --git a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_CONF_IRS.csv b/app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM.csv similarity index 98% rename from app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_CONF_IRS.csv rename to app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM.csv index 2e033cb..9aa5b95 100644 --- a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_CONF_IRS.csv +++ b/app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM.csv @@ -1,4 +1,4 @@ -"SYS_TEMP_CONF",,,,,,,,,, +"LCDP_FORM",,,,,,,,,, "ID_","NAME_","TYPE_","CONFIG_","PAGE_LOAD_TYPE_","DATA_COME_FROM_","CREATOR_","CREATE_DATE_","LAST_MODIFIER_","LAST_MODIFYDATE_","CORP_CODE_" "ID主键","模板名称","模板类型","页面配置项","页面加载类型(JSON:通过本表的_config字段存储的json字符串加载；CONFIG:通过系统配置加载)","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码" "VARCHAR","VARCHAR","VARCHAR","LONGVARCHAR","VARCHAR","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR" diff --git a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_IRS.csv b/app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID.csv similarity index 98% rename from app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_IRS.csv rename to app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID.csv index 854a4fc..9a9f2bf 100644 --- a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_IRS.csv +++ b/app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID.csv @@ -1,4 +1,4 @@ -"SYS_TEMP_GRID",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"LCDP_FORM_GRID",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "ID_","TEMPLATE_ID_","FIELD_COME_FROM","SCHEMA_","DATABASE_TABLE_","SQL_","TITLE_","BUTTONS_","SELECTION_","PRIMARY_KEY_","FOREIGN_KEY_","DATA_URL_","FETCH_DATA_URL_","ADD_DATA_URL_","EDIT_DATA_URL_","REMOVE_DATA_URL_","SORT_NO_","CHECKBOX_SELECTION_","DRAGGABLE_","AUTO_FETCH_DATA_","DENSE_","STICKY_NUM_","TREE_","TREE_RELATIONSHIP_","TREE_ICON_","TREE_DEFAULT_EXPAND_ALL_","TREE_TICK_STRATEGY_","TICKED_FIELD_","SELECTED_FIELD_","DEFAULT_SORT_BY_","DESCENDING_","PAGEABLE_","ROWS_PER_PAGE_","REQ_PAGE_START_","QUERY_FORM_COLS_NUM_","QUERY_FORM_ROW_NUM_","EDITOR_FORM_COLS_NUM_","DATA_COME_FROM_","CREATOR_","CREATE_DATE_","LAST_MODIFIER_","LAST_MODIFYDATE_","CORP_CODE_" "ID主键","模板ID","字段来源","数据库实例","数据表名","sql","表格名称","表格按钮","选中模式(single:单选,multiple:多选)","数据主键","数据外键","数据操作URL前缀","表格加载数据URL","新增URL","编辑URL","删除URL","是否显示序号列","是否显示复选框列","行是否允许拖拽","是否自动加载数据","紧凑模式","列冻结数","是否为树形表格","树形表格数据关系","树形表格图标函数","树形表格默认全部展开","树形表格勾选策略","checkbox勾选映射字段名","行点击选中映射字段名","默认排序字段","排序方式(1:倒序,0:正序)","是否分页","每页显示行数","后端查询使用的初始页码(默认从1开始)","查询面板一行显示个数(0为自适应)","查询面板显示行数(默认1)","编辑面板一行显示元素个数","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码" "VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","LONGVARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","SMALLINT","SMALLINT","VARCHAR","SMALLINT","SMALLINT","VARCHAR","VARCHAR","SMALLINT","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","SMALLINT","SMALLINT","SMALLINT","SMALLINT","SMALLINT","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR" diff --git a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_FIELD_IRS.csv b/app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID_FIELD.csv similarity index 99% rename from app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_FIELD_IRS.csv rename to app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID_FIELD.csv index ae5a78b..b6618df 100644 --- a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_TEMP_GRID_FIELD_IRS.csv +++ b/app.irbs/src/main/resources/liquibase/data/irbs/LCDP_FORM_GRID_FIELD.csv @@ -1,4 +1,4 @@ -"SYS_TEMP_GRID_FIELD",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"LCDP_FORM_GRID_FIELD",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "ID_","GRID_ID_","PARENT_","FIELD_NAME_","FIELD_LABEL_","FIELD_TYPE_","SORT_NO_","FIELD_LENGTH_","FIELD_PRECISION_","FIELD_IS_SELECT_","OPTION_COME_FROM_","DICT_OPTION_VALUE_","OTHER_OPTION_VALUE_","ADD_SYS_VALUE_TYPE_","EDIT_OVERRIDE_","QUERY_SHOW_","QUERY_FORM_TYPE_","QUERY_DEFA_VALUE_","QUERY_IS_REQUIRED_","QUERY_OPERATOR_","TABLE_SHOW_","TABLE_SORT_","TABLE_COLUMN_ALIGN_","TABLE_COLUMN_WIDTH_","EDITOR_SHOW_","EDITOR_FORM_TYPE_","EDITOR_DEFA_VALUE_","EDITOR_IS_REQUIRED_","DATA_COME_FROM_","CREATOR_","CREATE_DATE_","LAST_MODIFIER_","LAST_MODIFYDATE_","CORP_CODE_" "ID主键","所属表格模板ID","字段所属的父类型(query_field: 查询字段;where_field: 条件字段)","字段名称","页面显示名称","字段类型","字段序号","字段长度","字段精度","字段是否为选项值(0:否，1:是)","选项值来源","数据字典选项值","其他选项值","新增时系统自动填充类型","修改时覆盖系统自动填充值(0:否，1:是)","查询面板中显示(0:否，1:是)","使用的表单类型","默认值","是否必填项(0:否，1:是)","查询时匹配模式","列表中显示(0:否，1:是)","是否支持排序(0:否，1:是)","列对齐方式","列宽","编辑页面是否显示(0:否，1:是)","使用的表单类型","默认值","是否必填项(0:否，1:是)","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码" "VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","SMALLINT","SMALLINT","VARCHAR","VARCHAR","VARCHAR","VARCHAR","SMALLINT","SMALLINT","VARCHAR","VARCHAR","SMALLINT","VARCHAR","SMALLINT","SMALLINT","VARCHAR","SMALLINT","SMALLINT","VARCHAR","VARCHAR","SMALLINT","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR" diff --git a/app.irbs/src/main/resources/liquibase/data/irbs/shrcb/NS_IRS_CFG_MAIN_SCALE_VERSION.csv b/app.irbs/src/main/resources/liquibase/data/irbs/shrcb/NS_IRS_CFG_MAIN_SCALE_VERSION.csv index 880ac30..81bf808 100644 --- a/app.irbs/src/main/resources/liquibase/data/irbs/shrcb/NS_IRS_CFG_MAIN_SCALE_VERSION.csv +++ b/app.irbs/src/main/resources/liquibase/data/irbs/shrcb/NS_IRS_CFG_MAIN_SCALE_VERSION.csv @@ -3,4 +3,4 @@ "ID主键","版本代码","版本名称","版本状态(RELEASE-发布，DRAFT-草稿，HISTORY-历史)","版本序号","审核状态(AWAIT_SUBMIT：待提交，APPROVALING：审批中，PASS：通过，NEGATIVED：否决)","流程ID","当前处理人","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码" "VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR" "java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.sql.Timestamp","java.lang.String","java.sql.Timestamp","java.lang.String" -"1","SHRCB_MANSCALE_VERSION","上农内评POC项目主标尺","DRAFT","1","AWAIT_SUBMIT","","","INPUT",,,"admin","2024-07-22 16:36:59.0","_PRIMARY_" \ No newline at end of file +"1","SHRCB_MANSCALE_VERSION","上农内评POC项目主标尺","RELEASE","1","AWAIT_SUBMIT","","","INPUT",,,"admin","2024-07-22 16:36:59.0","_PRIMARY_" \ No newline at end of file diff --git a/build-version.gradle b/build-version.gradle index 3b2ee11..7fde266 100644 --- a/build-version.gradle +++ b/build-version.gradle @@ -1,201 +1,218 @@ +/*********************************************************************** + * 统一定义依赖的版本，解决同一个库出现不同版本的问题 + **********************************************************************/ +ext['PlatformDependencyVersions'] =[ + "commons-io:commons-io" : "${commons_io_version}", + "org.ow2.asm:asm" : "${asm_version}", + "org.checkerframework:checker-qual" : "${checker_version}", + "com.google.guava:guava" : "${guava_version}", + "com.nimbusds:nimbus-jose-jwt" : "9.22", + "org.codehaus.groovy:groovy" : "3.0.19", + "org.codehaus.groovy:groovy-jsr223" : "3.0.19", + "org.codehaus.groovy:groovy-datetime" : "3.0.19", + "org.codehaus.groovy:groovy-dateutil" : "3.0.19", + "org.codehaus.groovy:groovy-json" : "3.0.19", + "org.codehaus.groovy:groovy-sql" : "3.0.19", + "org.codehaus.groovy:groovy-xml" : "3.0.19", +]; + /*********************************************************************** * 覆盖 springboot 默认包版本 **********************************************************************/ -subprojects { - // ext['activemq.version'] = - // ext['antlr2.version'] = - // ext['appengine-sdk.version'] = - // ext['artemis.version'] = - // ext['aspectj.version'] = - // ext['assertj.version'] = - // ext['atomikos.version'] = - // ext['awaitility.version'] = - // ext['bitronix.version'] = - // ext['build-helper-maven-plugin.version'] = - // ext['byte-buddy.version'] = - // ext['caffeine.version'] = - // ext['cassandra-driver.version'] = - // ext['classmate.version'] = - // ext['commons-codec.version'] = - // ext['commons-dbcp2.version'] = - // ext['commons-lang3.version'] = - // ext['commons-pool.version'] = - // ext['commons-pool2.version'] = - // ext['couchbase-client.version'] = - // ext['db2-jdbc.version'] = - // ext['dependency-management-plugin.version'] = - // ext['derby.version'] = - // ext['dropwizard-metrics.version'] = - // ext['ehcache.version'] = - // ext['ehcache3.version'] = - // ext['elasticsearch.version'] = - // ext['embedded-mongo.version'] = - // ext['flyway.version'] = - // ext['freemarker.version'] = - // ext['git-commit-id-plugin.version'] = - // ext['glassfish-el.version'] = - // ext['glassfish-jaxb.version'] = - // ext['groovy.version'] = - // ext['gson.version'] = - // ext['h2.version'] = - // ext['hamcrest.version'] = - // ext['hazelcast.version'] = - // ext['hazelcast-hibernate5.version'] = - // ext['hibernate.version'] = - // ext['hibernate-validator.version'] = - // ext['hikaricp.version'] = - // ext['hsqldb.version'] = - // ext['htmlunit.version'] = - // ext['httpasyncclient.version'] = - // ext['httpclient.version'] = - // ext['httpcore.version'] = - // ext['infinispan.version'] = - // ext['influxdb-java.version'] = - // ext['jackson-bom.version'] = - // ext['jakarta-activation.version'] = - // ext['jakarta-annotation.version'] = - // ext['jakarta-jms.version'] = - // ext['jakarta-json.version'] = - // ext['jakarta-json-bind.version'] = - // ext['jakarta-mail.version'] = - // ext['jakarta-persistence.version'] = - // ext['jakarta-servlet.version'] = - // ext['jakarta-servlet-jsp-jstl.version'] = - // ext['jakarta-transaction.version'] = - // ext['jakarta-validation.version'] = - // ext['jakarta-websocket.version'] = - // ext['jakarta-ws-rs.version'] = - // ext['jakarta-xml-bind.version'] = - // ext['jakarta-xml-soap.version'] = - // ext['jakarta-xml-ws.version'] = - // ext['janino.version'] = - // ext['javax-activation.version'] = - // ext['javax-annotation.version'] = - // ext['javax-cache.version'] = - // ext['javax-jaxb.version'] = - // ext['javax-jaxws.version'] = - // ext['javax-jms.version'] = - // ext['javax-json.version'] = - // ext['javax-jsonb.version'] = - // ext['javax-mail.version'] = - // ext['javax-money.version'] = - // ext['javax-persistence.version'] = - // ext['javax-transaction.version'] = - // ext['javax-validation.version'] = - // ext['javax-websocket.version'] = - // ext['jaxen.version'] = - // ext['jaybird.version'] = - // ext['jboss-logging.version'] = - // ext['jboss-transaction-spi.version'] = - // ext['jdom2.version'] = - // ext['jedis.version'] = - // ext['jersey.version'] = - // ext['jetty.version'] = - // ext['jetty-el.version'] = - // ext['jetty-jsp.version'] = - // ext['jetty-reactive-httpclient.version'] = - // ext['jmustache.version'] = - // ext['johnzon.version'] = - // ext['jolokia.version'] = - // ext['jooq.version'] = - // ext['json-path.version'] = - // ext['json-smart.version'] = - // ext['jsonassert.version'] = - // ext['jstl.version'] = - // ext['jtds.version'] = - // ext['junit.version'] = - // ext['junit-jupiter.version'] = - // ext['kafka.version'] = - // ext['kotlin.version'] = - // ext['kotlin-coroutines.version'] = - // ext['lettuce.version'] = - // ext['liquibase.version'] = - // ext['log4j2.version'] = - // ext['logback.version'] = - // ext['lombok.version'] = - // ext['mariadb.version'] = - // ext['maven-antrun-plugin.version'] = - // ext['maven-assembly-plugin.version'] = - // ext['maven-clean-plugin.version'] = - // ext['maven-compiler-plugin.version'] = - // ext['maven-dependency-plugin.version'] = - // ext['maven-deploy-plugin.version'] = - // ext['maven-enforcer-plugin.version'] = - // ext['maven-failsafe-plugin.version'] = - // ext['maven-help-plugin.version'] = - // ext['maven-install-plugin.version'] = - // ext['maven-invoker-plugin.version'] = - // ext['maven-jar-plugin.version'] = - // ext['maven-javadoc-plugin.version'] = - // ext['maven-resources-plugin.version'] = - // ext['maven-shade-plugin.version'] = - // ext['maven-source-plugin.version'] = - // ext['maven-surefire-plugin.version'] = - // ext['maven-war-plugin.version'] = - // ext['micrometer.version'] = - // ext['mimepull.version'] = - // ext['mockito.version'] = - // ext['mongodb.version'] = - // ext['mssql-jdbc.version'] = - // ext['mysql.version'] = - // ext['nekohtml.version'] = - // ext['neo4j-java-driver.version'] = - // ext['netty.version'] = - // ext['netty-tcnative.version'] = - // ext['nimbus-jose-jwt.version'] = - // ext['oauth2-oidc-sdk.version'] = - // ext['ojdbc.version'] = - // ext['okhttp3.version'] = - // ext['oracle-database.version'] = - // ext['pooled-jms.version'] = - // ext['postgresql.version'] = - // ext['prometheus-pushgateway.version'] = - // ext['quartz.version'] = - // ext['querydsl.version'] = - // ext['r2dbc-bom.version'] = - // ext['rabbit-amqp-client.version'] = - // ext['reactive-streams.version'] = - // ext['reactor-bom.version'] = - // ext['rest-assured.version'] = - // ext['rsocket.version'] = - // ext['rxjava.version'] = - // ext['rxjava-adapter.version'] = - // ext['rxjava2.version'] = - // ext['saaj-impl.version'] = - // ext['selenium.version'] = - // ext['selenium-htmlunit.version'] = - // ext['sendgrid.version'] = - // ext['servlet-api.version'] = - // ext['slf4j.version'] = - // ext['snakeyaml.version'] = - // ext['solr.version'] = - // ext['spring-amqp.version'] = - // ext['spring-batch.version'] = - // ext['spring-data-bom.version'] = - // ext['spring-framework.version'] = - // ext['spring-hateoas.version'] = - // ext['spring-integration.version'] = - // ext['spring-kafka.version'] = - // ext['spring-ldap.version'] = - // ext['spring-restdocs.version'] = - // ext['spring-retry.version'] = - // ext['spring-security.version'] = - // ext['spring-session-bom.version'] = - // ext['spring-ws.version'] = - // ext['sqlite-jdbc.version'] = - // ext['sun-mail.version'] = - // ext['thymeleaf.version'] = - // ext['thymeleaf-extras-data-attribute.version'] = - // ext['thymeleaf-extras-java8time.version'] = - // ext['thymeleaf-extras-springsecurity.version'] = - // ext['thymeleaf-layout-dialect.version'] = - // ext['tomcat.version'] = - // ext['unboundid-ldapsdk.version'] = - // ext['undertow.version'] = - // ext['versions-maven-plugin.version'] = - // ext['webjars-hal-browser.version'] = - // ext['webjars-locator-core.version'] = - // ext['wsdl4j.version'] = - // ext['xml-maven-plugin.version'] = - // ext['xmlunit2.version'] = -} +// ext['groovy.version'] ='3.0.17' +// ext['activemq.version'] = +// ext['antlr2.version'] = +// ext['appengine-sdk.version'] = +// ext['artemis.version'] = +// ext['aspectj.version'] = +// ext['assertj.version'] = +// ext['atomikos.version'] = +// ext['awaitility.version'] = +// ext['bitronix.version'] = +// ext['build-helper-maven-plugin.version'] = +// ext['byte-buddy.version'] = +// ext['caffeine.version'] = +// ext['cassandra-driver.version'] = +// ext['classmate.version'] = +// ext['commons-codec.version'] = +// ext['commons-dbcp2.version'] = +// ext['commons-lang3.version'] = +// ext['commons-pool.version'] = +// ext['commons-pool2.version'] = +// ext['couchbase-client.version'] = +// ext['db2-jdbc.version'] = +// ext['dependency-management-plugin.version'] = +// ext['derby.version'] = +// ext['dropwizard-metrics.version'] = +// ext['ehcache.version'] = +// ext['ehcache3.version'] = +// ext['elasticsearch.version'] = +// ext['embedded-mongo.version'] = +// ext['flyway.version'] = +// ext['freemarker.version'] = +// ext['git-commit-id-plugin.version'] = +// ext['glassfish-el.version'] = +// ext['glassfish-jaxb.version'] = +// ext['groovy.version'] = +// ext['gson.version'] = +// ext['h2.version'] = +// ext['hamcrest.version'] = +// ext['hazelcast.version'] = +// ext['hazelcast-hibernate5.version'] = +// ext['hibernate.version'] = +// ext['hibernate-validator.version'] = +// ext['hikaricp.version'] = +// ext['hsqldb.version'] = +// ext['htmlunit.version'] = +// ext['httpasyncclient.version'] = +// ext['httpclient.version'] = +// ext['httpcore.version'] = +// ext['infinispan.version'] = +// ext['influxdb-java.version'] = +// ext['jackson-bom.version'] = +// ext['jakarta-activation.version'] = +// ext['jakarta-annotation.version'] = +// ext['jakarta-jms.version'] = +// ext['jakarta-json.version'] = +// ext['jakarta-json-bind.version'] = +// ext['jakarta-mail.version'] = +// ext['jakarta-persistence.version'] = +// ext['jakarta-servlet.version'] = +// ext['jakarta-servlet-jsp-jstl.version'] = +// ext['jakarta-transaction.version'] = +// ext['jakarta-validation.version'] = +// ext['jakarta-websocket.version'] = +// ext['jakarta-ws-rs.version'] = +// ext['jakarta-xml-bind.version'] = +// ext['jakarta-xml-soap.version'] = +// ext['jakarta-xml-ws.version'] = +// ext['janino.version'] = +// ext['javax-activation.version'] = +// ext['javax-annotation.version'] = +// ext['javax-cache.version'] = +// ext['javax-jaxb.version'] = +// ext['javax-jaxws.version'] = +// ext['javax-jms.version'] = +// ext['javax-json.version'] = +// ext['javax-jsonb.version'] = +// ext['javax-mail.version'] = +// ext['javax-money.version'] = +// ext['javax-persistence.version'] = +// ext['javax-transaction.version'] = +// ext['javax-validation.version'] = +// ext['javax-websocket.version'] = +// ext['jaxen.version'] = +// ext['jaybird.version'] = +// ext['jboss-logging.version'] = +// ext['jboss-transaction-spi.version'] = +// ext['jdom2.version'] = +// ext['jedis.version'] = +// ext['jersey.version'] = +// ext['jetty.version'] = +// ext['jetty-el.version'] = +// ext['jetty-jsp.version'] = +// ext['jetty-reactive-httpclient.version'] = +// ext['jmustache.version'] = +// ext['johnzon.version'] = +// ext['jolokia.version'] = +// ext['jooq.version'] = +// ext['json-path.version'] = +// ext['json-smart.version'] = +// ext['jsonassert.version'] = +// ext['jstl.version'] = +// ext['jtds.version'] = +// ext['junit.version'] = +// ext['junit-jupiter.version'] = +// ext['kafka.version'] = +// ext['kotlin.version'] = +// ext['kotlin-coroutines.version'] = +// ext['lettuce.version'] = +// ext['liquibase.version'] = +// ext['log4j2.version'] = +// ext['logback.version'] = +// ext['lombok.version'] = +// ext['mariadb.version'] = +// ext['maven-antrun-plugin.version'] = +// ext['maven-assembly-plugin.version'] = +// ext['maven-clean-plugin.version'] = +// ext['maven-compiler-plugin.version'] = +// ext['maven-dependency-plugin.version'] = +// ext['maven-deploy-plugin.version'] = +// ext['maven-enforcer-plugin.version'] = +// ext['maven-failsafe-plugin.version'] = +// ext['maven-help-plugin.version'] = +// ext['maven-install-plugin.version'] = +// ext['maven-invoker-plugin.version'] = +// ext['maven-jar-plugin.version'] = +// ext['maven-javadoc-plugin.version'] = +// ext['maven-resources-plugin.version'] = +// ext['maven-shade-plugin.version'] = +// ext['maven-source-plugin.version'] = +// ext['maven-surefire-plugin.version'] = +// ext['maven-war-plugin.version'] = +// ext['micrometer.version'] = +// ext['mimepull.version'] = +// ext['mockito.version'] = +// ext['mongodb.version'] = +// ext['mssql-jdbc.version'] = +// ext['mysql.version'] = +// ext['nekohtml.version'] = +// ext['neo4j-java-driver.version'] = +// ext['netty.version'] = +// ext['netty-tcnative.version'] = +// ext['nimbus-jose-jwt.version'] = +// ext['oauth2-oidc-sdk.version'] = +// ext['ojdbc.version'] = +// ext['okhttp3.version'] = +// ext['oracle-database.version'] ='12.2.0.1' +// ext['pooled-jms.version'] = +// ext['postgresql.version'] = +// ext['prometheus-pushgateway.version'] = +// ext['quartz.version'] = +// ext['querydsl.version'] = +// ext['r2dbc-bom.version'] = +// ext['rabbit-amqp-client.version'] = +// ext['reactive-streams.version'] = +// ext['reactor-bom.version'] = +// ext['rest-assured.version'] = +// ext['rsocket.version'] = +// ext['rxjava.version'] = +// ext['rxjava-adapter.version'] = +// ext['rxjava2.version'] = +// ext['saaj-impl.version'] = +// ext['selenium.version'] = +// ext['selenium-htmlunit.version'] = +// ext['sendgrid.version'] = +// ext['servlet-api.version'] = +// ext['slf4j.version'] = +// ext['snakeyaml.version'] = +// ext['solr.version'] = +// ext['spring-amqp.version'] = +// ext['spring-batch.version'] = +// ext['spring-data-bom.version'] = +// ext['spring-framework.version'] = +// ext['spring-hateoas.version'] = +// ext['spring-integration.version'] = +// ext['spring-kafka.version'] = +// ext['spring-ldap.version'] = +// ext['spring-restdocs.version'] = +// ext['spring-retry.version'] = +// ext['spring-security.version'] = +// ext['spring-session-bom.version'] = +// ext['spring-ws.version'] = +// ext['sqlite-jdbc.version'] = +// ext['sun-mail.version'] = +// ext['thymeleaf.version'] = +// ext['thymeleaf-extras-data-attribute.version'] = +// ext['thymeleaf-extras-java8time.version'] = +// ext['thymeleaf-extras-springsecurity.version'] = +// ext['thymeleaf-layout-dialect.version'] = +// ext['tomcat.version'] = +// ext['unboundid-ldapsdk.version'] = +// ext['undertow.version'] = +// ext['versions-maven-plugin.version'] = +// ext['webjars-hal-browser.version'] = +// ext['webjars-locator-core.version'] = +// ext['wsdl4j.version'] = +// ext['xml-maven-plugin.version'] = +// ext['xmlunit2.version'] = diff --git a/gradle.properties b/gradle.properties index 57c0e3f..b6c4792 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,9 +36,9 @@ application_version=1.0.1 # platform ###########################################################rwa_version platform_group=io.sc -platform_version=8.1.44 -platform_plugin_version=8.1.44 -platform_core_frontend_version=8.1.287 +platform_version=8.2.7 +platform_plugin_version=8.2.7 +platform_core_frontend_version=8.2.32 ########################################################### # product dependencies version @@ -50,15 +50,19 @@ rwa_version=1.0.2 # dependencies version ########################################################### asciidoctor_version=3.3.2 +asm_version=9.7.1 +checker_version=3.43.0 commons_fileupload_version=1.4 -commons_io_version=2.11.0 +commons_io_version=2.16.1 +commons_text_version=1.12.0 cxf_version=3.2.7 - dm_hibernate_version=8.1.2.192 +enjoy_version=5.2.2 flowable_version=6.8.0 guava_version=31.1-jre ipaddress_version=5.4.0 jackson_version=2.13.5 +javassist_version=3.21.0-GA jasypt_version=2.1.2 jboss_logging_version=3.3.2.Final jcommander_version=1.82 @@ -70,19 +74,21 @@ jxls_poi_version=1.0.15 jxls_version=2.4.6 mybatis_version=3.5.10 opencsv_version=5.7.1 -oshi_version=6.4.2 +oshi_version=6.6.1 p6spy_version=3.9.1 pinyin4j_version=2.5.1 -poi_ooxml_version=3.17 +poi_version=5.2.5 schemacrawler_version=16.19.11 -#schemacrawler_version=14.21.02 +shadow_gradle_plugin_version=8.3.1 spring_boot_version=2.7.18 spring_cloud_alibaba_version=2021.0.4.0 spring_cloud_context_version=3.1.4 spring_cloud_version=2021.0.8 spring_security_oauth2_authorization_server_version=0.4.5 spring_statemachine_version=3.2.1 +truelicense_version=4.0.3 webjars_locator_weblogic_version=0.10 +weka_version=3.8.6 zip4j_version=2.11.5 ########################################################### diff --git a/irbs.cust.rating/build.gradle b/irbs.cust.rating/build.gradle index 6b4c8c1..3056ea6 100644 --- a/irbs.cust.rating/build.gradle +++ b/irbs.cust.rating/build.gradle @@ -3,7 +3,7 @@ dependencies { "io.sc:io.sc.platform.mvc:${platform_version}", "io.sc:io.sc.engine.rule.client.spring:${platform_version}", "io.sc:io.sc.platform.flowable:${platform_version}", - "io.sc:io.sc.platform.page.config:${rwa_version}", + "io.sc:io.sc.platform.lcdp:${platform_version}", project(":irbs.defaultManager"), project(":irbs.financialTemplate"), diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/CustRatingWorkFlowInitializer.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/CustRatingWorkFlowInitializer.java index 8ffe98f..2de2f8b 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/CustRatingWorkFlowInitializer.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/CustRatingWorkFlowInitializer.java @@ -3,10 +3,10 @@ package irbs.cust.rating.initializer; import io.sc.platform.core.Environment; import io.sc.platform.core.initializer.ApplicationInitializer; import io.sc.platform.core.initializer.ApplicationInitializerExecuteException; -import io.sc.platform.core.util.FileUtil; import io.sc.platform.flowable.enums.ProcessStatus; import io.sc.platform.flowable.jpa.entity.ProcessEntity; import io.sc.platform.flowable.service.ProcessEntityService; +import io.sc.platform.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; @@ -21,6 +21,10 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{ private ApplicationContext applicationContext; private ProcessEntityService processEntityService; + private static final String KEY = "COMPANY_CUSTOMER_RATING"; + private static final String I18N_KEY = "WORK_FLOW.COMPANY_CUSTOMER_RATING"; + private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/CustRating.bpmn"; + @Override public void init(ApplicationContext applicationContext) { this.processEntityService =applicationContext.getBean(ProcessEntityService.class); @@ -37,7 +41,7 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{ if(isInitialized!=null) { return isInitialized; } - List entities =processEntityService.getRepository().findByKey("COMPANY_CUSTOMER_RATING"); + List entities =processEntityService.getRepository().findByKey(KEY); if(entities==null || entities.isEmpty()){ isInitialized =false; }else { @@ -50,13 +54,13 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{ public void execute() throws ApplicationInitializerExecuteException { try { ProcessEntity entity = new ProcessEntity(); - entity.setCategory("COMPANY_CUSTOMER_RATING"); - entity.setKey("COMPANY_CUSTOMER_RATING"); - entity.setName(applicationContext.getMessage("WORK_FLOW.COMPANY_CUSTOMER_RATING", null, Locale.getDefault())); + entity.setCategory(KEY); + entity.setKey(KEY); + entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault())); entity.setStatus(ProcessStatus.RELEASE); entity.setVersion(1); entity.setCanClaimTask(false); - entity.setXml(getRuleEngineWorkflowXmlContent()); + entity.setXml(getWorkflowXmlContent()); entity = processEntityService.add(entity); processEntityService.deploy(entity.getId()); }catch (Exception e){ @@ -65,7 +69,7 @@ public class CustRatingWorkFlowInitializer implements ApplicationInitializer{ } } - private String getRuleEngineWorkflowXmlContent() throws IOException { - return FileUtil.readString("classpath:/workflow/irbs/cust/rating/CustRating.bpmn", Environment.DEFAULT_CHARSET_NAME); + private String getWorkflowXmlContent() throws IOException { + return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME); } } diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/DefaultWorkFlowInitializer.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/DefaultWorkFlowInitializer.java new file mode 100644 index 0000000..fbae86f --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/DefaultWorkFlowInitializer.java @@ -0,0 +1,75 @@ +package irbs.cust.rating.initializer; + +import io.sc.platform.core.Environment; +import io.sc.platform.core.initializer.ApplicationInitializer; +import io.sc.platform.core.initializer.ApplicationInitializerExecuteException; +import io.sc.platform.flowable.enums.ProcessStatus; +import io.sc.platform.flowable.jpa.entity.ProcessEntity; +import io.sc.platform.flowable.service.ProcessEntityService; +import io.sc.platform.util.FileUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContext; + +import java.io.IOException; +import java.util.List; +import java.util.Locale; + +public class DefaultWorkFlowInitializer implements ApplicationInitializer{ + private static final Logger log =LoggerFactory.getLogger(DefaultWorkFlowInitializer.class); + private Boolean isInitialized =null; + private ApplicationContext applicationContext; + private ProcessEntityService processEntityService; + + private static final String KEY = "DEFAULT_CUSTOMER_F"; + private static final String I18N_KEY = "WORK_FLOW.DEFAULT_CUSTOMER_F"; + private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/DEFAULT_CUSTOMER_F.bpmn"; + + @Override + public void init(ApplicationContext applicationContext) { + this.processEntityService =applicationContext.getBean(ProcessEntityService.class); + this.applicationContext =applicationContext; + } + + @Override + public int getOrder() { + return 1100; + } + + @Override + public synchronized boolean isInitialized() { + if(isInitialized!=null) { + return isInitialized; + } + List entities =processEntityService.getRepository().findByKey(KEY); + if(entities==null || entities.isEmpty()){ + isInitialized =false; + }else { + isInitialized = true; + } + return isInitialized; + } + + @Override + public void execute() throws ApplicationInitializerExecuteException { + try { + ProcessEntity entity = new ProcessEntity(); + entity.setCategory(KEY); + entity.setKey(KEY); + entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault())); + entity.setStatus(ProcessStatus.RELEASE); + entity.setVersion(1); + entity.setCanClaimTask(false); + entity.setXml(getWorkflowXmlContent()); + entity = processEntityService.add(entity); + processEntityService.deploy(entity.getId()); + }catch (Exception e){ + log.error("",e); + throw new ApplicationInitializerExecuteException(e); + } + } + + private String getWorkflowXmlContent() throws IOException { + return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME); + } +} diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RebirthWorkFlowInitializer.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RebirthWorkFlowInitializer.java new file mode 100644 index 0000000..ff224f7 --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RebirthWorkFlowInitializer.java @@ -0,0 +1,75 @@ +package irbs.cust.rating.initializer; + +import io.sc.platform.core.Environment; +import io.sc.platform.core.initializer.ApplicationInitializer; +import io.sc.platform.core.initializer.ApplicationInitializerExecuteException; +import io.sc.platform.flowable.enums.ProcessStatus; +import io.sc.platform.flowable.jpa.entity.ProcessEntity; +import io.sc.platform.flowable.service.ProcessEntityService; +import io.sc.platform.util.FileUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContext; + +import java.io.IOException; +import java.util.List; +import java.util.Locale; + +public class RebirthWorkFlowInitializer implements ApplicationInitializer{ + private static final Logger log =LoggerFactory.getLogger(RebirthWorkFlowInitializer.class); + private Boolean isInitialized =null; + private ApplicationContext applicationContext; + private ProcessEntityService processEntityService; + + private static final String KEY = "REBIRTH_CUSTOMER_F"; + private static final String I18N_KEY = "WORK_FLOW.REBIRTH_CUSTOMER_F"; + private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/REBIRTH_CUSTOMER_F.bpmn"; + + @Override + public void init(ApplicationContext applicationContext) { + this.processEntityService =applicationContext.getBean(ProcessEntityService.class); + this.applicationContext =applicationContext; + } + + @Override + public int getOrder() { + return 1100; + } + + @Override + public synchronized boolean isInitialized() { + if(isInitialized!=null) { + return isInitialized; + } + List entities =processEntityService.getRepository().findByKey(KEY); + if(entities==null || entities.isEmpty()){ + isInitialized =false; + }else { + isInitialized = true; + } + return isInitialized; + } + + @Override + public void execute() throws ApplicationInitializerExecuteException { + try { + ProcessEntity entity = new ProcessEntity(); + entity.setCategory(KEY); + entity.setKey(KEY); + entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault())); + entity.setStatus(ProcessStatus.RELEASE); + entity.setVersion(1); + entity.setCanClaimTask(false); + entity.setXml(getWorkflowXmlContent()); + entity = processEntityService.add(entity); + processEntityService.deploy(entity.getId()); + }catch (Exception e){ + log.error("",e); + throw new ApplicationInitializerExecuteException(e); + } + } + + private String getWorkflowXmlContent() throws IOException { + return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME); + } +} diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RiskExposureWorkFlowInitializer.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RiskExposureWorkFlowInitializer.java new file mode 100644 index 0000000..fa1c05d --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/RiskExposureWorkFlowInitializer.java @@ -0,0 +1,75 @@ +package irbs.cust.rating.initializer; + +import io.sc.platform.core.Environment; +import io.sc.platform.core.initializer.ApplicationInitializer; +import io.sc.platform.core.initializer.ApplicationInitializerExecuteException; +import io.sc.platform.flowable.enums.ProcessStatus; +import io.sc.platform.flowable.jpa.entity.ProcessEntity; +import io.sc.platform.flowable.service.ProcessEntityService; +import io.sc.platform.util.FileUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContext; + +import java.io.IOException; +import java.util.List; +import java.util.Locale; + +public class RiskExposureWorkFlowInitializer implements ApplicationInitializer{ + private static final Logger log =LoggerFactory.getLogger(RiskExposureWorkFlowInitializer.class); + private Boolean isInitialized =null; + private ApplicationContext applicationContext; + private ProcessEntityService processEntityService; + + private static final String KEY = "RISK_EXPOSURE_FLOW"; + private static final String I18N_KEY = "WORK_FLOW.RISK_EXPOSURE_FLOW"; + private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/RISK_EXPOSURE_FLOW.bpmn"; + + @Override + public void init(ApplicationContext applicationContext) { + this.processEntityService =applicationContext.getBean(ProcessEntityService.class); + this.applicationContext =applicationContext; + } + + @Override + public int getOrder() { + return 1100; + } + + @Override + public synchronized boolean isInitialized() { + if(isInitialized!=null) { + return isInitialized; + } + List entities =processEntityService.getRepository().findByKey(KEY); + if(entities==null || entities.isEmpty()){ + isInitialized =false; + }else { + isInitialized = true; + } + return isInitialized; + } + + @Override + public void execute() throws ApplicationInitializerExecuteException { + try { + ProcessEntity entity = new ProcessEntity(); + entity.setCategory(KEY); + entity.setKey(KEY); + entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault())); + entity.setStatus(ProcessStatus.RELEASE); + entity.setVersion(1); + entity.setCanClaimTask(false); + entity.setXml(getWorkflowXmlContent()); + entity = processEntityService.add(entity); + processEntityService.deploy(entity.getId()); + }catch (Exception e){ + log.error("",e); + throw new ApplicationInitializerExecuteException(e); + } + } + + private String getWorkflowXmlContent() throws IOException { + return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME); + } +} diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/SampleWorkFlowInitializer.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/SampleWorkFlowInitializer.java new file mode 100644 index 0000000..82ecff1 --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/initializer/SampleWorkFlowInitializer.java @@ -0,0 +1,75 @@ +package irbs.cust.rating.initializer; + +import io.sc.platform.core.Environment; +import io.sc.platform.core.initializer.ApplicationInitializer; +import io.sc.platform.core.initializer.ApplicationInitializerExecuteException; +import io.sc.platform.flowable.enums.ProcessStatus; +import io.sc.platform.flowable.jpa.entity.ProcessEntity; +import io.sc.platform.flowable.service.ProcessEntityService; +import io.sc.platform.util.FileUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContext; + +import java.io.IOException; +import java.util.List; +import java.util.Locale; + +public class SampleWorkFlowInitializer implements ApplicationInitializer{ + private static final Logger log =LoggerFactory.getLogger(SampleWorkFlowInitializer.class); + private Boolean isInitialized =null; + private ApplicationContext applicationContext; + private ProcessEntityService processEntityService; + + private static final String KEY = "SAMPLE"; + private static final String I18N_KEY = "WORK_FLOW.SAMPLE"; + private static final String BPMN_PATH = "classpath:/workflow/irbs/cust/rating/SAMPLE.bpmn"; + + @Override + public void init(ApplicationContext applicationContext) { + this.processEntityService =applicationContext.getBean(ProcessEntityService.class); + this.applicationContext =applicationContext; + } + + @Override + public int getOrder() { + return 1100; + } + + @Override + public synchronized boolean isInitialized() { + if(isInitialized!=null) { + return isInitialized; + } + List entities =processEntityService.getRepository().findByKey(KEY); + if(entities==null || entities.isEmpty()){ + isInitialized =false; + }else { + isInitialized = true; + } + return isInitialized; + } + + @Override + public void execute() throws ApplicationInitializerExecuteException { + try { + ProcessEntity entity = new ProcessEntity(); + entity.setCategory(KEY); + entity.setKey(KEY); + entity.setName(applicationContext.getMessage(I18N_KEY, null, Locale.getDefault())); + entity.setStatus(ProcessStatus.RELEASE); + entity.setVersion(1); + entity.setCanClaimTask(false); + entity.setXml(getWorkflowXmlContent()); + entity = processEntityService.add(entity); + processEntityService.deploy(entity.getId()); + }catch (Exception e){ + log.error("",e); + throw new ApplicationInitializerExecuteException(e); + } + } + + private String getWorkflowXmlContent() throws IOException { + return FileUtil.readString(BPMN_PATH, Environment.DEFAULT_CHARSET_NAME); + } +} 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 3d81281..4b21362 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 @@ -1,13 +1,13 @@ package irbs.cust.rating.service.impl; import io.sc.engine.rule.core.po.resource.ModelResource; -import io.sc.platform.core.util.StringUtil; import io.sc.platform.flowable.support.ProcessTaskWrapper; import io.sc.platform.mvc.service.SystemParameterService; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.util.EntityVoUtil; import io.sc.platform.security.util.SecurityUtil; +import io.sc.platform.util.StringUtil; import irbs.cust.rating.constant.ProcessConstant; import irbs.cust.rating.constant.RatingConstant; import irbs.cust.rating.enums.*; @@ -617,6 +617,11 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl params = new HashMap<>(); params.put("assignee", SecurityUtil.getLoginName()); List res = namedParameterJdbcTemplate.query(sql, params, HomeTotalWrapperRowMapper); diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/ModelLibServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/ModelLibServiceImpl.java index 8796f86..bb1e203 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/ModelLibServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/ModelLibServiceImpl.java @@ -3,8 +3,12 @@ package irbs.cust.rating.service.impl; import com.fasterxml.jackson.databind.ObjectMapper; import io.sc.engine.rule.client.enums.LoaderMode; import io.sc.engine.rule.client.spring.service.ExecutorFactoryService; +import io.sc.engine.rule.core.ParameterResult; +import io.sc.engine.rule.core.ResourceResult; +import io.sc.engine.rule.core.code.ExecuteUnit; +import io.sc.engine.rule.core.code.ExecuteUnit4Resource; import io.sc.engine.rule.core.enums.ParameterType; -import io.sc.platform.core.util.StringUtil; +import io.sc.engine.rule.server.resource.service.support.ResourceWrapper; import io.sc.platform.mvc.service.SystemParameterService; import irbs.cust.rating.jpa.entity.RatingCompanyCustomer; import irbs.cust.rating.service.FinanceReportService; @@ -16,10 +20,6 @@ import org.springframework.stereotype.Service; import io.sc.engine.rule.client.Executor; import io.sc.engine.rule.client.ExecutorBuilder; import io.sc.engine.rule.client.enums.ExecutorMode; -import io.sc.engine.rule.core.code.impl.support.ParameterResult; -import io.sc.engine.rule.core.code.impl.support.ResourceResult; -import io.sc.engine.rule.core.code.impl.support.ResourceWrapper; -import io.sc.engine.rule.core.code.impl.support.ResourceWrapper4Resource; import io.sc.engine.rule.core.po.resource.ModelResource; import java.util.HashMap; @@ -92,7 +92,7 @@ public class ModelLibServiceImpl implements ModelLibService { result = executor.executeByCode(callModelCode,null, params); } } catch (Exception e) { - System.out.println(e); + e.printStackTrace(); throw new RuntimeException("调用评级模型出错，模型编码为：" + callModelCode + "，请确认模型是否部署正确。"); } @@ -121,10 +121,10 @@ public class ModelLibServiceImpl implements ModelLibService { // String modelResourceUrl = systemParameterService.getParameter("parameter.irbs.engine.remote.config.re.url"); // Executor executor = new ExecutorBuilder().executor(ExecutorMode.REMOTE).url(modelResourceUrl).build(); Executor executor = executorFactoryService.getExecutor(); - ResourceWrapper resourceWrapper = executor.getLoader().getResourceByCode(modelCode, null); + ExecuteUnit resourceWrapper = executor.getLoader().load(modelCode, null); if(resourceWrapper != null) { - if(resourceWrapper instanceof ResourceWrapper4Resource) { - ResourceWrapper4Resource resourceWrapper4Resource =(ResourceWrapper4Resource)resourceWrapper; + if(resourceWrapper instanceof ExecuteUnit4Resource) { + ExecuteUnit4Resource resourceWrapper4Resource =(ExecuteUnit4Resource)resourceWrapper; io.sc.engine.rule.core.po.resource.Resource resource = resourceWrapper4Resource.getResource(); if(resource instanceof ModelResource) { return (ModelResource)resource; diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingCompanyCustomerServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingCompanyCustomerServiceImpl.java index d8de4e0..1bee9df 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingCompanyCustomerServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingCompanyCustomerServiceImpl.java @@ -1,7 +1,7 @@ package irbs.cust.rating.service.impl; -import io.sc.platform.core.util.StringUtil; import io.sc.platform.orm.service.impl.DaoServiceImpl; +import io.sc.platform.util.StringUtil; import irbs.cust.rating.enums.RatingProcessStatus; import irbs.cust.rating.enums.RatingStepType; import irbs.cust.rating.jpa.entity.CompanyRating; diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingIndexServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingIndexServiceImpl.java index 56e5acc..eed25f9 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingIndexServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingIndexServiceImpl.java @@ -1,13 +1,15 @@ package irbs.cust.rating.service.impl; import io.sc.engine.rule.client.spring.service.ExecutorFactoryService; +import io.sc.engine.rule.core.ParameterResult; +import io.sc.engine.rule.core.ResourceResult; import io.sc.engine.rule.core.po.model.parameter.IndicatorParameter; -import io.sc.platform.core.util.StringUtil; import io.sc.platform.jdbc.sql.condition.Condition; +import io.sc.platform.lcdp.form.service.JdbcTemplateService; import io.sc.platform.mvc.service.SystemParameterService; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; -import io.sc.platform.page.config.service.JdbcTemplateService; +import io.sc.platform.util.StringUtil; import irbs.cust.rating.constant.RatingConstant; import irbs.cust.rating.enums.ModelParamCode; import irbs.cust.rating.enums.ModelReturnCode; @@ -24,8 +26,6 @@ import org.springframework.stereotype.Service; import io.sc.engine.rule.client.Executor; import io.sc.engine.rule.client.ExecutorBuilder; import io.sc.engine.rule.client.enums.ExecutorMode; -import io.sc.engine.rule.core.code.impl.support.ParameterResult; -import io.sc.engine.rule.core.code.impl.support.ResourceResult; import io.sc.engine.rule.core.enums.ParameterType; import io.sc.engine.rule.core.po.model.Model; import io.sc.engine.rule.core.po.model.Parameter; diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingReportShowScoreRoleServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingReportShowScoreRoleServiceImpl.java index edb459a..49b7ca4 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingReportShowScoreRoleServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/RatingReportShowScoreRoleServiceImpl.java @@ -1,10 +1,10 @@ package irbs.cust.rating.service.impl; import io.sc.platform.jdbc.sql.condition.Condition; +import io.sc.platform.lcdp.form.service.JdbcTemplateService; import io.sc.platform.mvc.service.SystemParameterService; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; -import io.sc.platform.page.config.service.JdbcTemplateService; import io.sc.platform.security.util.SecurityUtil; import io.sc.platform.system.role.jpa.entity.RoleEntity; import io.sc.platform.system.role.service.RoleService; diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/TaskOperationServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/TaskOperationServiceImpl.java index 77fe03d..aa90577 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/TaskOperationServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/TaskOperationServiceImpl.java @@ -1,8 +1,8 @@ package irbs.cust.rating.service.impl; import com.fasterxml.jackson.databind.ObjectMapper; +import io.sc.platform.lcdp.form.service.JdbcTemplateService; import io.sc.platform.orm.service.support.QueryParameter; -import io.sc.platform.page.config.service.JdbcTemplateService; import io.sc.platform.security.util.SecurityUtil; import irbs.cust.rating.constant.TaskVariable; import irbs.cust.rating.jpa.support.WaitTaskWrapper; diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/util/DateUtil.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/util/DateUtil.java index 7666281..f342f4a 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/util/DateUtil.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/util/DateUtil.java @@ -1,6 +1,6 @@ package irbs.cust.rating.util; -import io.sc.platform.core.util.StringUtil; +import io.sc.platform.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/CustRating.bpmn b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/CustRating.bpmn index 3330936..907892f 100644 --- a/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/CustRating.bpmn +++ b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/CustRating.bpmn @@ -40,42 +40,68 @@ - - - - - + + + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,37 +129,76 @@ + + + + + + - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - - - + + + + + + + + + - - - + + + - - - + + + @@ -145,10 +210,16 @@ + + + + + + - - - + + + diff --git a/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/DEFAULT_CUSTOMER_F.bpmn b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/DEFAULT_CUSTOMER_F.bpmn new file mode 100644 index 0000000..98c96ce --- /dev/null +++ b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/DEFAULT_CUSTOMER_F.bpmn @@ -0,0 +1,101 @@ + + + + + + {"A2":"frAssigneeQueryService"} + + + + + ${desc} + + + + + + ${desc} + + + + + + + + ${desc} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/REBIRTH_CUSTOMER_F.bpmn b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/REBIRTH_CUSTOMER_F.bpmn new file mode 100644 index 0000000..b7234b4 --- /dev/null +++ b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/REBIRTH_CUSTOMER_F.bpmn @@ -0,0 +1,100 @@ + + + + + + {"A2":"frAssigneeQueryService"} + + + + + ${desc} + + + + + + ${desc} + + + + + + + + ${desc} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/RISK_EXPOSURE_FLOW.bpmn b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/RISK_EXPOSURE_FLOW.bpmn new file mode 100644 index 0000000..1ac9f3d --- /dev/null +++ b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/RISK_EXPOSURE_FLOW.bpmn @@ -0,0 +1,101 @@ + + + + + + {"A2":"frAssigneeQueryService"} + + + + + ${desc} + + + + + + ${desc} + + + + + + + + ${desc} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/SAMPLE.bpmn b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/SAMPLE.bpmn new file mode 100644 index 0000000..d7de309 --- /dev/null +++ b/irbs.cust.rating/src/main/resources/workflow/irbs/cust/rating/SAMPLE.bpmn @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/irbs.defaultManager/build.gradle b/irbs.defaultManager/build.gradle index e0f5dfa..aca52a1 100644 --- a/irbs.defaultManager/build.gradle +++ b/irbs.defaultManager/build.gradle @@ -2,7 +2,7 @@ dependencies { api( "io.sc:io.sc.platform.mvc:${platform_version}", "io.sc:io.sc.platform.flowable:${platform_version}", - "io.sc:io.sc.platform.page.config:${rwa_version}", "io.sc:io.sc.platform.scheduler.core:${platform_version}", + "io.sc:io.sc.platform.lcdp:${platform_version}" ) } diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoBatchServiceImpl.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoBatchServiceImpl.java index c609eae..9eeaafc 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoBatchServiceImpl.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoBatchServiceImpl.java @@ -1,6 +1,5 @@ package irbs.defaultManager.service.impl; -import io.sc.platform.core.util.StringUtil; import io.sc.platform.jdbc.DatabaseType; import io.sc.platform.orm.service.support.OperatorType; import io.sc.platform.orm.service.support.QueryParameter; @@ -8,6 +7,7 @@ import io.sc.platform.orm.service.support.criteria.Criteria; import io.sc.platform.orm.service.support.criteria.impl.Equals; import io.sc.platform.scheduler.core.JobHandler; import io.sc.platform.scheduler.core.vo.Task; +import io.sc.platform.util.StringUtil; import irbs.defaultManager.enums.*; import irbs.defaultManager.jpa.entity.DefaultAutoDebt; import irbs.defaultManager.jpa.entity.DefaultAutoRule; diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoRuleServiceImpl.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoRuleServiceImpl.java index d5962f1..15fab38 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoRuleServiceImpl.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultAutoRuleServiceImpl.java @@ -1,32 +1,12 @@ package irbs.defaultManager.service.impl; -import io.sc.platform.flowable.controller.support.ProcessProperties; -import io.sc.platform.flowable.service.ProcessQueryService; -import io.sc.platform.flowable.support.ProcessTaskWrapper; import io.sc.platform.orm.service.impl.DaoServiceImpl; -import io.sc.platform.orm.service.support.QueryParameter; -import io.sc.platform.orm.util.EntityVoUtil; -import io.sc.platform.page.config.service.JdbcTemplateService; -import io.sc.platform.security.util.SecurityUtil; -import irbs.defaultManager.constant.DefaultConstant; -import irbs.defaultManager.enums.DefaultCustomerLogOperate; -import irbs.defaultManager.enums.DefaultEventItemStatus; -import irbs.defaultManager.enums.DefaultProcessStatus; -import irbs.defaultManager.jpa.entity.*; -import irbs.defaultManager.jpa.repository.*; -import irbs.defaultManager.jpa.vo.DefaultCognizanceVo; +import irbs.defaultManager.jpa.entity.DefaultAutoRule; +import irbs.defaultManager.jpa.repository.DefaultAutoRuleRepository; import irbs.defaultManager.service.DefaultAutoRuleService; -import irbs.defaultManager.service.DefaultCognizanceService; -import irbs.defaultManager.service.DefaultStatusService; -import org.flowable.engine.ProcessEngine; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.jdbc.core.RowMapper; -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Service; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; @Service("defaultAutoRuleService") public class DefaultAutoRuleServiceImpl extends DaoServiceImpl implements DefaultAutoRuleService { diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultCognizanceServiceImpl.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultCognizanceServiceImpl.java index 1f86b36..146c551 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultCognizanceServiceImpl.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultCognizanceServiceImpl.java @@ -3,10 +3,10 @@ package irbs.defaultManager.service.impl; import io.sc.platform.flowable.controller.support.ProcessProperties; import io.sc.platform.flowable.service.ProcessQueryService; import io.sc.platform.flowable.support.ProcessTaskWrapper; +import io.sc.platform.lcdp.form.service.JdbcTemplateService; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.util.EntityVoUtil; -import io.sc.platform.page.config.service.JdbcTemplateService; import io.sc.platform.security.util.SecurityUtil; import irbs.defaultManager.constant.DefaultConstant; import irbs.defaultManager.enums.DefaultCustomerLogOperate; diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java index 0e01780..3318800 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java @@ -4,10 +4,10 @@ import io.sc.platform.flowable.controller.support.ProcessProperties; import io.sc.platform.flowable.service.ProcessQueryService; import io.sc.platform.flowable.support.ProcessTaskWrapper; import io.sc.platform.jdbc.sql.condition.Condition; +import io.sc.platform.lcdp.form.service.JdbcTemplateService; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.util.EntityVoUtil; -import io.sc.platform.page.config.service.JdbcTemplateService; import io.sc.platform.security.util.SecurityUtil; import irbs.defaultManager.constant.DefaultConstant; import irbs.defaultManager.enums.DefaultCustomerLogOperate; diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/RebirthAutoBatchServiceImpl.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/RebirthAutoBatchServiceImpl.java index fb894ec..77cda12 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/RebirthAutoBatchServiceImpl.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/RebirthAutoBatchServiceImpl.java @@ -1,6 +1,5 @@ package irbs.defaultManager.service.impl; -import io.sc.platform.core.util.StringUtil; import io.sc.platform.mvc.service.SystemParameterService; import io.sc.platform.orm.service.support.OperatorType; import io.sc.platform.orm.service.support.QueryParameter; @@ -8,6 +7,7 @@ import io.sc.platform.orm.service.support.criteria.Criteria; import io.sc.platform.orm.service.support.criteria.impl.Equals; import io.sc.platform.scheduler.core.JobHandler; import io.sc.platform.scheduler.core.vo.Task; +import io.sc.platform.util.StringUtil; import irbs.defaultManager.enums.*; import irbs.defaultManager.jpa.entity.DefaultAutoDebt; import irbs.defaultManager.jpa.entity.DefaultAutoRule; diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/DateUtil.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/DateUtil.java index c0c5a2c..5e7a5a7 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/DateUtil.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/DateUtil.java @@ -14,7 +14,7 @@ public class DateUtil { if(dtStr != null){ dtStr = dtStr.replaceAll("[-./年月日]",""); try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyyMMdd"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyyMMdd"); } catch (ParseException e) { e.printStackTrace(); } @@ -29,7 +29,7 @@ public class DateUtil { dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6); } try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd"); } catch (ParseException e) { e.printStackTrace(); } @@ -44,7 +44,7 @@ public class DateUtil { dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6); } try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss"); } catch (ParseException e) { e.printStackTrace(); } @@ -54,7 +54,7 @@ public class DateUtil { public static String toString(Date dt, String format){ if(dt != null){ - return io.sc.platform.core.util.DateUtil.formatDate(dt, format); + return io.sc.platform.util.DateUtil.formatDate(dt, format); } return null; } diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/RptSqlFormat.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/RptSqlFormat.java index 8b97787..2e7a9fd 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/RptSqlFormat.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/utils/RptSqlFormat.java @@ -1,6 +1,7 @@ package irbs.defaultManager.utils; -import io.sc.platform.core.util.StringUtil; + +import io.sc.platform.util.StringUtil; import java.util.Map; diff --git a/irbs.feature/src/main/java/irbs/feature/service/impl/CustFeatureCalcBatchServiceImpl.java b/irbs.feature/src/main/java/irbs/feature/service/impl/CustFeatureCalcBatchServiceImpl.java index 4f10e14..e499fb9 100644 --- a/irbs.feature/src/main/java/irbs/feature/service/impl/CustFeatureCalcBatchServiceImpl.java +++ b/irbs.feature/src/main/java/irbs/feature/service/impl/CustFeatureCalcBatchServiceImpl.java @@ -4,15 +4,12 @@ import io.sc.engine.rule.client.Executor; import io.sc.engine.rule.client.runtime.impl.groovy.GroovyScriptEngineService; import io.sc.engine.rule.client.runtime.impl.groovy.GroovyScriptEngineServiceImpl; import io.sc.engine.rule.client.spring.service.ExecutorFactoryService; +import io.sc.engine.rule.core.ParameterResult; +import io.sc.engine.rule.core.ResourceResult; +import io.sc.engine.rule.core.code.ExecuteUnit; import io.sc.engine.rule.core.code.SourceCode; -import io.sc.engine.rule.core.code.impl.GroovySourceCodeGenerator; -import io.sc.engine.rule.core.code.impl.support.ParameterResult; -import io.sc.engine.rule.core.code.impl.support.ResourceResult; -import io.sc.engine.rule.core.code.impl.support.ResourceWrapper; -import io.sc.engine.rule.core.po.dictionary.UserDefinedJavaClassDictionary; -import io.sc.engine.rule.server.dictionary.entity.UserDefinedJavaClassDictionaryEntity; +import io.sc.engine.rule.core.code.generator.GroovySourceCodeGenerator; import io.sc.engine.rule.server.dictionary.entity.UserDefinedJavaClassFieldEntity; -import io.sc.engine.rule.server.dictionary.repository.UserDefinedJavaClassFieldRepository; import io.sc.engine.rule.server.dictionary.service.UserDefinedJavaClassFieldService; import io.sc.platform.jdbc.DatabaseType; import io.sc.platform.orm.service.support.OperatorType; @@ -73,8 +70,8 @@ public class CustFeatureCalcBatchServiceImpl implements CustFeatureCalcBatchServ DatabaseType type = DatabaseType.fromMetaData(dataSource); String dbType = type.getProductName(); Executor executor =executorFactoryService.getExecutor(); - ResourceWrapper resourceWrapper =executor.getLoader().getResourceByCode(SHRCB_LIB_CODE,null); - SourceCode groovySourceCode =new GroovySourceCodeGenerator().generateSourceCodeByCode(SHRCB_LIB_CODE,null,resourceWrapper); + ExecuteUnit resourceWrapper =executor.getLoader().load(SHRCB_LIB_CODE,null); + SourceCode groovySourceCode =new GroovySourceCodeGenerator().generate(SHRCB_LIB_CODE,null,resourceWrapper); int i = 1; BatchSqlUpdate bsu = null; for(Map map : list){ @@ -513,7 +510,7 @@ public class CustFeatureCalcBatchServiceImpl implements CustFeatureCalcBatchServ } } Executor executor = executorFactoryService.getExecutor(); - ResourceResult result = executor.executeByCode("QYCW_ZB",null,kiMap); + ResourceResult result = executor.executeByCode("QYCW_ZB", null, kiMap); if(result != null && !CollectionUtils.isEmpty(result.getData())) { List results = result.getData(); List res = new ArrayList<>(); diff --git a/irbs.feature/src/main/java/irbs/feature/utils/DateUtil.java b/irbs.feature/src/main/java/irbs/feature/utils/DateUtil.java index 6fa3ac3..78c7188 100644 --- a/irbs.feature/src/main/java/irbs/feature/utils/DateUtil.java +++ b/irbs.feature/src/main/java/irbs/feature/utils/DateUtil.java @@ -10,7 +10,7 @@ public class DateUtil { if(dtStr != null){ dtStr = dtStr.replaceAll("[-./年月日]",""); try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyyMMdd"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyyMMdd"); } catch (ParseException e) { e.printStackTrace(); } @@ -25,7 +25,7 @@ public class DateUtil { dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6); } try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd"); } catch (ParseException e) { e.printStackTrace(); } @@ -40,7 +40,7 @@ public class DateUtil { dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6); } try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss"); } catch (ParseException e) { e.printStackTrace(); } @@ -50,7 +50,7 @@ public class DateUtil { public static String toString(Date dt, String format){ if(dt != null){ - return io.sc.platform.core.util.DateUtil.formatDate(dt, format); + return io.sc.platform.util.DateUtil.formatDate(dt, format); } return null; } diff --git a/irbs.frontend/package.json b/irbs.frontend/package.json index cbb4424..3ee29c2 100644 --- a/irbs.frontend/package.json +++ b/irbs.frontend/package.json @@ -7,11 +7,11 @@ "author": "", "license": "ISC", "scripts": { - "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml", + "clean": "platform clean dist ./node_modules ./pnpm-lock.yaml ./package-lock.json", "dev": "nodemon", "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack serve --config webpack.env.serve.cjs", "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack --config webpack.env.build.cjs", - "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", + "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", "sync": "platform sync" }, "engines": { @@ -23,95 +23,103 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.24.7", - "@babel/preset-env": "7.24.7", - "@babel/preset-typescript": "7.24.7", - "@babel/plugin-transform-class-properties": "7.24.7", - "@babel/plugin-transform-object-rest-spread": "7.24.7", - "@quasar/app-webpack": "3.13.2", + "@babel/core": "7.26.0", + "@babel/plugin-transform-class-properties": "7.25.9", + "@babel/plugin-transform-object-rest-spread": "7.25.9", + "@babel/preset-env": "7.26.0", + "@babel/preset-typescript": "7.26.0", + "@quasar/app-webpack": "4.0.0-rc.4", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "20.14.10", - "@typescript-eslint/eslint-plugin": "7.15.0", - "@typescript-eslint/parser": "7.15.0", - "@vue/compiler-sfc": "3.4.31", + "@types/node": "22.10.0", + "@typescript-eslint/eslint-plugin": "8.16.0", + "@typescript-eslint/parser": "8.16.0", + "@vue/babel-plugin-jsx": "1.2.5", + "@vue/compiler-sfc": "3.5.13", + "@vuepress/bundler-webpack": "2.0.0-rc.15", + "@vuepress/theme-default": "2.0.0-rc.49", "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.19", - "babel-loader": "9.1.3", + "autoprefixer": "10.4.20", + "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "8.56.0", + "eslint": "9.15.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-vue": "9.27.0", + "eslint-plugin-prettier": "5.2.1", + "eslint-plugin-vue": "9.31.0", "eslint-webpack-plugin": "4.2.0", - "html-webpack-plugin": "5.6.0", + "html-webpack-plugin": "5.6.3", "json5": "2.2.3", - "mini-css-extract-plugin": "2.9.0", - "nodemon": "3.1.4", - "postcss": "8.4.39", + "mini-css-extract-plugin": "2.9.2", + "nodemon": "3.1.7", + "postcss": "8.4.49", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "9.6.0", - "prettier": "3.3.2", - "sass": "1.77.6", - "sass-loader": "14.2.1", - "typescript": "5.5.3", + "postcss-preset-env": "10.1.1", + "prettier": "3.4.1", + "sass": "1.81.0", + "sass-loader": "16.0.3", + "tailwindcss": "3.4.15", + "typescript": "5.5.4", "vue-loader": "17.4.2", - "webpack": "5.92.1", + "vuepress": "2.0.0-rc.15", + "webpack": "5.96.1", "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", - "webpack-dev-server": "5.0.4", - "webpack-merge": "6.0.1", - "@vue/babel-plugin-jsx": "1.2.2" + "webpack-dev-server": "5.1.0", + "webpack-merge": "6.0.1" }, "dependencies": { - "@quasar/extras": "1.16.12", - "@vueuse/core": "10.11.0", - "axios": "1.7.2", - "dayjs": "1.11.11", - "echarts": "5.5.1", - "exceljs": "4.4.0", - "file-saver": "2.0.5", - "luckyexcel": "1.0.1", - "mockjs": "1.1.0", - "pinia": "2.1.7", - "platform-core": "8.1.287", - "quasar": "2.15.4", - "tailwindcss": "3.4.4", - "vue": "3.4.31", - "vue-dompurify-html": "5.1.0", - "vue-i18n": "9.13.1", - "vue-router": "4.4.0", - "lodash": "4.17.21", - "@codemirror/autocomplete": "6.17.0", - "@codemirror/commands": "6.6.0", + "@codemirror/autocomplete": "6.18.3", + "@codemirror/commands": "6.7.1", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.7.0", + "@codemirror/lang-sql": "6.8.0", "@codemirror/lang-xml": "6.1.0", - "@codemirror/language": "6.10.2", - "@codemirror/search": "6.5.6", + "@codemirror/language": "6.10.4", + "@codemirror/search": "6.5.8", "@codemirror/state": "6.4.1", - "@codemirror/view": "6.28.4", + "@codemirror/view": "6.35.0", + "@maxgraph/core": "0.13.1", + "@quasar/extras": "1.16.13", + "@univerjs/core": "0.5.0", + "@univerjs/design": "0.5.0", + "@univerjs/docs": "0.5.0", + "@univerjs/docs-ui": "0.5.0", + "@univerjs/engine-formula": "0.5.0", + "@univerjs/engine-render": "0.5.0", + "@univerjs/facade": "0.5.0", + "@univerjs/sheets": "0.5.0", + "@univerjs/sheets-formula": "0.5.0", + "@univerjs/sheets-ui": "0.5.0", + "@univerjs/thread-comment": "0.5.0", + "@univerjs/ui": "0.5.0", + "@vueuse/core": "11.3.0", + "axios": "1.7.8", "codemirror": "6.0.1", + "dayjs": "1.11.13", + "echarts": "5.5.1", + "exceljs": "4.4.0", + "file-saver": "2.0.5", + "lodash": "4.17.21", + "luckyexcel": "1.0.1", + "mockjs": "1.1.0", + "node-sql-parser": "5.3.4", + "pinia": "2.2.6", + "platform-core": "8.2.32", + "quasar": "2.17.4", + "sort-array": "5.0.0", + "svg-path-commander": "2.1.5", + "tailwindcss": "3.4.4", + "vue": "3.5.13", "vue-codemirror6": "1.2.0", - "@maxgraph/core": "0.12.0", - "@univerjs/core": "0.2.0", - "@univerjs/design": "0.2.0", - "@univerjs/docs": "0.2.0", - "@univerjs/docs-ui": "0.2.0", - "@univerjs/engine-formula": "0.2.0", - "@univerjs/engine-render": "0.2.0", - "@univerjs/facade": "0.2.0", - "@univerjs/sheets": "0.2.0", - "@univerjs/sheets-formula": "0.2.0", - "@univerjs/sheets-ui": "0.2.0", - "@univerjs/ui": "0.2.0", + "vue-dompurify-html": "5.2.0", + "vue-i18n": "10.0.4", + "vue-router": "4.5.0", "xml-formatter": "3.6.3" } -} \ No newline at end of file +} diff --git a/irbs.frontend/src/i18n/messages.json b/irbs.frontend/src/i18n/messages.json index e85bb39..5477cf1 100644 --- a/irbs.frontend/src/i18n/messages.json +++ b/irbs.frontend/src/i18n/messages.json @@ -60,6 +60,7 @@ "menu.irbs.report.rptModelMonitorStable": "ModelMonitorStable", "menu.irbs.report.rptModelMonitorBinomialCheck": "ModelMonitorBinomialCheck", + "menu.irbs.config.headApprConf": "HeadApprConf", "menu.irbs.config.defaultAutoRule": "DefaultAutoRule", "menu.irbs.config.riskExposureRule": "RiskExposureRule", "menu.irbs.config.debtRatingProdRecRate": "ProductRecRate", diff --git a/irbs.frontend/src/i18n/messages_tw_CN.json b/irbs.frontend/src/i18n/messages_tw_CN.json index 761caa4..7290ea0 100644 --- a/irbs.frontend/src/i18n/messages_tw_CN.json +++ b/irbs.frontend/src/i18n/messages_tw_CN.json @@ -56,6 +56,7 @@ "menu.irbs.report.rptModelMonitorStable": "模型稳定性监控报表", "menu.irbs.report.rptModelMonitorBinomialCheck": "模型审慎性监控报表", + "menu.irbs.config.headApprConf": "总行审批客户配置", "menu.irbs.config.defaultAutoRule": "自动违约认定规则", "menu.irbs.config.riskExposureRule": "风险暴露分类规则", "menu.irbs.config.debtRatingProdRecRate": "产品基准回收率", diff --git a/irbs.frontend/src/i18n/messages_zh_CN.json b/irbs.frontend/src/i18n/messages_zh_CN.json index 761caa4..7290ea0 100644 --- a/irbs.frontend/src/i18n/messages_zh_CN.json +++ b/irbs.frontend/src/i18n/messages_zh_CN.json @@ -56,6 +56,7 @@ "menu.irbs.report.rptModelMonitorStable": "模型稳定性监控报表", "menu.irbs.report.rptModelMonitorBinomialCheck": "模型审慎性监控报表", + "menu.irbs.config.headApprConf": "总行审批客户配置", "menu.irbs.config.defaultAutoRule": "自动违约认定规则", "menu.irbs.config.riskExposureRule": "风险暴露分类规则", "menu.irbs.config.debtRatingProdRecRate": "产品基准回收率", diff --git a/irbs.frontend/src/menus/menus.json b/irbs.frontend/src/menus/menus.json index 185ca08..25d9a52 100644 --- a/irbs.frontend/src/menus/menus.json +++ b/irbs.frontend/src/menus/menus.json @@ -65,6 +65,9 @@ /*查询管理/上农内评企业客户特征变量查询*/ {"type":"ROUTE", "order":700, "parentId":"menu.irbs.query", "id":"menu.irbs.query.shrcbCorpCustFeature", "titleI18nKey":"menu.irbs.query.shrcbCorpCustFeature", "icon":"bi-file-earmark-ruled-fill", "routeName":"route.sys.comm.page", "routeQuery": {"id": "1a50a840-0e62-41b5-b952-9bd77a3775c2"}}, {"type":"GROUP", "order":700, "parentId":"menu.irbs", "id":"menu.irbs.config", "titleI18nKey":"menu.irbs.config", "icon":"display_settings"}, + /*系统配置/评级调整项定义*/ + /*系统配置/总行审批客户配置*/ + {"type":"ROUTE", "order":1, "parentId":"menu.irbs.config", "id":"menu.irbs.config.headApprConf", "titleI18nKey":"menu.irbs.config.headApprConf", "icon":"eva-image-2", "routeName":"route.irbs.config.headApprConf" }, /*系统配置/评级调整项定义*/ {"type":"ROUTE", "order":100, "parentId":"menu.irbs.config", "id":"menu.irbs.config.ratingAdjustment", "titleI18nKey":"menu.irbs.config.ratingAdjustment", "icon":"eva-map", "routeName":"route.sys.comm.page", "routeQuery": {"id": "9a803997-ee15-47cc-bed2-872ec92be17e"}}, /*系统配置/债项因素调整系数*/ @@ -83,7 +86,7 @@ {"type":"ROUTE", "order":600, "parentId":"menu.irbs.config", "id":"menu.irbs.config.debtRatingAdjRate", "titleI18nKey":"menu.irbs.config.debtRatingAdjRate", "icon":"eva-file-text", "routeName":"route.sys.comm.page", "routeQuery": {"id": "d2b29ad7-5f84-4c94-bdca-bb6dac4434fa"}}, /*系统配置/债项评级-抵质押物回收率*/ {"type":"ROUTE", "order":700, "parentId":"menu.irbs.config", "id":"menu.irbs.config.pledgeRecRate", "titleI18nKey":"menu.irbs.config.pledgeRecRate", "icon":"eva-grid-outline", "routeName":"route.sys.comm.page", "routeQuery": {"id": "16ecfd08-371c-4d05-9e3a-9ab77b1fd748"}}, - {"type":"ROUTE", "order":800, "parentId":"menu.irbs.config", "id":"menu.irbs.config.mainScale", "titleI18nKey":"menu.irbs.config.mainScale", "icon":"sym_o_account_balance_wallet", "routeName":"route.irbs.config.mainScale"}, + {"type":"ROUTE", "order":800, "parentId":"menu.irbs.config", "id":"menu.irbs.config.mainScale", "titleI18nKey":"menu.irbs.config.mainScale", "icon":"signal_cellular_null", "routeName":"route.irbs.config.mainScale"}, /*系统配置/财报模板映射*/ {"type":"ROUTE", "order":900, "parentId":"menu.irbs.config", "id":"menu.irbs.config.financialMapping", "titleI18nKey":"menu.irbs.config.financialMapping", "icon":"bi-reception-3", "routeName":"route.irbs.config.financialMapping"}, {"type":"GROUP", "order":800, "parentId":"menu.irbs", "id":"menu.irbs.report", "titleI18nKey":"menu.irbs.report", "icon":"find_in_page"}, diff --git a/irbs.frontend/src/routes/routes.json b/irbs.frontend/src/routes/routes.json index e5bf5c1..9752101 100644 --- a/irbs.frontend/src/routes/routes.json +++ b/irbs.frontend/src/routes/routes.json @@ -455,6 +455,18 @@ }, "children": [] }, + { + "name": "route.irbs.config.headApprConf", + "path": "irbs/config/headApprConf", + "parent": "/", + "priority": -1, + "component": "irbs.config.headApprConf", + "componentPath": "@/views/config/HeadApprConf.vue", + "redirect": null, + "meta": { + "permissions": ["/example/**/*"] + }, + }, { "name": "route.irbs.config.financialMapping", "path": "irbs/config/financialMapping", diff --git a/irbs.frontend/src/views/config/FinancialMapping.vue b/irbs.frontend/src/views/config/FinancialMapping.vue index 563bad1..c431e09 100644 --- a/irbs.frontend/src/views/config/FinancialMapping.vue +++ b/irbs.frontend/src/views/config/FinancialMapping.vue @@ -20,12 +20,12 @@ form: { colsNum: 2, fields: [ - { name: 'fromModelNo', label: '财报模板', type: 'select', options: fromModelNoOptions, colSpan: 'full' }, - { name: 'fromModelRuleType', label: '会计准则', type: 'select', options: fromModelRuleTypeOptions, colSpan: 'full' }, - { name: 'toRowSubject', label: '目标科目编码', type: 'text' }, - { name: 'toRowName', label: '目标科目名称', type: 'text' }, - { name: 'fromRowSubject', label: '原科目编码', type: 'text' }, - { name: 'fromRowName', label: '原科目名称', type: 'text' }, + { name: 'fromModelNo', label: '财报模板', type: 'w-select', options: fromModelNoOptions, colSpan: 'full' }, + { name: 'fromModelRuleType', label: '会计准则', type: 'w-select', options: fromModelRuleTypeOptions, colSpan: 'full' }, + { name: 'toRowSubject', label: '目标科目编码', type: 'w-text' }, + { name: 'toRowName', label: '目标科目名称', type: 'w-text' }, + { name: 'fromRowSubject', label: '原科目编码', type: 'w-text' }, + { name: 'fromRowName', label: '原科目名称', type: 'w-text' }, ], }, }" @@ -76,21 +76,21 @@ const financialMappingGrid = { { label: '财报模板', name: 'fromModelNo', - type: 'select', + type: 'w-select', options: fromModelNoOptions, defaultValue: '1', }, { label: '会计准则', name: 'fromModelRuleType', - type: 'select', + type: 'w-select', options: fromModelRuleTypeOptions, defaultValue: 'NEW', }, - { label: '原科目编码', name: 'fromRowSubject', type: 'text' }, - { label: '原科目名称', name: 'fromRowName', type: 'text' }, - { label: '目标科目编码', name: 'toRowSubject', type: 'text' }, - { label: '目标科目名称', name: 'toRowName', type: 'text' }, + { label: '原科目编码', name: 'fromRowSubject', type: 'w-text' }, + { label: '原科目名称', name: 'fromRowName', type: 'w-text' }, + { label: '目标科目编码', name: 'toRowSubject', type: 'w-text' }, + { label: '目标科目名称', name: 'toRowName', type: 'w-text' }, ], columns: [ { name: 'fromModelNo', label: '财报模板', format: fromModelNoFormat, width: 80 }, diff --git a/irbs.frontend/src/views/config/HeadApprConf.vue b/irbs.frontend/src/views/config/HeadApprConf.vue new file mode 100644 index 0000000..840b628 --- /dev/null +++ b/irbs.frontend/src/views/config/HeadApprConf.vue @@ -0,0 +1,67 @@ + + + diff --git a/irbs.frontend/src/views/config/MainScale.vue b/irbs.frontend/src/views/config/MainScale.vue index a07bf84..9fb9aff 100644 --- a/irbs.frontend/src/views/config/MainScale.vue +++ b/irbs.frontend/src/views/config/MainScale.vue @@ -19,11 +19,11 @@ form: { colsNum: 2, fields: [ - { name: 'level', label: '标尺等级', type: 'text' }, - { name: 'pd', label: '违约概率', type: 'number', precision: 4 }, - { name: 'admissionSuggest', label: '审批建议', type: 'text' }, - { name: 'down', label: 'PD下限', type: 'number', precision: 4 }, - { name: 'up', label: 'PD上限', type: 'number', precision: 4 }, + { name: 'level', label: '标尺等级', type: 'w-text' }, + { name: 'pd', label: '违约概率', type: 'w-number', precision: 4 }, + { name: 'admissionSuggest', label: '审批建议', type: 'w-text' }, + { name: 'down', label: 'PD下限', type: 'w-number', precision: 4 }, + { name: 'up', label: 'PD上限', type: 'w-number', precision: 4 }, ], }, }" @@ -109,9 +109,9 @@ const dialogHide = () => { emit('refresh'); }; -const dataSubmit = (data, callback_) => { - data['versionId'] = state.data['id']; - callback_(data); +const dataSubmit = (args) => { + args.data['versionId'] = state.data['id']; + args.callback_(args.data); }; const showLoading = (msg: string = '正在获取数据，请稍等...') => { diff --git a/irbs.frontend/src/views/config/MainScaleVersion.vue b/irbs.frontend/src/views/config/MainScaleVersion.vue index cb43355..744d4b0 100644 --- a/irbs.frontend/src/views/config/MainScaleVersion.vue +++ b/irbs.frontend/src/views/config/MainScaleVersion.vue @@ -21,9 +21,9 @@ form: { colsNum: 2, fields: [ - { name: 'code', label: '版本代码', type: 'text' }, - { name: 'name', label: '版本名称', type: 'text' }, - { name: 'version', label: '版本号', type: 'text' }, + { name: 'code', label: '版本代码', type: 'w-text' }, + { name: 'name', label: '版本名称', type: 'w-text' }, + { name: 'version', label: '版本号', type: 'w-text' }, ], }, }" @@ -192,11 +192,11 @@ const mainScaleVersionGrid = { }, ], queryFormFields: [ - { label: '版本代码', name: 'code' }, - { label: '版本名称', name: 'name' }, - { label: '版本状态', name: 'status', type: 'select', options: statusOptions }, - { label: '版本号', name: 'version' }, - { label: '审核状态', name: 'apprvStatus', type: 'select', options: apprvStatusOptions }, + { label: '版本代码', name: 'code', type: 'w-text' }, + { label: '版本名称', name: 'name', type: 'w-text' }, + { label: '版本状态', name: 'status', type: 'w-select', options: statusOptions }, + { label: '版本号', name: 'version', type: 'w-text' }, + { label: '审核状态', name: 'apprvStatus', type: 'w-select', options: apprvStatusOptions }, ], columns: [ { name: 'code', label: '版本代码' }, diff --git a/irbs.frontend/src/views/config/MainScaleVersionEditor.vue b/irbs.frontend/src/views/config/MainScaleVersionEditor.vue index f25fa74..aab9436 100644 --- a/irbs.frontend/src/views/config/MainScaleVersionEditor.vue +++ b/irbs.frontend/src/views/config/MainScaleVersionEditor.vue @@ -20,9 +20,9 @@ form: { colsNum: 2, fields: [ - { name: 'code', label: '版本代码', type: 'text' }, - { name: 'name', label: '版本名称', type: 'text' }, - { name: 'version', label: '版本号', type: 'text' }, + { name: 'code', label: '版本代码', type: 'w-text' }, + { name: 'name', label: '版本名称', type: 'w-text' }, + { name: 'version', label: '版本号', type: 'w-text' }, ], }, }" @@ -175,11 +175,11 @@ const mainScaleVersionGrid = { }, ], queryFormFields: [ - { label: '版本代码', name: 'code' }, - { label: '版本名称', name: 'name' }, - { label: '版本状态', name: 'status', type: 'select', options: statusOptions }, - { label: '版本号', name: 'version' }, - { label: '审核状态', name: 'apprvStatus', type: 'select', options: apprvStatusOptions }, + { label: '版本代码', name: 'code', type: 'w-text' }, + { label: '版本名称', name: 'name', type: 'w-text' }, + { label: '版本状态', name: 'status', type: 'w-select', options: statusOptions }, + { label: '版本号', name: 'version', type: 'w-text' }, + { label: '审核状态', name: 'apprvStatus', type: 'w-select', options: apprvStatusOptions }, ], columns: [ { name: 'code', label: '版本代码' }, diff --git a/irbs.frontend/src/views/config/MainScaleVersionFlowDialog.vue b/irbs.frontend/src/views/config/MainScaleVersionFlowDialog.vue index aaf0951..78f9355 100644 --- a/irbs.frontend/src/views/config/MainScaleVersionFlowDialog.vue +++ b/irbs.frontend/src/views/config/MainScaleVersionFlowDialog.vue @@ -1,7 +1,7 @@ @@ -146,9 +143,9 @@ const dialogButtons = [ const customerGrid = { queryFormFields: [ - { label: '客户号', name: 'custNo', type: 'text' }, //defaultValue: '2100601306' - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '企业规模', name: 'corpSizeCd', type: 'select', options: props.dictionary.optionsCustomerSizeCd }, + { label: '客户号', name: 'custNo', type: 'w-text' }, //defaultValue: '2100601306' + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '企业规模', name: 'corpSizeCd', type: 'w-select', options: props.dictionary.optionsCustomerSizeCd }, ], buttons: ['query', 'reset'], columns: [ diff --git a/irbs.frontend/src/views/custRating/RatingDialog.vue b/irbs.frontend/src/views/custRating/RatingDialog.vue index 1a785b8..d71d0fc 100644 --- a/irbs.frontend/src/views/custRating/RatingDialog.vue +++ b/irbs.frontend/src/views/custRating/RatingDialog.vue @@ -101,7 +101,7 @@ - + @@ -650,14 +650,14 @@ { state.qualitativeEditInfo.push({ label: i + 1 + '、' + index.indexName, name: index.indexCode, - type: 'option-group', + type: 'w-radio', + simple: false, + inline: false, + outlined: false, + dense: false, options: indexOptions, defaultValue: index.indexValue, }); } else { - state.qualitativeEditInfo.push({ label: i + 1 + '、' + index.indexName, name: index.indexCode, type: 'option-group', options: indexOptions }); + state.qualitativeEditInfo.push({ + label: i + 1 + '、' + index.indexName, + name: index.indexCode, + type: 'w-radio', + simple: false, + inline: false, + outlined: false, + dense: false, + options: indexOptions, + }); } state.qualitativeEditObj[index.indexCode] = [i + 1 + '、' + index.indexName, index]; } @@ -1409,12 +1422,25 @@ const quantitativeNext = async () => { state.qualitativeEditInfo.push({ label: i + 1 + '、' + index.indexName, name: index.indexCode, - type: 'option-group', + type: 'w-radio', + simple: false, + inline: false, + outlined: false, + dense: false, options: indexOptions, defaultValue: index.indexValue, }); } else { - state.qualitativeEditInfo.push({ label: i + 1 + '、' + index.indexName, name: index.indexCode, type: 'option-group', options: indexOptions }); + state.qualitativeEditInfo.push({ + label: i + 1 + '、' + index.indexName, + name: index.indexCode, + type: 'w-radio', + simple: false, + inline: false, + outlined: false, + dense: false, + options: indexOptions, + }); } state.qualitativeEditObj[index.indexCode] = [i + 1 + '、' + index.indexName, index]; } diff --git a/irbs.frontend/src/views/debtRating/LgdQuery.vue b/irbs.frontend/src/views/debtRating/LgdQuery.vue index abe6c99..cf3e1f2 100644 --- a/irbs.frontend/src/views/debtRating/LgdQuery.vue +++ b/irbs.frontend/src/views/debtRating/LgdQuery.vue @@ -26,11 +26,11 @@ const $q = useQuasar(); const appDebtRatingGridRef = ref(); const appDebtRatingGrid = { - buttons: [['query', 'separator', 'moreQuery'], 'reset'], + buttons: ['query', 'reset'], queryFormFields: [ - { label: '债项编号', name: 'contractNo', type: 'text' }, - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'contractNo', type: 'w-text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, ], columns: [ { name: 'contractNo', label: '债项编号' }, diff --git a/irbs.frontend/src/views/default/CognizanceApply.vue b/irbs.frontend/src/views/default/CognizanceApply.vue index 2f6b84d..291b4a5 100644 --- a/irbs.frontend/src/views/default/CognizanceApply.vue +++ b/irbs.frontend/src/views/default/CognizanceApply.vue @@ -51,7 +51,7 @@ const dictionary = { const cognizanceGrid = { buttons: [ - ['query', 'separator', 'moreQuery'], + 'query', 'reset', 'separator', { @@ -86,10 +86,10 @@ const cognizanceGrid = { 'separator', ], queryFormFields: [ - { label: '申请编号', name: 'id', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '流程状态', name: 'status', type: 'select', options: Options.enum(DefaultProcessStatusEnum) }, + { label: '申请编号', name: 'id', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '流程状态', name: 'status', type: 'w-select', options: Options.enum(DefaultProcessStatusEnum) }, ], columns: [ { name: 'id', label: '申请编号', width: 150 }, diff --git a/irbs.frontend/src/views/default/CognizanceDialog.vue b/irbs.frontend/src/views/default/CognizanceDialog.vue index d8f283d..235332f 100644 --- a/irbs.frontend/src/views/default/CognizanceDialog.vue +++ b/irbs.frontend/src/views/default/CognizanceDialog.vue @@ -83,9 +83,9 @@ form: { colsNum: 1, fields: [ - { name: 'eventCode', label: '违约事件', type: 'select', options: DefaultEventItemOptions, required: true }, - { name: 'eventStartTime', label: '事件开始时间', type: 'date', required: true }, - { name: 'eventDesc', label: '违约事件说明', type: 'textarea' }, + { name: 'eventCode', label: '违约事件', type: 'w-select', options: DefaultEventItemOptions, requiredIf: true }, + { name: 'eventStartTime', label: '事件开始时间', type: 'w-date', requiredIf: true }, + { name: 'eventDesc', label: '违约事件说明', type: 'w-textarea' }, ], }, }" @@ -98,12 +98,12 @@ reqPageStart: 1, }" @before-editor-data-submit=" - (data, callback) => { - data.defcusId = state.data['id']; - data.custNo = state.data['custNo']; - data.eventStatus = DefaultEventItemStatus.IN_DEFAULT; - data.isValid = false; - callback(data); + (args) => { + args.data.defcusId = state.data['id']; + args.data.custNo = state.data['custNo']; + args.data.eventStatus = DefaultEventItemStatus.IN_DEFAULT; + args.data.isValid = false; + args.callback(args.data); } " > @@ -199,8 +199,8 @@ ref="opinionFormRef" :cols-num="1" :fields="[ - { name: 'remarks', label: '意见说明', type: 'textarea', required: true, rows: 4 }, - { name: 'suggestUploadAnnx', label: '上传文件', type: 'file' }, + { name: 'remarks', label: '意见说明', type: 'w-textarea', requiredIf: true, rows: 4 }, + { name: 'suggestUploadAnnx', label: '上传文件', type: 'w-file' }, ]" > diff --git a/irbs.frontend/src/views/default/RebirthApply.vue b/irbs.frontend/src/views/default/RebirthApply.vue index b4f6712..6517a56 100644 --- a/irbs.frontend/src/views/default/RebirthApply.vue +++ b/irbs.frontend/src/views/default/RebirthApply.vue @@ -39,8 +39,8 @@ :query-form-cols-num="2" :config-button="false" :query-form-fields="[ - { name: 'CUST_NO', label: '客户号', type: 'text' }, - { name: 'CUST_NAME', label: '客户名称', type: 'text' }, + { name: 'CUST_NO', label: '客户号', type: 'w-text' }, + { name: 'CUST_NAME', label: '客户名称', type: 'w-text' }, ]" :pagination="{ reqPageStart: 1, @@ -91,7 +91,7 @@ const DefaultProcessStatusEnum = await EnumTools.fetch('irbs.defaultManager.enum const rebirthGrid = { buttons: [ - ['query', 'separator', 'moreQuery'], + 'query', 'reset', 'separator', { @@ -142,10 +142,10 @@ const rebirthGrid = { 'separator', ], queryFormFields: [ - { label: '申请编号', name: 'id', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '流程状态', name: 'status', type: 'select', options: Options.enum(DefaultProcessStatusEnum) }, + { label: '申请编号', name: 'id', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '流程状态', name: 'status', type: 'w-select', options: Options.enum(DefaultProcessStatusEnum) }, ], columns: [ { name: 'id', label: '申请编号' }, diff --git a/irbs.frontend/src/views/default/RebirthDialog.vue b/irbs.frontend/src/views/default/RebirthDialog.vue index c9acb9a..3f8c31a 100644 --- a/irbs.frontend/src/views/default/RebirthDialog.vue +++ b/irbs.frontend/src/views/default/RebirthDialog.vue @@ -178,8 +178,8 @@ ref="opinionFormRef" :cols-num="1" :fields="[ - { name: 'remarks', label: '意见说明', type: 'textarea', required: true, rows: 4 }, - { name: 'suggestUploadAnnx', label: '上传文件', type: 'file' }, + { name: 'remarks', label: '意见说明', type: 'w-textarea', requiredIf: true, rows: 4 }, + { name: 'suggestUploadAnnx', label: '上传文件', type: 'w-file' }, ]" > diff --git a/irbs.frontend/src/views/query/CorpCustFeatureRet.vue b/irbs.frontend/src/views/query/CorpCustFeatureRet.vue index 9c00f12..03129f8 100644 --- a/irbs.frontend/src/views/query/CorpCustFeatureRet.vue +++ b/irbs.frontend/src/views/query/CorpCustFeatureRet.vue @@ -36,8 +36,8 @@ const corpCustFeatureRetGridRef = ref(); const corpCustFeatureRetGrid = { buttons: ['query', 'reset', 'separator', 'export'], queryFormFields: [ - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, ], columns: [ { label: '客户编号', name: 'custNo' }, diff --git a/irbs.frontend/src/views/query/CustInfo.vue b/irbs.frontend/src/views/query/CustInfo.vue index 00908e6..958f9e6 100644 --- a/irbs.frontend/src/views/query/CustInfo.vue +++ b/irbs.frontend/src/views/query/CustInfo.vue @@ -39,11 +39,11 @@ const $q = useQuasar(); const custGridRef = ref(); const custGrid = { - buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'], + buttons: ['query', 'reset', 'separator', 'export'], queryFormFields: [ - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions }, ], columns: [ { name: 'custNo', label: '客户编号', align: 'center' }, diff --git a/irbs.frontend/src/views/query/CustRatingHist.vue b/irbs.frontend/src/views/query/CustRatingHist.vue index 1ea80cb..3f51e49 100644 --- a/irbs.frontend/src/views/query/CustRatingHist.vue +++ b/irbs.frontend/src/views/query/CustRatingHist.vue @@ -45,22 +45,22 @@ const $q = useQuasar(); const custRatingHistGridRef = ref(); const custRatingHistGrid = { - buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'], + buttons: ['query', 'reset', 'separator', 'export'], queryFormFields: [ - { label: '申请编号', name: 'id', type: 'text' }, - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions }, + { label: '申请编号', name: 'id', type: 'w-text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions }, { label: '认定等级', name: 'finalLevel', - type: 'select', + type: 'w-select', options: RatingLevelOptions, }, { label: '是否违约', name: 'defaultInd', - type: 'select', + type: 'w-select', options: DefaultFlagOptions, }, ], diff --git a/irbs.frontend/src/views/query/DefaultHist.vue b/irbs.frontend/src/views/query/DefaultHist.vue index 038e8bf..5b284cd 100644 --- a/irbs.frontend/src/views/query/DefaultHist.vue +++ b/irbs.frontend/src/views/query/DefaultHist.vue @@ -30,15 +30,15 @@ const $q = useQuasar(); const defaultHistGridRef = ref(); const defaultHistGrid = { - buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'], + buttons: ['query', 'reset', 'separator', 'export'], queryFormFields: [ - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions }, - { label: '违约前评级', name: 'ratingLevelHis', type: 'select', options: RatingLevelOptions }, - { label: '违约认定类型', name: 'defaultType', type: 'select', options: DefaultTypeOptions }, - { label: '客户经理名称', name: 'managerName', type: 'text' }, - { label: '所属机构', name: 'mgerOrgNm', type: 'text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions }, + { label: '违约前评级', name: 'ratingLevelHis', type: 'w-select', options: RatingLevelOptions }, + { label: '违约认定类型', name: 'defaultType', type: 'w-select', options: DefaultTypeOptions }, + { label: '客户经理名称', name: 'managerName', type: 'w-text' }, + { label: '所属机构', name: 'mgerOrgNm', type: 'w-text' }, ], columns: [ { label: '客户编号', name: 'custNo' }, diff --git a/irbs.frontend/src/views/query/InstitutionCustFeatureRet.vue b/irbs.frontend/src/views/query/InstitutionCustFeatureRet.vue index f0fef16..0018e9d 100644 --- a/irbs.frontend/src/views/query/InstitutionCustFeatureRet.vue +++ b/irbs.frontend/src/views/query/InstitutionCustFeatureRet.vue @@ -36,8 +36,8 @@ const institutionCustFeatureRetGridRef = ref(); const institutionCustFeatureRetGrid = { buttons: ['query', 'reset', 'separator', 'export'], queryFormFields: [ - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, ], columns: [ { label: '客户编号', name: 'custNo' }, diff --git a/irbs.frontend/src/views/query/PingAnLgdHist.vue b/irbs.frontend/src/views/query/PingAnLgdHist.vue index 715c153..652d152 100644 --- a/irbs.frontend/src/views/query/PingAnLgdHist.vue +++ b/irbs.frontend/src/views/query/PingAnLgdHist.vue @@ -26,11 +26,11 @@ const $q = useQuasar(); const pingAnLgdHistGridRef = ref(); const pingAnLgdHistGrid = { - buttons: [['query', 'separator', 'moreQuery'], 'reset'], + buttons: ['query', 'reset'], queryFormFields: [ - { label: '债项编号', name: 'contractNo', type: 'text' }, - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'contractNo', type: 'w-text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, ], columns: [ { name: 'contractNo', label: '债项编号' }, diff --git a/irbs.frontend/src/views/query/RebirthDefaultHist.vue b/irbs.frontend/src/views/query/RebirthDefaultHist.vue index c245cf3..fc9f340 100644 --- a/irbs.frontend/src/views/query/RebirthDefaultHist.vue +++ b/irbs.frontend/src/views/query/RebirthDefaultHist.vue @@ -38,14 +38,14 @@ const $q = useQuasar(); const rebirthDefaultHistGridRef = ref(); const rebirthDefaultHistGrid = { - buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'], + buttons: ['query', 'reset', 'separator', 'export'], queryFormFields: [ - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '客户类型', name: 'custType', type: 'select', options: CustTypeOptions }, - { label: '违约重生类型', name: 'defaultRebornType', type: 'select', options: DefaultRebonTypeOptions }, - { label: '客户经理名称', name: 'managerName', type: 'text' }, - { label: '所属机构', name: 'defaMgerOrgNm', type: 'text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '客户类型', name: 'custType', type: 'w-select', options: CustTypeOptions }, + { label: '违约重生类型', name: 'defaultRebornType', type: 'w-select', options: DefaultRebonTypeOptions }, + { label: '客户经理名称', name: 'managerName', type: 'w-text' }, + { label: '所属机构', name: 'defaMgerOrgNm', type: 'w-text' }, ], columns: [ { label: '客户编号', name: 'custNo' }, diff --git a/irbs.frontend/src/views/query/RiskExposureHist.vue b/irbs.frontend/src/views/query/RiskExposureHist.vue index 6748285..4c1747c 100644 --- a/irbs.frontend/src/views/query/RiskExposureHist.vue +++ b/irbs.frontend/src/views/query/RiskExposureHist.vue @@ -35,16 +35,16 @@ const $q = useQuasar(); const riskExposureHisGridRef = ref(); const riskExposureHisGrid = { - buttons: [['query', 'separator', 'moreQuery'], 'reset', 'separator', 'export'], + buttons: ['query', 'reset', 'separator', 'export'], queryFormFields: [ - { label: '业务编号', name: 'businessNo', type: 'text' }, - { label: '客户编号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, - { label: '客户类型', name: 'custType', type: 'select', options: RiskCustTypeOptions }, - { label: '发起方式', name: 'startWay', type: 'select', options: StartWayOptions }, - { label: '分类结果', name: 'finalResult', type: 'select', options: RiskExposureOptions }, - { label: '客户经理名称', name: 'managerName', type: 'text' }, - { label: '所属机构', name: 'mgerOrgNm', type: 'text' }, + { label: '业务编号', name: 'businessNo', type: 'w-text' }, + { label: '客户编号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, + { label: '客户类型', name: 'custType', type: 'w-select', options: RiskCustTypeOptions }, + { label: '发起方式', name: 'startWay', type: 'w-select', options: StartWayOptions }, + { label: '分类结果', name: 'finalResult', type: 'w-select', options: RiskExposureOptions }, + { label: '客户经理名称', name: 'managerName', type: 'w-text' }, + { label: '所属机构', name: 'mgerOrgNm', type: 'w-text' }, ], columns: [ { label: '业务编号', name: 'businessNo' }, diff --git a/irbs.frontend/src/views/report/RptModelMonitorBinomialCheck.vue b/irbs.frontend/src/views/report/RptModelMonitorBinomialCheck.vue index 57917f2..fd34ebc 100644 --- a/irbs.frontend/src/views/report/RptModelMonitorBinomialCheck.vue +++ b/irbs.frontend/src/views/report/RptModelMonitorBinomialCheck.vue @@ -40,11 +40,11 @@ const rptModelMonitorBinomialCheckGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, diff --git a/irbs.frontend/src/views/report/RptModelMonitorDiff.vue b/irbs.frontend/src/views/report/RptModelMonitorDiff.vue index 2479437..6826258 100644 --- a/irbs.frontend/src/views/report/RptModelMonitorDiff.vue +++ b/irbs.frontend/src/views/report/RptModelMonitorDiff.vue @@ -40,11 +40,11 @@ const rptModelMonitorDiffGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '报告期', name: 'yearPeriod', - type: 'select', + type: 'w-select', options: [ { label: '往前推1年', value: '1' }, { label: '往前推2年', value: '2' }, @@ -57,7 +57,7 @@ const rptModelMonitorDiffGrid = { { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, diff --git a/irbs.frontend/src/views/report/RptModelMonitorStable.vue b/irbs.frontend/src/views/report/RptModelMonitorStable.vue index e9e4606..ce1db86 100644 --- a/irbs.frontend/src/views/report/RptModelMonitorStable.vue +++ b/irbs.frontend/src/views/report/RptModelMonitorStable.vue @@ -40,11 +40,11 @@ const rptModelMonitorStableGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, diff --git a/irbs.frontend/src/views/report/RptRatingAdjust.vue b/irbs.frontend/src/views/report/RptRatingAdjust.vue index c8e2210..26d9cc8 100644 --- a/irbs.frontend/src/views/report/RptRatingAdjust.vue +++ b/irbs.frontend/src/views/report/RptRatingAdjust.vue @@ -228,7 +228,7 @@ const state = reactive({ }, }); -const afterRequestData = (data) => { +const afterRequestData = (args) => { state.xData = []; state.custData.ratingCnt = []; state.custData.overturnCnt = []; @@ -237,8 +237,8 @@ const afterRequestData = (data) => { state.range.l2 = []; state.range.l3 = []; state.range.ln = []; - if (data && data.length > 0) { - data.forEach((item) => { + if (args.rows && args.rows.length > 0) { + args.rows.forEach((item) => { state.xData.push(item['ratingMonth']); state.custData.ratingCnt.push(item['custCnt']); state.custData.overturnCnt.push(item['adjCnt']); @@ -268,11 +268,11 @@ const rptRatingAdjustGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, @@ -302,7 +302,7 @@ const rptRatingAdjustGrid = { { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/RptRatingChange.vue b/irbs.frontend/src/views/report/RptRatingChange.vue index 77d21c3..ae2e687 100644 --- a/irbs.frontend/src/views/report/RptRatingChange.vue +++ b/irbs.frontend/src/views/report/RptRatingChange.vue @@ -81,11 +81,11 @@ const rptRatingChangeGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, @@ -115,7 +115,7 @@ const rptRatingChangeGrid = { { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/RptRatingDistribution.vue b/irbs.frontend/src/views/report/RptRatingDistribution.vue index 509c2a4..bcfaf5b 100644 --- a/irbs.frontend/src/views/report/RptRatingDistribution.vue +++ b/irbs.frontend/src/views/report/RptRatingDistribution.vue @@ -310,11 +310,11 @@ const rptRatingDistributionGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, @@ -344,7 +344,7 @@ const rptRatingDistributionGrid = { { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/RptRatingIndustryFocusDist.vue b/irbs.frontend/src/views/report/RptRatingIndustryFocusDist.vue index f5aa469..e5fd142 100644 --- a/irbs.frontend/src/views/report/RptRatingIndustryFocusDist.vue +++ b/irbs.frontend/src/views/report/RptRatingIndustryFocusDist.vue @@ -214,8 +214,8 @@ const state = reactive({ ratioSeriesData: [], }); -const afterRequestData = (data) => { - if (data && data.length > 0) { +const afterRequestData = (args) => { + if (args.rows && args.rows.length > 0) { state.xData = []; state.seriesData = []; state.legendData = []; @@ -230,7 +230,7 @@ const afterRequestData = (data) => { totalData[rptRatingIndustryFocusDistGrid.tableColumns[i]['columns'][0]['name']] = []; totalData[rptRatingIndustryFocusDistGrid.tableColumns[i]['columns'][1]['name']] = []; } - data.forEach((item) => { + args.rows.forEach((item) => { state.xData.push(item['industryName']); Object.keys(totalData).forEach((key) => { @@ -277,11 +277,11 @@ const rptRatingIndustryFocusDistGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, @@ -311,7 +311,7 @@ const rptRatingIndustryFocusDistGrid = { { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/RptRatingLoanBalanceMigrate.vue b/irbs.frontend/src/views/report/RptRatingLoanBalanceMigrate.vue index c97fcdf..bffe7f6 100644 --- a/irbs.frontend/src/views/report/RptRatingLoanBalanceMigrate.vue +++ b/irbs.frontend/src/views/report/RptRatingLoanBalanceMigrate.vue @@ -268,8 +268,8 @@ const state = reactive({ }, }); -const afterRequestData = (data) => { - if (data && data.length > 0) { +const afterRequestData = (args) => { + if (args.rows && args.rows.length > 0) { state.xData = []; state.seriesData = []; state.legendData = []; @@ -282,7 +282,7 @@ const afterRequestData = (data) => { ]); totalData[rptRatingLoanBalanceMigrateGrid.tableColumns[1].columns[i]['name']] = []; } - data.forEach((item) => { + args.rows.forEach((item) => { state.xData.push(item['ratingLevel']); state.up.cnt.push(item['upBal']); state.up.ratio.push(item['upRatio']); @@ -330,11 +330,11 @@ const rptRatingLoanBalanceMigrateGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, @@ -365,7 +365,7 @@ const rptRatingLoanBalanceMigrateGrid = { { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/RptRatingModelFocusDist.vue b/irbs.frontend/src/views/report/RptRatingModelFocusDist.vue index d8748a7..ab2df96 100644 --- a/irbs.frontend/src/views/report/RptRatingModelFocusDist.vue +++ b/irbs.frontend/src/views/report/RptRatingModelFocusDist.vue @@ -213,9 +213,8 @@ const state = reactive({ ratioSeriesData: [], }); -const afterRequestData = (data) => { - console.info('data=======', data); - if (data && data.length > 0) { +const afterRequestData = (args) => { + if (args.rows && args.rows.length > 0) { state.xData = []; state.seriesData = []; state.legendData = []; @@ -231,7 +230,7 @@ const afterRequestData = (data) => { totalData[rptRatingModelFocusDistGrid.tableColumns[i]['columns'][0]['name']] = []; totalData[rptRatingModelFocusDistGrid.tableColumns[i]['columns'][1]['name']] = []; } - data.forEach((item) => { + args.rows.forEach((item) => { state.xData.push(item['modelName']); Object.keys(totalData).forEach((key) => { @@ -278,11 +277,11 @@ const rptRatingModelFocusDistGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/RptRatingNumberMigrate.vue b/irbs.frontend/src/views/report/RptRatingNumberMigrate.vue index 93c2447..f9c3879 100644 --- a/irbs.frontend/src/views/report/RptRatingNumberMigrate.vue +++ b/irbs.frontend/src/views/report/RptRatingNumberMigrate.vue @@ -268,8 +268,8 @@ const state = reactive({ }, }); -const afterRequestData = (data) => { - if (data && data.length > 0) { +const afterRequestData = (args) => { + if (args.rows && args.rows.length > 0) { state.xData = []; state.seriesData = []; state.legendData = []; @@ -279,7 +279,7 @@ const afterRequestData = (data) => { ratingLevel.push([rptRatingNumberMigrateGrid.tableColumns[1].columns[i]['label'], [rptRatingNumberMigrateGrid.tableColumns[1].columns[i]['name']]]); totalData[rptRatingNumberMigrateGrid.tableColumns[1].columns[i]['name']] = []; } - data.forEach((item) => { + args.rows.forEach((item) => { state.xData.push(item['ratingLevel']); state.up.cnt.push(item['upCnt']); state.up.ratio.push(item['upRatio']); @@ -327,11 +327,11 @@ const rptRatingNumberMigrateGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, @@ -361,7 +361,7 @@ const rptRatingNumberMigrateGrid = { { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/RptRatingOrgFocusDist.vue b/irbs.frontend/src/views/report/RptRatingOrgFocusDist.vue index 5271141..9ce7a7e 100644 --- a/irbs.frontend/src/views/report/RptRatingOrgFocusDist.vue +++ b/irbs.frontend/src/views/report/RptRatingOrgFocusDist.vue @@ -212,8 +212,8 @@ const state = reactive({ ratioSeriesData: [], }); -const afterRequestData = (data) => { - if (data && data.length > 0) { +const afterRequestData = (args) => { + if (args.rows && args.rows.length > 0) { state.xData = []; state.seriesData = []; state.legendData = []; @@ -228,7 +228,7 @@ const afterRequestData = (data) => { totalData[rptRatingOrgFocusDistGrid.tableColumns[i]['columns'][0]['name']] = []; totalData[rptRatingOrgFocusDistGrid.tableColumns[i]['columns'][1]['name']] = []; } - data.forEach((item) => { + args.rows.forEach((item) => { state.xData.push(item['managerOrgName']); Object.keys(totalData).forEach((key) => { @@ -275,11 +275,11 @@ const rptRatingOrgFocusDistGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, diff --git a/irbs.frontend/src/views/report/RptRatingOverturn.vue b/irbs.frontend/src/views/report/RptRatingOverturn.vue index e3f2d74..b47879f 100644 --- a/irbs.frontend/src/views/report/RptRatingOverturn.vue +++ b/irbs.frontend/src/views/report/RptRatingOverturn.vue @@ -288,7 +288,7 @@ const state = reactive({ }, }); -const afterRequestData = (data) => { +const afterRequestData = (args) => { state.xData = []; state.custData.ratingCnt = []; state.custData.overturnCnt = []; @@ -299,8 +299,8 @@ const afterRequestData = (data) => { state.range.l2 = []; state.range.l3 = []; state.range.ln = []; - if (data && data.length > 0) { - data.forEach((item) => { + if (args.rows && args.rows.length > 0) { + args.rows.forEach((item) => { state.xData.push(item['ratingMonth']); state.custData.ratingCnt.push(item['custCnt']); state.custData.overturnCnt.push(item['overturnCnt']); @@ -332,11 +332,11 @@ const rptRatingOverturnGrid = { 'separator', ], queryFormFields: [ - { label: '报表日期', name: 'ratingMonth', type: 'date', defaultValue: '2023-07-01' }, + { label: '报表日期', name: 'ratingMonth', type: 'w-date', defaultValue: '2023-07-01' }, { label: '模型敞口', name: 'modelCode', - type: 'select', + type: 'w-select', options: [ { value: 'WHM1', label: '政府投融资平台' }, { value: 'WHM2', label: '事业单位' }, @@ -366,7 +366,7 @@ const rptRatingOverturnGrid = { { label: '分支机构', name: 'managerOrgCode', - type: 'select', + type: 'w-select', options: [ { value: '01002', label: '总行营业部' }, { value: '01003', label: 'JJJS开发区支行' }, diff --git a/irbs.frontend/src/views/report/tzblwdxfxbb.vue b/irbs.frontend/src/views/report/tzblwdxfxbb.vue index 966239b..41577af 100644 --- a/irbs.frontend/src/views/report/tzblwdxfxbb.vue +++ b/irbs.frontend/src/views/report/tzblwdxfxbb.vue @@ -28,9 +28,9 @@ ]" :query-form-cols-num="6" :query-form-fields="[ - { colSpan: 2, name: 'model', label: '模型', type: 'select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true }, - { name: 'year', label: '年', type: 'select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true }, - { name: 'month', label: '月', type: 'select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true }, + { colSpan: 2, name: 'model', label: '模型', type: 'w-select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true }, + { name: 'year', label: '年', type: 'w-select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true }, + { name: 'month', label: '月', type: 'w-select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true }, ]" :columns="[ { width: 200, name: 'tzl', label: '特征量' }, diff --git a/irbs.frontend/src/views/report/tzblwoeivbb.vue b/irbs.frontend/src/views/report/tzblwoeivbb.vue index bc72768..93ff66c 100644 --- a/irbs.frontend/src/views/report/tzblwoeivbb.vue +++ b/irbs.frontend/src/views/report/tzblwoeivbb.vue @@ -27,11 +27,11 @@ ]" :query-form-cols-num="8" :query-form-fields="[ - { colSpan: 2, name: 'model', label: '模型', type: 'select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true }, - { name: 'startYear', label: '开始年', type: 'select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true }, - { name: 'startMonth', label: '开始月', type: 'select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true }, - { name: 'endYear', label: '结束年', type: 'select', options: [2020, 2021, 2022, 2023, 2024], clearable: true }, - { name: 'endMonth', label: '结束月', type: 'select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], clearable: true }, + { colSpan: 2, name: 'model', label: '模型', type: 'w-select', options: ['A评分卡', 'B评分卡', 'K评分卡'], defaultValue: 'A评分卡', clearable: true }, + { name: 'startYear', label: '开始年', type: 'w-select', options: [2020, 2021, 2022, 2023, 2024], defaultValue: 2023, clearable: true }, + { name: 'startMonth', label: '开始月', type: 'w-select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], defaultValue: 6, clearable: true }, + { name: 'endYear', label: '结束年', type: 'w-select', options: [2020, 2021, 2022, 2023, 2024], clearable: true }, + { name: 'endMonth', label: '结束月', type: 'w-select', options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], clearable: true }, ]" :columns="[ { width: 200, name: 'tzl', label: '特征量' }, diff --git a/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue b/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue index 1460bfb..53a2fcc 100644 --- a/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue +++ b/irbs.frontend/src/views/riskExposure/HandmadeExposureDialog.vue @@ -89,9 +89,9 @@ { name: 'manResult', label: '人工分类结果', - type: 'select', + type: 'w-select', options: RiskExposureItemOptions, - required: true, + requiredIf: true, showIf: (args) => { if (state.data['processStatus'] === 'TO_BE_CHECKED') { return false; @@ -99,8 +99,8 @@ return true; }, }, - { name: 'remarks', label: '意见说明', type: 'textarea', required: true, rows: 4 }, - { name: 'suggestUploadAnnx', label: '上传文件', type: 'file' }, + { name: 'remarks', label: '意见说明', type: 'w-textarea', requiredIf: true, rows: 4 }, + { name: 'suggestUploadAnnx', label: '上传文件', type: 'w-file' }, ]" > diff --git a/irbs.frontend/src/views/riskExposure/LaunchExposureAdjustDialog.vue b/irbs.frontend/src/views/riskExposure/LaunchExposureAdjustDialog.vue index 2a9a8dc..cff8664 100644 --- a/irbs.frontend/src/views/riskExposure/LaunchExposureAdjustDialog.vue +++ b/irbs.frontend/src/views/riskExposure/LaunchExposureAdjustDialog.vue @@ -95,9 +95,9 @@ const dialogButtons = [ const toExposureAdjustGrid = { buttons: [['query', 'separator'], 'reset'], queryFormFields: [ - { label: '债项编号', name: 'businessNo', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'businessNo', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, ], columns: [ { name: 'businessNo', label: '债项编号' }, diff --git a/irbs.frontend/src/views/riskExposure/LaunchExposureDialog.vue b/irbs.frontend/src/views/riskExposure/LaunchExposureDialog.vue index f266d97..4a54ac0 100644 --- a/irbs.frontend/src/views/riskExposure/LaunchExposureDialog.vue +++ b/irbs.frontend/src/views/riskExposure/LaunchExposureDialog.vue @@ -95,9 +95,9 @@ const dialogButtons = [ const toExposureGrid = { buttons: [['query', 'separator'], 'reset'], queryFormFields: [ - { label: '债项编号', name: 'businessNo', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'businessNo', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, ], columns: [ { name: 'businessNo', label: '债项编号' }, diff --git a/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApply.vue b/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApply.vue index fb5588a..4b66ce9 100644 --- a/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApply.vue +++ b/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApply.vue @@ -38,7 +38,7 @@ import { useQuasar } from 'quasar'; import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core'; import LaunchExposureAdjustDialog from '@/views/riskExposure/LaunchExposureAdjustDialog.vue'; import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue'; -import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts'; +import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts'; const $q = useQuasar(); const riskExposureAdjustGridRef = ref(); @@ -47,7 +47,7 @@ const handmadeExposureDialogRef = ref(); const riskExposureAdjustGrid = { buttons: [ - ['query', 'separator', 'moreQuery'], + 'query', 'reset', 'separator', { @@ -80,19 +80,19 @@ const riskExposureAdjustGrid = { 'separator', ], queryFormFields: [ - { label: '债项编号', name: 'businessNo', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'businessNo', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, { label: '风险暴露分类', name: 'manResult', - type: 'select', - options: RiskExposureProcessStatus, + type: 'w-select', + options: RiskExposureItemOptions, }, { label: '流程状态', name: 'status', - type: 'select', + type: 'w-select', options: [ { value: 'TO_BE_SUBMITTED', label: '待发起' }, { value: 'RETURNED', label: '退回' }, diff --git a/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue b/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue index e8f5527..23dd6e1 100644 --- a/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue +++ b/irbs.frontend/src/views/riskExposure/RiskExposureAdjustApproval.vue @@ -48,7 +48,7 @@ import { useQuasar } from 'quasar'; import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager, SessionManager } from 'platform-core'; import LaunchExposureDialog from '@/views/riskExposure/LaunchExposureDialog.vue'; import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue'; -import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts'; +import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts'; const $q = useQuasar(); const riskExposureAdjustGridRef = ref(); @@ -91,19 +91,19 @@ const riskExposureAdjustGrid = { 'separator', ], queryFormFields: [ - { label: '债项编号', name: 'businessNo', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'businessNo', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, { label: '风险暴露分类', name: 'manResult', - type: 'select', - options: RiskExposureProcessStatus, + type: 'w-select', + options: RiskExposureItemOptions, }, { label: '流程状态', name: 'status', - type: 'select', + type: 'w-select', options: [ { value: 'TO_BE_SUBMITTED', label: '待发起' }, { value: 'RETURNED', label: '退回' }, diff --git a/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue b/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue index 25478f5..53aa9a2 100644 --- a/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue +++ b/irbs.frontend/src/views/riskExposure/RiskExposureApply.vue @@ -43,7 +43,7 @@ import { useQuasar } from 'quasar'; import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager } from 'platform-core'; import LaunchExposureDialog from '@/views/riskExposure/LaunchExposureDialog.vue'; import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue'; -import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts'; +import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts'; const $q = useQuasar(); const riskExposureGridRef = ref(); @@ -52,7 +52,7 @@ const handmadeExposureDialogRef = ref(); const riskExposureGrid = { buttons: [ - ['query', 'separator', 'moreQuery'], + 'query', 'reset', 'separator', { @@ -85,19 +85,19 @@ const riskExposureGrid = { 'separator', ], queryFormFields: [ - { label: '债项编号', name: 'businessNo', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'businessNo', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, { label: '风险暴露分类', name: 'manResult', - type: 'select', - options: RiskExposureProcessStatus, + type: 'w-select', + options: RiskExposureItemOptions, }, { label: '流程状态', name: 'status', - type: 'select', + type: 'w-select', options: [ { value: 'TO_BE_SUBMITTED', label: '待发起' }, { value: 'RETURNED', label: '退回' }, diff --git a/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue b/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue index 6b7be07..da23b05 100644 --- a/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue +++ b/irbs.frontend/src/views/riskExposure/RiskExposureApproval.vue @@ -43,7 +43,7 @@ import { useQuasar } from 'quasar'; import { Environment, EnumTools, DictionaryTools, Options, Formater, axios, NotifyManager, SessionManager } from 'platform-core'; import LaunchExposureDialog from '@/views/riskExposure/LaunchExposureDialog.vue'; import HandmadeExposureDialog from '@/views/riskExposure/HandmadeExposureDialog.vue'; -import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions } from './RiskExposure.ts'; +import { RiskExposureProcessStatus, RiskExposureTypeFormat, RiskCustTypeFormat, ProcessStatusOptions, RiskExposureItemOptions } from './RiskExposure.ts'; const $q = useQuasar(); const riskExposureGridRef = ref(); @@ -86,19 +86,19 @@ const riskExposureGrid = { 'separator', ], queryFormFields: [ - { label: '债项编号', name: 'businessNo', type: 'text' }, - { label: '客户号', name: 'custNo', type: 'text' }, - { label: '客户名称', name: 'custName', type: 'text' }, + { label: '债项编号', name: 'businessNo', type: 'w-text' }, + { label: '客户号', name: 'custNo', type: 'w-text' }, + { label: '客户名称', name: 'custName', type: 'w-text' }, { label: '风险暴露分类', name: 'manResult', - type: 'select', - options: RiskExposureProcessStatus, + type: 'w-select', + options: RiskExposureItemOptions, }, { label: '流程状态', name: 'status', - type: 'select', + type: 'w-select', options: [ { value: 'TO_BE_SUBMITTED', label: '待发起' }, { value: 'RETURNED', label: '退回' }, diff --git a/irbs.frontend/src/views/workbench/DoneTask.vue b/irbs.frontend/src/views/workbench/DoneTask.vue index 49c2be5..ba842c8 100644 --- a/irbs.frontend/src/views/workbench/DoneTask.vue +++ b/irbs.frontend/src/views/workbench/DoneTask.vue @@ -26,10 +26,10 @@ const gridRef = ref(); const grid = { queryFormFields: [ - { label: '业务流水号', name: 'BUSINESS_ID', type: 'text' }, - { label: '流程名称', name: 'PROC_NAME', type: 'text' }, - { label: '任务节点', name: 'TASK_NAME', type: 'text' }, - { label: '任务描述', name: 'TASK_DESC', type: 'text' }, + { label: '业务流水号', name: 'BUSINESS_ID', type: 'w-text' }, + { label: '流程名称', name: 'PROC_NAME', type: 'w-text' }, + { label: '任务节点', name: 'TASK_NAME', type: 'w-text' }, + { label: '任务描述', name: 'TASK_DESC', type: 'w-text' }, ], buttons: [ 'query', diff --git a/irbs.frontend/src/views/workbench/EndTask.vue b/irbs.frontend/src/views/workbench/EndTask.vue index d2cc2e7..7f3db0a 100644 --- a/irbs.frontend/src/views/workbench/EndTask.vue +++ b/irbs.frontend/src/views/workbench/EndTask.vue @@ -26,10 +26,10 @@ const gridRef = ref(); const grid = { queryFormFields: [ - { label: '业务流水号', name: 'BUSINESS_ID', type: 'text' }, - { label: '流程名称', name: 'PROC_NAME', type: 'text' }, - { label: '任务节点', name: 'TASK_NAME', type: 'text' }, - { label: '任务描述', name: 'TASK_DESC', type: 'text' }, + { label: '业务流水号', name: 'BUSINESS_ID', type: 'w-text' }, + { label: '流程名称', name: 'PROC_NAME', type: 'w-text' }, + { label: '任务节点', name: 'TASK_NAME', type: 'w-text' }, + { label: '任务描述', name: 'TASK_DESC', type: 'w-text' }, ], buttons: [ 'query', diff --git a/irbs.frontend/src/views/workbench/TodoTask.vue b/irbs.frontend/src/views/workbench/TodoTask.vue index 6a20962..7efed10 100644 --- a/irbs.frontend/src/views/workbench/TodoTask.vue +++ b/irbs.frontend/src/views/workbench/TodoTask.vue @@ -39,10 +39,10 @@ const handmadeExposureDialogRef = ref(); const grid = { queryFormFields: [ - { label: '业务流水号', name: 'BUSINESS_ID', type: 'text' }, - { label: '流程名称', name: 'PROC_NAME', type: 'text' }, - { label: '任务节点', name: 'TASK_NAME', type: 'text' }, - { label: '任务描述', name: 'TASK_DESC', type: 'text' }, + { label: '业务流水号', name: 'BUSINESS_ID', type: 'w-text' }, + { label: '流程名称', name: 'PROC_NAME', type: 'w-text' }, + { label: '任务节点', name: 'TASK_NAME', type: 'w-text' }, + { label: '任务描述', name: 'TASK_DESC', type: 'w-text' }, ], buttons: [ 'query', 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 5a7435d..389b418 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 @@ -1,7 +1,6 @@ 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; 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 d65610d..6a32697 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 @@ -1,7 +1,6 @@ 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; 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 a6277be..fc4af36 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 @@ -1,7 +1,6 @@ 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; 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 861f4de..71aae9f 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 @@ -1,7 +1,6 @@ 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; 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 8c1712a..da0d0cb 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 @@ -1,7 +1,6 @@ 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; 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 96df8a1..00cc4ee 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 @@ -1,7 +1,6 @@ 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; 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 323a6c2..b408b51 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 @@ -1,7 +1,6 @@ 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; 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 9ce2ea1..781e9a9 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 @@ -1,7 +1,6 @@ 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; 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 f05de23..3fef57d 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 @@ -1,7 +1,6 @@ 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; diff --git a/irbs.reports/src/main/java/irbs/reports/utils/RptSqlFormat.java b/irbs.reports/src/main/java/irbs/reports/utils/RptSqlFormat.java index ffd0ae9..302999e 100644 --- a/irbs.reports/src/main/java/irbs/reports/utils/RptSqlFormat.java +++ b/irbs.reports/src/main/java/irbs/reports/utils/RptSqlFormat.java @@ -1,6 +1,7 @@ package irbs.reports.utils; -import io.sc.platform.core.util.StringUtil; + +import io.sc.platform.util.StringUtil; import java.util.Map; diff --git a/irbs.riskExposure/build.gradle b/irbs.riskExposure/build.gradle index e0f5dfa..db4a5f6 100644 --- a/irbs.riskExposure/build.gradle +++ b/irbs.riskExposure/build.gradle @@ -2,7 +2,6 @@ dependencies { api( "io.sc:io.sc.platform.mvc:${platform_version}", "io.sc:io.sc.platform.flowable:${platform_version}", - "io.sc:io.sc.platform.page.config:${rwa_version}", "io.sc:io.sc.platform.scheduler.core:${platform_version}", ) } diff --git a/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureBatchServiceImpl.java b/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureBatchServiceImpl.java index 142fba1..7b116e3 100644 --- a/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureBatchServiceImpl.java +++ b/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureBatchServiceImpl.java @@ -1,10 +1,10 @@ package irbs.riskExposure.service.impl; -import io.sc.platform.core.util.StringUtil; import io.sc.platform.jdbc.DatabaseType; import io.sc.platform.orm.api.enums.DataComeFrom; import io.sc.platform.scheduler.core.JobHandler; import io.sc.platform.scheduler.core.vo.Task; +import io.sc.platform.util.StringUtil; import irbs.riskExposure.jpa.entity.RiskExposure; import irbs.riskExposure.jpa.entity.RiskExposureDebt; import irbs.riskExposure.jpa.entity.RiskExposureNameList; diff --git a/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureProcessServiceImpl.java b/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureProcessServiceImpl.java index 2908c80..70aff78 100644 --- a/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureProcessServiceImpl.java +++ b/irbs.riskExposure/src/main/java/irbs/riskExposure/service/impl/RiskExposureProcessServiceImpl.java @@ -51,6 +51,7 @@ public class RiskExposureProcessServiceImpl implements RiskExposureProcessServic } return new CompleteTaskResponse(); } catch (CompleteTaskException exception) { + exception.printStackTrace(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return CompleteTaskResponse.fromAssigneesJson(exception.getMessage()); } catch (Exception exception) { diff --git a/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/DateUtil.java b/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/DateUtil.java index f3e4ddc..385ca8e 100644 --- a/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/DateUtil.java +++ b/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/DateUtil.java @@ -14,7 +14,7 @@ public class DateUtil { if(dtStr != null){ dtStr = dtStr.replaceAll("[-./年月日]",""); try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyyMMdd"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyyMMdd"); } catch (ParseException e) { e.printStackTrace(); } @@ -28,7 +28,7 @@ public class DateUtil { dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6); } try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd"); } catch (ParseException e) { e.printStackTrace(); } @@ -43,7 +43,7 @@ public class DateUtil { dtStr = dtStr.substring(0,4) + "-" + dtStr.substring(4,6) + "-" + dtStr.substring(6); } try { - return io.sc.platform.core.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss"); + return io.sc.platform.util.DateUtil.parseDate(dtStr, "yyyy-MM-dd HH:mm:ss"); } catch (ParseException e) { e.printStackTrace(); } @@ -53,7 +53,7 @@ public class DateUtil { public static String toString(Date dt, String format){ if(dt != null){ - return io.sc.platform.core.util.DateUtil.formatDate(dt, format); + return io.sc.platform.util.DateUtil.formatDate(dt, format); } return null; } diff --git a/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/RptSqlFormat.java b/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/RptSqlFormat.java index b4f7d37..5c08cdf 100644 --- a/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/RptSqlFormat.java +++ b/irbs.riskExposure/src/main/java/irbs/riskExposure/utils/RptSqlFormat.java @@ -1,6 +1,7 @@ package irbs.riskExposure.utils; -import io.sc.platform.core.util.StringUtil; + +import io.sc.platform.util.StringUtil; import java.util.Map; diff --git a/irbs.shrcb.poc.frontend/package.json b/irbs.shrcb.poc.frontend/package.json index ef6eb33..bd94374 100644 --- a/irbs.shrcb.poc.frontend/package.json +++ b/irbs.shrcb.poc.frontend/package.json @@ -7,11 +7,11 @@ "author": "", "license": "ISC", "scripts": { - "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml", + "clean": "platform clean dist ./node_modules ./pnpm-lock.yaml ./package-lock.json", "dev": "nodemon", "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack serve --config webpack.env.serve.cjs", "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack --config webpack.env.build.cjs", - "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", + "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", "sync": "platform sync" }, "engines": { @@ -24,93 +24,103 @@ "no-git-checks": true }, "devDependencies": { - "@babel/core": "7.24.7", - "@babel/preset-env": "7.24.7", - "@babel/preset-typescript": "7.24.7", - "@babel/plugin-transform-class-properties": "7.24.7", - "@babel/plugin-transform-object-rest-spread": "7.24.7", - "@quasar/app-webpack": "3.13.2", + "@babel/core": "7.26.0", + "@babel/plugin-transform-class-properties": "7.25.9", + "@babel/plugin-transform-object-rest-spread": "7.25.9", + "@babel/preset-env": "7.26.0", + "@babel/preset-typescript": "7.26.0", + "@quasar/app-webpack": "4.0.0-rc.4", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "20.14.10", - "@typescript-eslint/eslint-plugin": "7.15.0", - "@typescript-eslint/parser": "7.15.0", - "@vue/compiler-sfc": "3.4.31", + "@types/node": "22.10.0", + "@typescript-eslint/eslint-plugin": "8.16.0", + "@typescript-eslint/parser": "8.16.0", + "@vue/babel-plugin-jsx": "1.2.5", + "@vue/compiler-sfc": "3.5.13", + "@vuepress/bundler-webpack": "2.0.0-rc.15", + "@vuepress/theme-default": "2.0.0-rc.49", "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.19", - "babel-loader": "9.1.3", + "autoprefixer": "10.4.20", + "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "8.56.0", + "eslint": "9.15.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-vue": "9.27.0", + "eslint-plugin-prettier": "5.2.1", + "eslint-plugin-vue": "9.31.0", "eslint-webpack-plugin": "4.2.0", - "html-webpack-plugin": "5.6.0", + "html-webpack-plugin": "5.6.3", "json5": "2.2.3", - "mini-css-extract-plugin": "2.9.0", - "nodemon": "3.1.4", - "postcss": "8.4.39", + "mini-css-extract-plugin": "2.9.2", + "nodemon": "3.1.7", + "postcss": "8.4.49", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "9.6.0", - "prettier": "3.3.2", - "sass": "1.77.6", - "sass-loader": "14.2.1", - "typescript": "5.5.3", + "postcss-preset-env": "10.1.1", + "prettier": "3.4.1", + "sass": "1.81.0", + "sass-loader": "16.0.3", + "tailwindcss": "3.4.15", + "typescript": "5.5.4", "vue-loader": "17.4.2", - "webpack": "5.92.1", + "vuepress": "2.0.0-rc.15", + "webpack": "5.96.1", "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", - "webpack-dev-server": "5.0.4", - "webpack-merge": "6.0.1", - "@vue/babel-plugin-jsx": "1.2.2" + "webpack-dev-server": "5.1.0", + "webpack-merge": "6.0.1" }, "dependencies": { - "@codemirror/autocomplete": "6.17.0", - "@codemirror/commands": "6.6.0", + "@codemirror/autocomplete": "6.18.3", + "@codemirror/commands": "6.7.1", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.7.0", + "@codemirror/lang-sql": "6.8.0", "@codemirror/lang-xml": "6.1.0", - "@codemirror/language": "6.10.2", - "@codemirror/search": "6.5.6", + "@codemirror/language": "6.10.4", + "@codemirror/search": "6.5.8", "@codemirror/state": "6.4.1", - "@codemirror/view": "6.28.4", - "@maxgraph/core": "0.12.0", - "@quasar/extras": "1.16.12", - "@univerjs/core": "0.2.0", - "@univerjs/design": "0.2.0", - "@univerjs/docs": "0.2.0", - "@univerjs/docs-ui": "0.2.0", - "@univerjs/engine-formula": "0.2.0", - "@univerjs/engine-render": "0.2.0", - "@univerjs/facade": "0.2.0", - "@univerjs/sheets": "0.2.0", - "@univerjs/sheets-formula": "0.2.0", - "@univerjs/sheets-ui": "0.2.0", - "@univerjs/ui": "0.2.0", - "@vueuse/core": "10.11.0", - "axios": "1.7.2", + "@codemirror/view": "6.35.0", + "@maxgraph/core": "0.13.1", + "@quasar/extras": "1.16.13", + "@univerjs/core": "0.5.0", + "@univerjs/design": "0.5.0", + "@univerjs/docs": "0.5.0", + "@univerjs/docs-ui": "0.5.0", + "@univerjs/engine-formula": "0.5.0", + "@univerjs/engine-render": "0.5.0", + "@univerjs/facade": "0.5.0", + "@univerjs/sheets": "0.5.0", + "@univerjs/sheets-formula": "0.5.0", + "@univerjs/sheets-ui": "0.5.0", + "@univerjs/thread-comment": "0.5.0", + "@univerjs/ui": "0.5.0", + "@vueuse/core": "11.3.0", + "axios": "1.7.8", "codemirror": "6.0.1", - "dayjs": "1.11.11", + "dayjs": "1.11.13", "echarts": "5.5.1", "exceljs": "4.4.0", "file-saver": "2.0.5", + "lodash": "4.17.21", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "pinia": "2.1.7", - "platform-core": "8.1.275", - "quasar": "2.15.4", + "node-sql-parser": "5.3.4", + "pinia": "2.2.6", + "platform-core": "8.2.22", + "quasar": "2.17.4", + "sort-array": "5.0.0", + "svg-path-commander": "2.1.5", "tailwindcss": "3.4.4", - "vue": "3.4.31", - "vue-dompurify-html": "5.1.0", - "vue-i18n": "9.13.1", - "vue-router": "4.4.0", + "vue": "3.5.13", + "vue-codemirror6": "1.2.0", + "vue-dompurify-html": "5.2.0", + "vue-i18n": "10.0.4", + "vue-router": "4.5.0", "xml-formatter": "3.6.3" } } \ No newline at end of file diff --git a/irbs.shrcb.poc.frontend/src/views/cntm/CntmTest.vue b/irbs.shrcb.poc.frontend/src/views/cntm/CntmTest.vue index 47e6863..50a4fcf 100644 --- a/irbs.shrcb.poc.frontend/src/views/cntm/CntmTest.vue +++ b/irbs.shrcb.poc.frontend/src/views/cntm/CntmTest.vue @@ -34,13 +34,13 @@ const state = reactive({ label: '告警系统英文简称', name: 'sysNameEn', defaultValue: 'IRS', - type: 'text', + type: 'w-text', rules: [{ name: FormComponentValidateEnum.字符串最大长度校验, value: 100 }], }, { label: '告警系统中文名字', name: 'sysNameCn', - type: 'text', + type: 'w-text', defaultValue: '非零售内评系统', rules: [{ name: FormComponentValidateEnum.字符串最大长度校验, value: 100 }], }, @@ -49,7 +49,7 @@ const state = reactive({ label: '告警IP地址', name: 'ipAddress', defaultValue: '10.190.123.218', - type: 'text', + type: 'w-text', rules: [{ name: FormComponentValidateEnum.字符串最大长度校验, value: 100 }], }, { label: '告警级别', name: 'severity', type: 'select', options: ['MAJOR', 'CRITICAL', 'OK'], defaultValue: 'MAJOR' }, @@ -57,14 +57,14 @@ const state = reactive({ label: '告警时间', name: 'datetime', defaultValue: year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds, - type: 'text', + type: 'w-text', rules: [{ name: FormComponentValidateEnum.字符串最大长度校验, value: 100 }], }, { label: '告警标题', name: 'title', type: 'text', defaultValue: 'POC验证', rules: [{ name: FormComponentValidateEnum.字符串最大长度校验, value: 100 }] }, { label: '告警内容', name: 'msg', - type: 'textarea', + type: 'w-textarea', colSpan: 'full', required: true, rows: 3, @@ -73,7 +73,7 @@ const state = reactive({ { label: '请求URL', name: 'urlStr', - type: 'text', + type: 'w-text', required: true, colSpan: 'full', defaultValue: 'http://10.190.120.53:5000/api/alarm?source=irs', diff --git a/irbs.shrcb.poc.frontend/src/views/esb/EsbTest.vue b/irbs.shrcb.poc.frontend/src/views/esb/EsbTest.vue index 7a2645e..02575e9 100644 --- a/irbs.shrcb.poc.frontend/src/views/esb/EsbTest.vue +++ b/irbs.shrcb.poc.frontend/src/views/esb/EsbTest.vue @@ -8,12 +8,12 @@ :checkbox-selection="false" :query-form-cols-num="3" :query-form-fields="[ - { name: 'serialNo', label: '请求流水号', type: 'text' }, - { name: 'requestId', label: '请求ID', type: 'text' }, + { name: 'serialNo', label: '请求流水号', type: 'w-text' }, + { name: 'requestId', label: '请求ID', type: 'w-text' }, { name: 'status', label: '请求状态', - type: 'select', + type: 'w-select', queryOperator: 'equals', options: [ { label: '成功', value: true }, @@ -91,7 +91,7 @@ :sort-by="['-startDate']" > - + diff --git a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/controller/EsbLogController.java b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/controller/EsbLogController.java index f179459..5efb149 100644 --- a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/controller/EsbLogController.java +++ b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/controller/EsbLogController.java @@ -1,15 +1,51 @@ package irbs.shrcb.poc.controller; import io.sc.platform.mvc.controller.support.RestCrudController; +import io.sc.platform.orm.service.support.QueryParameter; +import io.sc.platform.orm.service.support.QueryResult; +import io.sc.platform.orm.util.EntityVoUtil; +import io.sc.platform.system.api.user.UserVo; +import io.sc.platform.system.user.jpa.entity.UserEntity; import irbs.shrcb.poc.jpa.entity.EsbLog; import irbs.shrcb.poc.jpa.repository.EsbLogRepository; import irbs.shrcb.poc.jpa.vo.EsbLogVo; import irbs.shrcb.poc.service.EsbLogService; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import irbs.shrcb.poc.service.TestUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; @RestController @RequestMapping("/api/irbs/esb/log") public class EsbLogController extends RestCrudController { + @Autowired + private TestUserService userService; + + @RequestMapping(value="getCorpFeatureRet",method= RequestMethod.GET) + @ResponseBody + public Map getCorpFeatureRet(QueryParameter parameter) throws Exception { + Map map = service.getCorpFeatureRet(parameter); + map.put("totalElements", 23211); + return map; + } + + /** + * 查询机构包含的用户 + * @param orgId 机构ID + * @param parameter 查询参数 + * @return 机构包含的用户 + * @throws Exception 违例 + */ + @GetMapping("queryUsersByOrg") + public Page queryUsersByOrg(@RequestParam(name="orgId",required=false) String orgId, QueryParameter parameter) throws Exception{ + if(StringUtils.hasText(orgId)){ + Page result =userService.queryUsersByOrg(orgId,parameter); + return EntityVoUtil.toVo(result); + } + return QueryResult.emptyPage(); + } } diff --git a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/ns3/impl/RatingServiceImpl.java b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/ns3/impl/RatingServiceImpl.java index 3acf9eb..9658823 100644 --- a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/ns3/impl/RatingServiceImpl.java +++ b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/ns3/impl/RatingServiceImpl.java @@ -1,7 +1,7 @@ package irbs.shrcb.poc.ns3.impl; import com.fasterxml.jackson.databind.ObjectMapper; -import io.sc.platform.core.util.DateUtil; +import io.sc.platform.util.DateUtil; import irbs.cust.rating.jpa.entity.*; import irbs.cust.rating.jpa.repository.IndustryRepository; import irbs.cust.rating.service.*; diff --git a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/EsbLogService.java b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/EsbLogService.java index 1963144..6061c9f 100644 --- a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/EsbLogService.java +++ b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/EsbLogService.java @@ -1,9 +1,13 @@ package irbs.shrcb.poc.service; import io.sc.platform.orm.service.DaoService; +import io.sc.platform.orm.service.support.QueryParameter; import irbs.shrcb.poc.jpa.entity.EsbLog; import irbs.shrcb.poc.jpa.repository.EsbLogRepository; +import java.util.Map; + public interface EsbLogService extends DaoService { + public Map getCorpFeatureRet(QueryParameter parameter) throws Exception; } diff --git a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/TestUserService.java b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/TestUserService.java new file mode 100644 index 0000000..ee01a78 --- /dev/null +++ b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/TestUserService.java @@ -0,0 +1,19 @@ +package irbs.shrcb.poc.service; + +import io.sc.platform.orm.service.DaoService; +import io.sc.platform.orm.service.support.QueryParameter; +import io.sc.platform.system.user.jpa.entity.UserEntity; +import io.sc.platform.system.user.jpa.repository.UserRepository; +import org.springframework.data.domain.Page; + +public interface TestUserService extends DaoService { + + /** + * 查询机构包含的用户 + * @param orgId 机构ID + * @param queryParameter 查询参数 + * @return 机构包含的用户 + * @throws Exception 违例 + */ + public Page queryUsersByOrg(String orgId, QueryParameter queryParameter) throws Exception; +} diff --git a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/impl/EsbLogServiceImpl.java b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/impl/EsbLogServiceImpl.java index aedc676..c736cf2 100644 --- a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/impl/EsbLogServiceImpl.java +++ b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/impl/EsbLogServiceImpl.java @@ -1,12 +1,36 @@ package irbs.shrcb.poc.service.impl; +import io.sc.platform.lcdp.form.service.JdbcTemplateService; import io.sc.platform.orm.service.impl.DaoServiceImpl; +import io.sc.platform.orm.service.support.QueryParameter; +import io.sc.platform.orm.service.support.QueryResult; +import io.sc.platform.system.org.jpa.entity.OrgEntity; +import io.sc.platform.system.user.jpa.entity.UserEntity; import irbs.shrcb.poc.jpa.entity.EsbLog; import irbs.shrcb.poc.jpa.repository.EsbLogRepository; import irbs.shrcb.poc.service.EsbLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.persistence.criteria.Join; +import javax.persistence.criteria.Subquery; +import java.util.HashMap; +import java.util.Map; @Service("esbLogService") public class EsbLogServiceImpl extends DaoServiceImpl implements EsbLogService { + @Autowired + private JdbcTemplateService jdbcTemplateService; + + @Override + public Map getCorpFeatureRet(QueryParameter parameter) throws Exception { + StringBuffer sql = new StringBuffer("select * from P_IRS_SHRCB_CORP_FEATURE_RET "); + Map> fieldTypeMap = new HashMap<>(); + fieldTypeMap.put("CUST_NO", java.lang.String.class); + return jdbcTemplateService.listBySql(parameter, sql.toString(), fieldTypeMap); + } } diff --git a/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/impl/TestUserServiceImpl.java b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/impl/TestUserServiceImpl.java new file mode 100644 index 0000000..19076ea --- /dev/null +++ b/irbs.shrcb.poc/src/main/java/irbs/shrcb/poc/service/impl/TestUserServiceImpl.java @@ -0,0 +1,76 @@ +package irbs.shrcb.poc.service.impl; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.sc.platform.orm.service.impl.DaoServiceImpl; +import io.sc.platform.orm.service.support.QueryParameter; +import io.sc.platform.orm.service.support.QueryResult; +import io.sc.platform.orm.service.support.criteria.Criteria; +import io.sc.platform.system.org.jpa.entity.OrgEntity; +import io.sc.platform.system.user.jpa.entity.UserEntity; +import io.sc.platform.system.user.jpa.repository.UserRepository; +import irbs.shrcb.poc.service.TestUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.jpa.domain.Specification; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.Subquery; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service("testUserService") +public class TestUserServiceImpl extends DaoServiceImpl implements TestUserService { + + @Autowired + private ObjectMapper objectMapper; + + @Override + public Page queryUsersByOrg(String orgId, QueryParameter queryParameter) throws Exception { + if(StringUtils.hasText(orgId)) { + Specification specification = (root, query, criteriaBuilder) -> { + Subquery subquery =query.subquery(Integer.class); + Join join = subquery.correlate(root).join("orgs"); + + subquery.select(criteriaBuilder.literal(1)); + subquery.where(criteriaBuilder.equal(join.get("id"), orgId)); + + return criteriaBuilder.exists(subquery); + }; + + Specification loginName = null; + Specification userName = null; + if (StringUtils.hasText(queryParameter.getCriteria())) { + List criterias = objectMapper.readValue("["+queryParameter.getCriteria()+"]", List.class); + List loginNameList = criterias.stream().filter((map) -> {return map.get("fieldName").equals("loginName");}).collect(Collectors.toList()); + if (loginNameList!=null && loginNameList.size()>0) { + Map map = loginNameList.get(0); + loginName = (root, query, criteriaBuilder) -> { + return criteriaBuilder.like(root.get("loginName"), "%"+map.get("value")+"%"); + }; + } + List userNameList = criterias.stream().filter((map) -> {return map.get("fieldName").equals("userName");}).collect(Collectors.toList()); + if (userNameList!=null && userNameList.size()>0) { + Map map = userNameList.get(0); + userName = (root, query, criteriaBuilder) -> { + return criteriaBuilder.like(root.get("userName"), "%"+map.get("value")+"%"); + }; + } + } + + if (loginName!=null && userName!=null) { + return super.query(queryParameter,specification.and(loginName).and(userName)); + } else if (loginName!=null) { + return super.query(queryParameter,specification.and(loginName)); + } else if (userName!=null) { + return super.query(queryParameter,specification.and(userName)); + } else { + return super.query(queryParameter,specification); + } + } + return QueryResult.emptyPage(); + } +}