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/DimAgencyServiceImpl.java

@@ -55,6 +55,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgencyEntity> implements DimAgencyService {
 
     @Autowired

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

@@ -19,12 +19,14 @@ 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.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
 import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimCustomerDao;
@@ -52,6 +54,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
+@DataSource(DataSourceConstant.STATS)
 public class DimCustomerServiceImpl extends BaseServiceImpl<DimCustomerDao, DimCustomerEntity> implements DimCustomerService {
 
     @Autowired

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

@@ -19,17 +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.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimDateDao;
 import com.epmet.dto.stats.DimDateDTO;
 import com.epmet.entity.stats.DimDateEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimDateService;
 import com.epmet.service.stats.LastExecRecordService;
 import com.epmet.util.DimIdGenerator;
@@ -39,7 +39,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 日期维度表
@@ -48,6 +51,7 @@ import java.util.*;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimDateServiceImpl extends BaseServiceImpl<DimDateDao, DimDateEntity> implements DimDateService {
 
     @Autowired

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

@@ -19,10 +19,12 @@ 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.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
 import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimDepartmentDao;
@@ -50,6 +52,7 @@ import java.util.Map;
  */
 @Slf4j
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimDepartmentServiceImpl extends BaseServiceImpl<DimDepartmentDao, DimDepartmentEntity> implements DimDepartmentService {
 
     @Autowired

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

@@ -19,12 +19,14 @@ 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.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimGridDao;
 import com.epmet.dao.stats.LastExecRecordDao;
@@ -33,9 +35,7 @@ import com.epmet.dto.group.result.AgencyGridInfoResultDTO;
 import com.epmet.dto.group.result.SubAgencyIdResultDTO;
 import com.epmet.dto.stats.DimGridDTO;
 import com.epmet.entity.stats.DimGridEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimGridService;
-import com.epmet.service.stats.LastExecRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +53,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntity> implements DimGridService {
 
     @Autowired

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

@@ -19,23 +19,22 @@ 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.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimMonthDao;
 import com.epmet.dto.stats.DimMonthDTO;
 import com.epmet.entity.stats.DimMonthEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimMonthService;
 import com.epmet.service.stats.LastExecRecordService;
 import com.epmet.util.DimIdGenerator;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,6 +51,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimMonthServiceImpl extends BaseServiceImpl<DimMonthDao, DimMonthEntity> implements DimMonthService {
 
     @Autowired

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

@@ -19,21 +19,20 @@ 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.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimQuarterDao;
 import com.epmet.dto.stats.DimQuarterDTO;
 import com.epmet.entity.stats.DimQuarterEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimQuarterService;
 import com.epmet.service.stats.LastExecRecordService;
 import com.epmet.util.DimIdGenerator;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +40,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 季度维度表
@@ -50,6 +52,7 @@ import java.util.*;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQuarterEntity> implements DimQuarterService {
 
     private Logger logger = LoggerFactory.getLogger(getClass());

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

@@ -19,17 +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.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimWeekDao;
 import com.epmet.dto.stats.DimWeekDTO;
 import com.epmet.entity.stats.DimWeekEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimWeekService;
 import com.epmet.service.stats.LastExecRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -50,6 +50,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimWeekServiceImpl extends BaseServiceImpl<DimWeekDao, DimWeekEntity> implements DimWeekService {
 
     @Autowired

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

@@ -19,17 +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.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.RobotConstant;
-import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimYearDao;
 import com.epmet.dto.stats.DimYearDTO;
 import com.epmet.entity.stats.DimYearEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 import com.epmet.service.stats.DimYearService;
 import com.epmet.service.stats.LastExecRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -50,6 +50,7 @@ import java.util.Map;
  * @since v1.0.0 2020-06-16
  */
 @Service
+@DataSource(DataSourceConstant.STATS)
 public class DimYearServiceImpl extends BaseServiceImpl<DimYearDao, DimYearEntity> implements DimYearService {
 
     @Autowired