Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-service-system/src/main/java/com/fs/statis/StatisticsRedisConstant.java

@@ -7,65 +7,65 @@ public class StatisticsRedisConstant {
     /**
      * 经销商统计
      */
-    public static final String DATA_OVERVIEW_DEALER_AGGREGATED = "overview::DealerAggregatedDTO";
+    public static final String DATA_OVERVIEW_DEALER_AGGREGATED = "overview:DealerAggregatedDTO";
     /**
      * 短信余额
      */
-    public static final String DATA_OVERVIEW_DEALER_SMS_BALANCE = "overview::SMS::BALANCE";
+    public static final String DATA_OVERVIEW_DEALER_SMS_BALANCE = "overview:SMS:BALANCE";
     /**
      * 余额类
      */
-    public static final String DATA_OVERVIEW_DEALER_BALANCE = "overview::balance";
+    public static final String DATA_OVERVIEW_DEALER_BALANCE = "overview:balance";
     /**
      * 平台统计类信息
      */
-    public static final String DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO = "overview::authorizationInfo";
+    public static final String DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO = "overview:authorizationInfo";
 
     /**
      * 分析概览-今日
      */
-    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_TODAY = "overview::AnalysisPreviewDTO::0";
+    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_TODAY = "overview:AnalysisPreviewDTO:0";
     /**
      * 分析概览-昨日
      */
-    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_YESTODAY = "overview::AnalysisPreviewDTO::1";
+    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_YESTODAY = "overview:AnalysisPreviewDTO:1";
 
     /**
      * 分析概览-本周
      */
-    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_THIS_WEEEK = "overview::AnalysisPreviewDTO::2";
+    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_THIS_WEEEK = "overview:AnalysisPreviewDTO:2";
 
     /**
      * 分析概览-本月
      */
-    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_THIS_MONTH = "overview::AnalysisPreviewDTO::3";
+    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_THIS_MONTH = "overview:AnalysisPreviewDTO:3";
     /**
      * 分析概览-上月
      */
-    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_BEFORE_MONTH = "overview::AnalysisPreviewDTO::4";
+    public static final String DATA_OVERVIEW_DEALER_ANALYSISPREVIEW_BEFORE_MONTH = "overview:AnalysisPreviewDTO:4";
 
 
     /**
      * 会员观看、完播人数趋势图
      */
-    public static final String DATA_OVERVIEW_DEALER_CHARTS = "charts::dealer::charts";
+    public static final String DATA_OVERVIEW_DEALER_CHARTS = "charts:dealer:charts";
 
 
     /**
      * 经销商会员观看TOP10 - 按观看人数
      */
-    public static final String CHARTS_MEMBER_TOP_TEN_WATCH = "charts::memeber::top10::watch::user::count";
+    public static final String CHARTS_MEMBER_TOP_TEN_WATCH = "charts:memeber:top10:watch:user:count";
     /**
      * 课程观看TOP10
      */
-    public static final String CHARTS_WATCH_TOP_TEN = "charts::watch::top10";
+    public static final String CHARTS_WATCH_TOP_TEN = "charts:watch:top10";
     /**
      * 答题红包金额TOP10
      */
-    public static final String CHARTS_REWARD_MONEY_TOP_TEN = "charts::reward::money::top10";
+    public static final String CHARTS_REWARD_MONEY_TOP_TEN = "charts:reward:money:top10";
     /**
      * 答题红包金额趋势图
      */
-    public static final String CHARTS_REWARD_MONEY_TREND = "charts::reward::money::trend";
+    public static final String CHARTS_REWARD_MONEY_TREND = "charts:reward:money:trend";
 
 }

fs-service-system/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -3,7 +3,6 @@ package com.fs.statis.service.impl;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.company.cache.ICompanyCacheService;
 import com.fs.statis.StatisticsRedisConstant;
