Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -12,6 +12,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 
 /**
  * @author Mark sunlightcs@gmail.com
@@ -559,4 +560,13 @@ public class RedisKeys {
 	public static String blockedMqMsgKey(String blockedMsgLabel) {
     	return rootPrefix.concat("message:mq:blocked:").concat(blockedMsgLabel);
 	}
+
+	/**
+	 * desc:获取执行完毕的 业务 参数结果key
+	 * @param bizMethod
+	 * @return
+	 */
+	public static String getBackDoorbizExcuteResult(String bizMethod) {
+		return rootPrefix.concat("backdoor:").concat(bizMethod);
+	}
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -60,9 +62,7 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -73,7 +73,8 @@ import java.util.concurrent.Future;
 public class DemoController {
     @Autowired
     private StatsDemoService demoService;
-
+    @Autowired
+    private RedisUtils redisUtils;
     @Autowired
     private ExecutorService executorService;
 
@@ -1084,16 +1085,21 @@ public class DemoController {
                            @RequestParam(name = "startDate",required = false)String startDate,
                            @RequestParam(name = "endDate",required = false)String endDate
     ){
+
         long start = System.currentTimeMillis();
+        Set<String> result = new LinkedHashSet<>();
         if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
             List<String> daysBetween = DateUtils.getDaysBetween(startDate, endDate);
             daysBetween.forEach(d -> {
                 screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId,d);
                 screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId,d);
+                result.add(d);
+                redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("gridandorgdailynew"),customerId,result,3*24*60*60L);
             });
         }else {
             screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId,dateId);
             screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId,dateId);
+            redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("gridandorgdailynew"),customerId,result,3*24*60*60L);
         }
         long end = System.currentTimeMillis();
         long l = (end - start) / 1000;