1.统计服务结构调整

epmet-module/data-statistician/data-statistician-client/pom.xml → 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">
     <parent>
-        <artifactId>data-statistician</artifactId>
+        <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>
         <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>data-statistician-client</artifactId>
+    <artifactId>data-statistical-client</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
 
 </project>

epmet-module/data-statistician/data-statistician-server/pom.xml → 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">
     <parent>
-        <artifactId>data-statistician</artifactId>
+        <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>
         <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>data-statistician-server</artifactId>
+    <artifactId>data-statistical-server</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.epmet</groupId>
-            <artifactId>data-statistician-client</artifactId>
+            <artifactId>data-statistical-client</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>
@@ -99,19 +99,19 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_stats?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
-                <datasource.druid.stats.username>epmet_gov_access_user</datasource.druid.stats.username>
+                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.org.url>
-                    <![CDATA[jdbc:mysql://localhost:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.org.url>
                 <datasource.druid.org.username>epmet_gov_org_user</datasource.druid.org.username>
                 <datasource.druid.org.password>EpmEt-db-UsEr</datasource.druid.org.password>
 
                 <datasource.druid.issue.url>
-                    <![CDATA[jdbc:mysql://localhost:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.issue.url>
                 <datasource.druid.issue.username>epmet_gov_issue_user</datasource.druid.issue.username>
                 <datasource.druid.issue.password>EpmEt-db-UsEr</datasource.druid.issue.password>

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/DataStatsApplication.java → 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;

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java → 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;

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java → 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);
     }
 }

epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml → 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
+      url: @datasource.druid.issue.url@
+      username: @datasource.druid.issue.username@
+      password: @datasource.druid.issue.password@

epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/stats/DimYearDao.xml → 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})
     </insert>
 
 

epmet-module/data-statistician/pom.xml → epmet-module/data-statistical/pom.xml

@@ -9,10 +9,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>data-statistician</artifactId>
+    <artifactId>data-statistical</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>data-statistician-client</module>
+        <module>data-statistical-client</module>
+        <module>data-statistical-server</module>
     </modules>
 
 

epmet-module/pom.xml

@@ -37,7 +37,7 @@
         <module>resi-home</module>
         <module>gov-voice</module>
 		<module>resi-voice</module>
-        <module>data-statistician</module>
+        <module>data-statistical</module>
     </modules>
 
 </project>