1.统计服务初步完成

epmet-module/data-statistician/data-statistician-client/src/main/java/com/epmet/constant/DataSourceConstant.java

@@ -0,0 +1,9 @@
+package com.epmet.constant;
+
+public interface DataSourceConstant {
+
+    String GOV_ORG = "govOrg";
+    String STATS = "stats";
+    String GOV_ISSUE = "govIssue";
+
+}

epmet-module/data-statistician/data-statistician-server/pom.xml

@@ -118,8 +118,8 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>192.168.1.130</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.host>118.190.150.119</spring.redis.host>
+                <spring.redis.port>47379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/controller/DemoController.java

@@ -1,6 +1,6 @@
 package com.epmet.controller;
 
-import com.epmet.service.stats.StatsDemoService;
+import com.epmet.service.StatsDemoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,9 +13,14 @@ public class DemoController {
     @Autowired
     private StatsDemoService demoService;
 
-    @GetMapping("demo")
-    public void demo() {
-        demoService.demo();
+    @GetMapping("testlist")
+    public void testList() {
+        demoService.testList();
+    }
+
+    @GetMapping("testtx")
+    public void testTx() {
+        demoService.testTx();
     }
 
 

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java

@@ -1,7 +1,7 @@
 package com.epmet.dao.issue;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueEntity;
+import com.epmet.entity.issue.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java

@@ -1,7 +1,7 @@
 package com.epmet.dao.org;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.entity.org.CustomerAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/dao/stats/DimYearDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.DimYearEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 年维度表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-15
+ */
+@Mapper
+public interface DimYearDao extends BaseDao<DimYearEntity> {
+	int insertOne(DimYearEntity entity);
+}

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/IssueEntity.java → epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/issue/IssueEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.issue;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java → epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.org;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/entity/stats/DimYearEntity.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 年维度表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("dim_year")
+public class DimYearEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 2019年
+     */
+	private String yearName;
+
+}

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java

@@ -1,11 +1,10 @@
 package com.epmet.service.Issue;
 
-import com.epmet.entity.IssueEntity;
+import com.epmet.entity.issue.IssueEntity;
 
 import java.util.List;
 
 public interface DemoIssueService {
 
     List<IssueEntity> listAllEntities();
-
 }

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java

@@ -1,16 +1,18 @@
 package com.epmet.service.Issue.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.issue.StatsIssueDao;
-import com.epmet.entity.IssueEntity;
+import com.epmet.entity.issue.IssueEntity;
 import com.epmet.service.Issue.DemoIssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+
 @Service
-@DataSource("govIssue")
+@DataSource(DataSourceConstant.GOV_ISSUE)
 public class DemoIssueServiceImpl implements DemoIssueService {
 
     @Autowired

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/StatsDemoService.java

@@ -0,0 +1,8 @@
+package com.epmet.service;
+
+public interface StatsDemoService {
+
+    void testList();
+    void testTx();
+
+}

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/impl/StatsDemoServiceImpl.java → epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java

@@ -1,17 +1,20 @@
-package com.epmet.service.stats.impl;
+package com.epmet.service.impl;
 
-import com.epmet.entity.CustomerAgencyEntity;
-import com.epmet.entity.IssueEntity;
+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;
-import com.epmet.service.stats.StatsDemoService;
+import com.epmet.service.stats.DemoDataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 /**
- * 综合业务的service，不指定数据源，不加事务，因为不支持。。。
+ * 独立于任何具体数据源外层的service
  */
 @Service
 public class StatsDemoServiceImpl implements StatsDemoService {
@@ -22,10 +25,18 @@ public class StatsDemoServiceImpl implements StatsDemoService {
     @Autowired
     private DemoIssueService demoIssueService;
 
-    public void demo() {
+    @Autowired
+    private DemoDataStatsService demoDataStatsService;
+
+    public void testList() {
         List<CustomerAgencyEntity> agencies = demoGovOrgService.listAllEntities();
         List<IssueEntity> issues = demoIssueService.listAllEntities();
         System.out.println(666);
     }
 
+    //该service不加事务
+    //@Transactional(rollbackFor = Exception.class)
+    public void testTx() {
+        demoDataStatsService.testTx();
+    }
 }

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/org/DemoGovOrgService.java

@@ -1,6 +1,6 @@
 package com.epmet.service.org;
 
-import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.entity.org.CustomerAgencyEntity;
 
 import java.util.List;
 

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/org/impl/DemoGovOrgServiceImpl.java

@@ -1,8 +1,9 @@
 package com.epmet.service.org.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.org.StatsCustomerAgencyDao;
-import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.entity.org.CustomerAgencyEntity;
 import com.epmet.service.org.DemoGovOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,7 +11,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-@DataSource("govOrg")
+@DataSource(DataSourceConstant.GOV_ORG)
 public class DemoGovOrgServiceImpl implements DemoGovOrgService {
     @Autowired
     private StatsCustomerAgencyDao govOrgDao;

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/DemoDataStatsService.java

@@ -0,0 +1,7 @@
+package com.epmet.service.stats;
+
+public interface DemoDataStatsService {
+
+    void testTx();
+
+}

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/StatsDemoService.java

@@ -1,5 +0,0 @@
-package com.epmet.service.stats;
-
-public interface StatsDemoService {
-    void demo();
-}

epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/service/stats/impl/DemoDataStatsServiceImpl.java

@@ -0,0 +1,38 @@
+package com.epmet.service.stats.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.stats.DimYearDao;
+import com.epmet.entity.stats.DimYearEntity;
+import com.epmet.service.stats.DemoDataStatsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+@DataSource(value = DataSourceConstant.STATS)
+@Service
+public class DemoDataStatsServiceImpl implements DemoDataStatsService {
+
+    @Autowired
+    private DimYearDao dimYearDao;
+
+    /**
+     * 此service可以加事务
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void testTx() {
+        DimYearEntity dimYearEntity = new DimYearEntity();
+        dimYearEntity.setYearName("1");
+        dimYearEntity.setId("aaa");
+        dimYearEntity.setCreatedBy("");
+        dimYearEntity.setDelFlag("");
+        dimYearEntity.setRevision(0);
+        dimYearEntity.setUpdatedBy("");
+        dimYearEntity.setUpdatedTime(new Date());
+        dimYearDao.insert(dimYearEntity);
+        dimYearDao.insert(dimYearEntity);
+    }
+}

epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml

@@ -24,7 +24,7 @@ spring:
     druid:
       #MySQL
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      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
   cloud:
@@ -55,7 +55,7 @@ spring:
   flyway:
     enabled: false
     locations: classpath:db/migration
-    url: jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    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
     baseline-on-migrate: true
@@ -91,7 +91,7 @@ mybatis-plus:
     #数据库相关配置
     db-config:
       #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: ID_WORKER
+      id-type: INPUT
       #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
       field-strategy: NOT_NULL
       #驼峰下划线转换
@@ -133,18 +133,13 @@ pagehelper:
 
 dynamic:
   datasource:
-#    stats:
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: @datasource.druid.stats.url@
-#      username: @datasource.druid.stats.username@
-#      password: @datasource.druid.stats.password@
     govOrg:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.1.130:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      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
     govIssue:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.1.130:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      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

epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/StatsIssueDao.xml → epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.issue.StatsIssueDao">
-    <select id="listAllEntities" resultType="com.epmet.entity.IssueEntity">
+    <select id="listAllEntities" resultType="com.epmet.entity.issue.IssueEntity">
         select * from issue
     </select>
 </mapper>

epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/StatsCustomerAgencyDao.xml → epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

@@ -7,7 +7,7 @@
         select * from customer_agency
     </select>-->
 
-    <select id="listAllEntities" resultType="com.epmet.entity.CustomerAgencyEntity">
+    <select id="listAllEntities" resultType="com.epmet.entity.org.CustomerAgencyEntity">
         select * from customer_agency
     </select>
 </mapper>

epmet-module/data-statistician/data-statistician-server/src/main/resources/mapper/stats/DimYearDao.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.DimYearDao">
+
+    <resultMap type="com.epmet.entity.stats.DimYearEntity" id="dimYearMap">
+        <result property="id" column="ID"/>
+        <result property="yearName" column="YEAR_NAME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <insert id="insertOne">
+        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})
+    </insert>
+
+
+</mapper>

epmet-module/data-statistician/data-statistician-server/src/test/java/com/epmet/stats/test/TestTx.java

@@ -0,0 +1,23 @@
+package com.epmet.stats.test;
+
+import com.epmet.DataStatsApplication;
+import com.epmet.service.StatsDemoService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(value = SpringRunner.class)
+@SpringBootTest(classes = {DataStatsApplication.class})
+public class TestTx {
+
+    @Autowired
+    private StatsDemoService statsDemoService;
+
+    @Test
+    public void testTx() {
+        statsDemoService.testTx();
+    }
+
+}