Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyProjectDailyServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactAgencyProjectDailyDao;
 import com.epmet.dto.project.form.MonthProjectListFormDTO;
 import com.epmet.entity.stats.FactAgencyProjectDailyEntity;
@@ -33,6 +35,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactAgencyProjectDailyServiceImpl extends BaseServiceImpl<FactAgencyProjectDailyDao, FactAgencyProjectDailyEntity> implements FactAgencyProjectDailyService {
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyProjectMonthlyServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactAgencyProjectMonthlyDao;
 import com.epmet.entity.stats.FactAgencyProjectMonthlyEntity;
 import com.epmet.service.stats.FactAgencyProjectMonthlyService;
@@ -30,6 +32,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactAgencyProjectMonthlyServiceImpl extends BaseServiceImpl<FactAgencyProjectMonthlyDao, FactAgencyProjectMonthlyEntity> implements FactAgencyProjectMonthlyService {
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedAgencyDailyServiceImpl.java

@@ -18,7 +18,9 @@
 package com.epmet.service.stats.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactArticlePublishedAgencyDailyDao;
 import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
 import com.epmet.service.stats.FactArticlePublishedAgencyDailyService;
@@ -37,6 +39,7 @@ import java.util.Collection;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactArticlePublishedAgencyDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedAgencyDailyDao, FactArticlePublishedAgencyDailyEntity> implements FactArticlePublishedAgencyDailyService {
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedDepartmentDailyServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactArticlePublishedDepartmentDailyDao;
 import com.epmet.entity.stats.FactArticlePublishedDepartmentDailyEntity;
 import com.epmet.service.stats.FactArticlePublishedDepartmentDailyService;
@@ -35,6 +37,7 @@ import java.util.Collection;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactArticlePublishedDepartmentDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedDepartmentDailyDao, FactArticlePublishedDepartmentDailyEntity> implements FactArticlePublishedDepartmentDailyService {
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedGridDailyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactArticlePublishedGridDailyDao;
 import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
 import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity;
@@ -41,6 +43,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactArticlePublishedGridDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedGridDailyDao, FactArticlePublishedGridDailyEntity> implements FactArticlePublishedGridDailyService {
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridProjectDailyServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGridProjectDailyDao;
 import com.epmet.dto.project.form.MonthProjectListFormDTO;
 import com.epmet.entity.stats.FactAgencyProjectDailyEntity;
@@ -34,6 +36,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGridProjectDailyServiceImpl extends BaseServiceImpl<FactGridProjectDailyDao, FactGridProjectDailyEntity> implements FactGridProjectDailyService {
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridProjectMonthlyServiceImpl.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGridProjectMonthlyDao;
 import com.epmet.entity.stats.FactAgencyProjectMonthlyEntity;
 import com.epmet.entity.stats.FactGridProjectMonthlyEntity;
@@ -31,6 +33,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGridProjectMonthlyServiceImpl extends BaseServiceImpl<FactGridProjectMonthlyDao, FactGridProjectMonthlyEntity> implements FactGridProjectMonthlyService {
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java

@@ -19,11 +19,13 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGroupAgencyDailyDao;
 import com.epmet.dto.group.form.AgencyMonthlyFormDTO;
 import com.epmet.dto.group.result.AgencyGroupDailyResultDTO;
@@ -32,7 +34,6 @@ import com.epmet.dto.stats.FactGroupAgencyDailyDTO;
 import com.epmet.entity.stats.FactGroupAgencyDailyEntity;
 import com.epmet.service.stats.FactGroupAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +49,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAgencyDailyDao, FactGroupAgencyDailyEntity> implements FactGroupAgencyDailyService {
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyMonthlyServiceImpl.java

@@ -19,11 +19,13 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGroupAgencyMonthlyDao;
 import com.epmet.dto.group.form.AgencyMonthlyFormDTO;
 import com.epmet.dto.stats.FactGroupAgencyMonthlyDTO;
@@ -44,6 +46,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGroupAgencyMonthlyServiceImpl extends BaseServiceImpl<FactGroupAgencyMonthlyDao, FactGroupAgencyMonthlyEntity> implements FactGroupAgencyMonthlyService {
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupGridDailyServiceImpl.java

@@ -19,17 +19,18 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.group.result.GroupGridDailyResultDTO;
-import com.epmet.dto.stats.FactGroupGridDailyDTO;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactGroupGridDailyDao;
+import com.epmet.dto.group.result.GroupGridDailyResultDTO;
+import com.epmet.dto.stats.FactGroupGridDailyDTO;
 import com.epmet.entity.stats.FactGroupGridDailyEntity;
 import com.epmet.service.StatsGroupService;
-import com.epmet.service.group.GroupDataService;
 import com.epmet.service.stats.FactGroupGridDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactGroupGridDailyServiceImpl extends BaseServiceImpl<FactGroupGridDailyDao, FactGroupGridDailyEntity> implements FactGroupGridDailyService {
 
     @Autowired

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyDailyServiceImpl.java

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueAgencyDailyDao;
 import com.epmet.dto.stats.FactIssueAgencyDailyDTO;
 import com.epmet.entity.stats.FactIssueAgencyDailyEntity;
 import com.epmet.service.stats.FactIssueAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueAgencyDailyServiceImpl extends BaseServiceImpl<FactIssueAgencyDailyDao, FactIssueAgencyDailyEntity> implements FactIssueAgencyDailyService {
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyMonthlyServiceImpl.java

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueAgencyMonthlyDao;
 import com.epmet.dto.stats.FactIssueAgencyMonthlyDTO;
 import com.epmet.entity.stats.FactIssueAgencyMonthlyEntity;
 import com.epmet.service.stats.FactIssueAgencyMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueAgencyMonthlyServiceImpl extends BaseServiceImpl<FactIssueAgencyMonthlyDao, FactIssueAgencyMonthlyEntity> implements FactIssueAgencyMonthlyService {
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridDailyServiceImpl.java

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueGridDailyDao;
 import com.epmet.dto.stats.FactIssueGridDailyDTO;
 import com.epmet.entity.stats.FactIssueGridDailyEntity;
 import com.epmet.service.stats.FactIssueGridDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueGridDailyServiceImpl extends BaseServiceImpl<FactIssueGridDailyDao, FactIssueGridDailyEntity> implements FactIssueGridDailyService {
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridMonthlyServiceImpl.java

@@ -19,16 +19,17 @@ package com.epmet.service.stats.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactIssueGridMonthlyDao;
 import com.epmet.dto.stats.FactIssueGridMonthlyDTO;
 import com.epmet.entity.stats.FactIssueGridMonthlyEntity;
 import com.epmet.service.stats.FactIssueGridMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-17
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactIssueGridMonthlyServiceImpl extends BaseServiceImpl<FactIssueGridMonthlyDao, FactIssueGridMonthlyEntity> implements FactIssueGridMonthlyService {
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedAgencyDailyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyDailyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyDailyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyDailyService;
@@ -39,6 +41,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyDailyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyDailyDao, FactTagViewedAgencyDailyEntity> implements FactTagViewedAgencyDailyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedAgencyMonthlyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyMonthlyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyMonthlyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyMonthlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyMonthlyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyMonthlyDao, FactTagViewedAgencyMonthlyEntity> implements FactTagViewedAgencyMonthlyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedAgencyQuarterlyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyQuarterlyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyQuarterlyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyQuarterlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyQuarterlyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyQuarterlyDao, FactTagViewedAgencyQuarterlyEntity> implements FactTagViewedAgencyQuarterlyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedAgencyYearlyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedAgencyYearlyDao;
 import com.epmet.entity.stats.FactTagViewedAgencyYearlyEntity;
 import com.epmet.service.stats.FactTagViewedAgencyYearlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedAgencyYearlyServiceImpl extends BaseServiceImpl<FactTagViewedAgencyYearlyDao, FactTagViewedAgencyYearlyEntity> implements FactTagViewedAgencyYearlyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedGridDailyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridDailyDao;
 import com.epmet.entity.stats.FactTagViewedGridDailyEntity;
 import com.epmet.service.stats.FactTagViewedGridDailyService;
@@ -40,6 +42,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridDailyServiceImpl extends BaseServiceImpl<FactTagViewedGridDailyDao, FactTagViewedGridDailyEntity> implements FactTagViewedGridDailyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedGridMonthlyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridMonthlyDao;
 import com.epmet.entity.stats.FactTagViewedGridMonthlyEntity;
 import com.epmet.service.stats.FactTagViewedGridMonthlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridMonthlyServiceImpl extends BaseServiceImpl<FactTagViewedGridMonthlyDao, FactTagViewedGridMonthlyEntity> implements FactTagViewedGridMonthlyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedGridQuarterlyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridQuarterlyDao;
 import com.epmet.entity.stats.FactTagViewedGridQuarterlyEntity;
 import com.epmet.service.stats.FactTagViewedGridQuarterlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridQuarterlyServiceImpl extends BaseServiceImpl<FactTagViewedGridQuarterlyDao, FactTagViewedGridQuarterlyEntity> implements FactTagViewedGridQuarterlyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTagViewedGridYearlyServiceImpl.java

@@ -17,9 +17,11 @@
 
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactTagViewedGridYearlyDao;
 import com.epmet.entity.stats.FactTagViewedGridYearlyEntity;
 import com.epmet.service.stats.FactTagViewedGridYearlyService;
@@ -36,6 +38,7 @@ import java.util.List;
  * @since v1.0.0 2020-06-18
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class FactTagViewedGridYearlyServiceImpl extends BaseServiceImpl<FactTagViewedGridYearlyDao, FactTagViewedGridYearlyEntity> implements FactTagViewedGridYearlyService {
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java

@@ -1,5 +1,7 @@
 package com.epmet.service.stats.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
 import com.epmet.dao.stats.LastExecRecordDao;
 import com.epmet.entity.stats.LastExecRecordEntity;
@@ -7,13 +9,13 @@ import com.epmet.service.stats.LastExecRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class LastExecRecordServiceImpl implements LastExecRecordService {
     @Autowired
     private LastExecRecordDao lastExecRecordDao;
 
+    @Override
     public LastExecRecordEntity getLastExecRecord(String statsSubject) {
         return lastExecRecordDao.getLastExecRecord(statsSubject);
     }