Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupAgencyDailyDao.java

@@ -48,7 +48,7 @@ public interface FactGroupAgencyDailyDao extends BaseDao<FactGroupAgencyDailyEnt
      * @param
      * @author zxc
      */
-    List<AgencyMonthlyFormDTO> getLastDayAgency(@Param("monthId") String monthId);
+    List<AgencyMonthlyFormDTO> getLastDayAgency(@Param("dateId") String dateId);
 
     /**
      * @Description  查询 月的小组增量

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

@@ -114,7 +114,8 @@ public class StatsGroupServiceImpl implements StatsGroupService {
     public void groupAgencyMonthly(GroupStatsFormDTO formDTO) {
         DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
         String monthId = dimIdBean.getMonthId();
-        List<AgencyMonthlyFormDTO> lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(monthId);
+        String dateId = dimIdBean.getDateId();
+        List<AgencyMonthlyFormDTO> lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(dateId);
         List<AgencyGroupMonthlyResultDTO> monthGroupIncr = factGroupAgencyDailyService.getMonthGroupIncr(monthId);
         if (monthGroupIncr.size() == NumConstant.ZERO){
             lastDayAgency.forEach(agency -> {

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

@@ -108,7 +108,7 @@ public interface FactGroupAgencyDailyService extends BaseService<FactGroupAgency
      * @param
      * @author zxc
      */
-    List<AgencyMonthlyFormDTO> getLastDayAgency(String monthId);
+    List<AgencyMonthlyFormDTO> getLastDayAgency(String dateId);
 
     /**
      * @Description  查询 月的小组增量

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

@@ -122,8 +122,8 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAg
      * @param
      * @author zxc
      */
-    public List<AgencyMonthlyFormDTO> getLastDayAgency(String monthId){
-        return baseDao.getLastDayAgency(monthId);
+    public List<AgencyMonthlyFormDTO> getLastDayAgency(String dateId){
+        return baseDao.getLastDayAgency(dateId);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupAgencyDailyDao.xml

@@ -91,7 +91,7 @@
                 fact_group_agency_daily
             WHERE
                 del_flag = '0'
-                AND date_id = (SELECT MAX(date_id) FROM fact_group_agency_daily WHERE del_flag = '0')
+                AND date_id = #{dateId}
     </select>
 
     <!-- 查询 月的小组增量 -->

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java

@@ -24,7 +24,7 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.info("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
@@ -32,12 +32,12 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask {
 		if (result.success()) {
 			logger.info("publicityArticleSummaryDailyStatsTask定时任务执行成功");
 		} else {
-			logger.error("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
+			logger.error("publicityArticleSummaryDailyStatsTask定时任务执行失败:" + result.getMsg());
 		}
 	}
 
 	public static void main(String[] args) {
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		String params = "{'date':'\"2020-06-20','customerId':'123'}";
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java

@@ -24,7 +24,7 @@ public class PublicityTagUsedDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.info("publicityTagUsedDailyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java

@@ -24,7 +24,7 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.info("publicityTagUsedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java

@@ -24,7 +24,7 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.info("publicityTagUsedQuarterlyAndYearlyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java

@@ -24,7 +24,7 @@ public class PublicityTagViewedDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.info("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java

@@ -24,7 +24,7 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java

@@ -24,7 +24,7 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.info("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
-		StatsFormDTO formDTO = null;
+		StatsFormDTO formDTO = new StatsFormDTO();
 		if (StringUtils.isNotBlank(params)){
 			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}