diff --git a/epmet-module/data-statistician/data-statistician-client/pom.xml b/epmet-module/data-statistical/data-statistical-client/pom.xml similarity index 54% rename from epmet-module/data-statistician/data-statistician-client/pom.xml rename to epmet-module/data-statistical/data-statistical-client/pom.xml index 081f6e4f6a..1e128a8adf 100644 --- a/epmet-module/data-statistician/data-statistician-client/pom.xml +++ b/epmet-module/data-statistical/data-statistical-client/pom.xml @@ -3,13 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - data-statistician + data-statistical com.epmet 2.0.0 4.0.0 - data-statistician-client + data-statistical-client + + + com.epmet + epmet-commons-tools + 2.0.0 + + \ No newline at end of file diff --git a/epmet-module/data-statistician/data-statistician-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-client/src/main/java/com/epmet/constant/DataSourceConstant.java rename to epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java diff --git a/epmet-module/data-statistician/data-statistician-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml similarity index 91% rename from epmet-module/data-statistician/data-statistician-server/pom.xml rename to epmet-module/data-statistical/data-statistical-server/pom.xml index fc9e01fa0f..f0d1c67ade 100644 --- a/epmet-module/data-statistician/data-statistician-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -3,18 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - data-statistician + data-statistical com.epmet 2.0.0 4.0.0 - data-statistician-server + data-statistical-server com.epmet - data-statistician-client + data-statistical-client 2.0.0 @@ -99,19 +99,19 @@ - + - epmet_gov_access_user + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/DataStatsApplication.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java similarity index 81% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/DataStatsApplication.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java index 93cf107f30..7da757a418 100644 --- a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/DataStatsApplication.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java @@ -1,7 +1,5 @@ package com.epmet; -import com.epmet.commons.tools.utils.SpringContextUtils; -import com.epmet.config.DatasourceConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/DatasourceConfig.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/DatasourceConfig.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/DatasourceConfig.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/DatasourceConfig.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/ModuleConfigImpl.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/ModuleConfigImpl.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/ModuleConfigImpl.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/controller/DemoController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/stats/DimYearDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimYearDao.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/stats/DimYearDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimYearDao.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/issue/IssueEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueEntity.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/issue/IssueEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueEntity.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/stats/DimYearEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimYearEntity.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/stats/DimYearEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimYearEntity.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/properties/DatasourceProperties.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/properties/DatasourceProperties.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/properties/DatasourceProperties.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/properties/DatasourceProperties.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/StatsDemoService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDemoService.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/StatsDemoService.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDemoService.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java similarity index 93% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java index d6805f2833..19cd01f578 100644 --- a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java @@ -1,9 +1,7 @@ package com.epmet.service.impl; -import com.epmet.dao.stats.DimYearDao; import com.epmet.entity.issue.IssueEntity; import com.epmet.entity.org.CustomerAgencyEntity; -import com.epmet.entity.stats.DimYearEntity; import com.epmet.service.Issue.DemoIssueService; import com.epmet.service.StatsDemoService; import com.epmet.service.org.DemoGovOrgService; diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/org/DemoGovOrgService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/DemoGovOrgService.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/org/DemoGovOrgService.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/DemoGovOrgService.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/org/impl/DemoGovOrgServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/DemoGovOrgServiceImpl.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/org/impl/DemoGovOrgServiceImpl.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/DemoGovOrgServiceImpl.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/DemoDataStatsService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemoDataStatsService.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/DemoDataStatsService.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemoDataStatsService.java diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java similarity index 88% rename from epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java index 1e5e731459..8c95530636 100644 --- a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java @@ -11,7 +11,9 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; -@DataSource(value = DataSourceConstant.STATS) +/** + * 默认为统计数据源，不需要手动指定 + */ @Service public class DemoDataStatsServiceImpl implements DemoDataStatsService { @@ -26,13 +28,13 @@ public class DemoDataStatsServiceImpl implements DemoDataStatsService { public void testTx() { DimYearEntity dimYearEntity = new DimYearEntity(); dimYearEntity.setYearName("1"); - dimYearEntity.setId("aaa"); + dimYearEntity.setId("bbb"); dimYearEntity.setCreatedBy(""); dimYearEntity.setDelFlag(""); dimYearEntity.setRevision(0); dimYearEntity.setUpdatedBy(""); dimYearEntity.setUpdatedTime(new Date()); - dimYearDao.insert(dimYearEntity); + dimYearDao.insertOne(dimYearEntity); dimYearDao.insert(dimYearEntity); } } diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml similarity index 78% rename from epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index cdba6bcc46..e9e53f6acb 100644 --- a/epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: main: allow-bean-definition-overriding: true application: - name: data-statistician-server + name: data-statistical-server #环境 dev|test|prod profiles: active: dev @@ -24,9 +24,9 @@ spring: druid: #MySQL driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://118.190.150.119:47306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: epmet_dba - password: EpmEt-dbA-UsEr + url: @datasource.druid.stats.url@ + username: @datasource.druid.stats.username@ + password: @datasource.druid.stats.password@ cloud: nacos: discovery: @@ -55,9 +55,9 @@ spring: flyway: enabled: false locations: classpath:db/migration - url: jdbc:mysql://118.190.150.119:47306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - user: epmet_dba - password: EpmEt-dbA-UsEr + url: @datasource.druid.stats.url@ + user: @datasource.druid.stats.username@ + password: @datasource.druid.stats.password@ baseline-on-migrate: true baseline-version: 0 @@ -135,11 +135,11 @@ dynamic: datasource: govOrg: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://118.190.150.119:47306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: epmet_gov_org_user - password: EpmEt-db-UsEr + url: @datasource.druid.org.url@ + username: @datasource.druid.org.username@ + password: @datasource.druid.org.password@ govIssue: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://118.190.150.119:47306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: epmet_gov_issue_user - password: EpmEt-db-UsEr \ No newline at end of file + url: @datasource.druid.issue.url@ + username: @datasource.druid.issue.username@ + password: @datasource.druid.issue.password@ \ No newline at end of file diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/resources/db/migration/V0.0.1__demo.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.1__demo.sql similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/resources/db/migration/V0.0.1__demo.sql rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.1__demo.sql diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/issue/StatsIssueDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/stats/DimYearDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimYearDao.xml similarity index 87% rename from epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/stats/DimYearDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimYearDao.xml index 688aa8dc43..bfe7f01551 100755 --- a/epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/stats/DimYearDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimYearDao.xml @@ -18,7 +18,7 @@ INSERT INTO dim_year (ID, YEAR_NAME, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES - (#{ID}, #{YEAR_NAME}, #{DEL_FLAG}, #{REVISION}, #{CREATED_BY}, #{CREATED_TIME}, #{UPDATED_BY}, #{UPDATED_TIME}) + (#{id}, #{yearName}, #{delFlag}, #{revision}, #{createdBy}, #{createdTime}, #{updatedBy}, #{updatedTime}) diff --git a/epmet-module/data-statistician/data-statistician-server/src/test/java/com/epmet/stats/test/TestTx.java b/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/TestTx.java similarity index 100% rename from epmet-module/data-statistician/data-statistician-server/src/test/java/com/epmet/stats/test/TestTx.java rename to epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/TestTx.java diff --git a/epmet-module/data-statistician/pom.xml b/epmet-module/data-statistical/pom.xml similarity index 76% rename from epmet-module/data-statistician/pom.xml rename to epmet-module/data-statistical/pom.xml index 505e245390..7bcd9e9fa6 100644 --- a/epmet-module/data-statistician/pom.xml +++ b/epmet-module/data-statistical/pom.xml @@ -9,10 +9,11 @@ 4.0.0 - data-statistician + data-statistical pom - data-statistician-client + data-statistical-client + data-statistical-server diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index b02ac997a2..45ca155078 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -37,7 +37,7 @@ resi-home gov-voice resi-voice - data-statistician + data-statistical