-import com.fs.statis.cache.IStatisticsCacheService;
 import com.fs.statis.dto.*;
 import com.fs.statis.mapper.ConsumptionBalanceMapper;
 import com.fs.statis.service.IStatisticsService;
@@ -12,7 +11,6 @@ import com.fs.store.service.cache.IFsUserCourseCacheService;
 import com.hc.openapi.tool.util.ObjectUtils;
 import com.hc.openapi.tool.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -42,7 +40,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
 
     @Override
-    @Scheduled(cron = "0 0 * * * *")
     public void dataOverviewTask() {
         DealerAggregatedDTO dealerAggregatedDTO = this.dealerAggregated();
         ConsumptionBalanceDataDTO consumptionBalanceDataDTO = this.rechargeConsumption();
@@ -56,12 +53,10 @@ public class StatisticsServiceImpl implements IStatisticsService {
     }
 
 
-    @Scheduled(cron = "0 0/15 * * * *")
     public void analysisPreviewTask0(){
         analysisPreviewTask(0);
     }
 
-    @Scheduled(cron = "0 0 1 * * *")
     public void analysisPreviewTask1(){
         analysisPreviewTask(0);
         analysisPreviewTask(1);
@@ -124,7 +119,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
     }
 
-    @Scheduled(cron = "0 0/15 * * * *")
     public void watchEndPlayTrendTask0(){
         this.watchEndPlayTrendTask(0);
         this.watchEndPlayTrendTask(1);
@@ -133,7 +127,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
         this.watchEndPlayTrendTask(4);
     }
 
-    @Scheduled(cron = "0 0 1 * * *")
     public void watchEndPlayTrendTask1(){
         this.watchEndPlayTrendTask(1);
         this.watchEndPlayTrendTask(2);
@@ -186,13 +179,11 @@ public class StatisticsServiceImpl implements IStatisticsService {
     }
 
 
-    @Scheduled(cron = "0 0/15 * * * *")
     public void companyWatchCourseTopTenTask0(){
         companyWatchCourseTopTenTask(0,0);
         companyWatchCourseTopTenTask(0,1);
     }
 
-    @Scheduled(cron = "0 0 1 * * *")
     public void companyWatchCourseTopTenTask1(){
         companyWatchCourseTopTenTask(1,0);
         companyWatchCourseTopTenTask(1,1);
@@ -295,7 +286,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
         redisCache.setCacheObject( String.format("%s::%d::%d::%s", CHARTS_WATCH_TOP_TEN, type,statisticalType,sort), courseStatsDTOS);
     }
 
-    @Scheduled(cron = "0 0/15 * * * *")
     public void watchCourseTopTenTask0(){
         watchCourseTopTenTask(0,0,"DESC");
         watchCourseTopTenTask(0,0,"ASC");
@@ -310,7 +300,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
         watchCourseTopTenTask(0,3,"ASC");
     }
 
-    @Scheduled(cron = "0 0 1 * * *")
     public void watchCourseTopTenTask1(){
         watchCourseTopTenTask(1,0,"DESC");
         watchCourseTopTenTask(1,0,"ASC");
@@ -352,7 +341,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
     }
 
 
-    @Scheduled(cron = "0 0/15 * * * *")
     public void rewardMoneyTask15Minutes(){
         rewardMoneyTopTenTask(0,0);
         rewardMoneyTopTenTask(0,1);
@@ -361,7 +349,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
     }
 
 
-    @Scheduled(cron = "0 0 1 * * *")
     public void rewardMoneyTaskEveryday(){
         rewardMoneyTopTenTask(1,0);
         rewardMoneyTopTenTask(1,1);
@@ -575,7 +562,11 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
     @Override
     public Long smsBalance() {
-        return consumptionBalanceMapper.smsBalance();
+        Long smsBalance = consumptionBalanceMapper.smsBalance();
+        if(smsBalance != null) {
+            smsBalance = 0L;
+        }
+        return smsBalance;
     }
 
     @Override