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

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

@@ -83,13 +83,12 @@ public class StatsGroupServiceImpl implements StatsGroupService {
         Integer pageSize = NumConstant.ONE_HUNDRED;
         List<String> customerIds = new ArrayList<>();
 
+        do {
             if (StringUtils.isNotBlank(formDTO.getCustomerId())) {
                 customerIds.add(formDTO.getCustomerId());
             } else {
                 customerIds = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
             }
-        do {
-
             DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
             if (customerIds.size() != NumConstant.ZERO) {
                 customerIds.forEach(customerId -> {

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

@@ -1,5 +1,6 @@
 package com.epmet.task;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.StatsGroupService;
 import org.slf4j.Logger;
@@ -28,7 +29,7 @@ public class StatsGroupAgencyDailyTask implements ITask {
         if (result.success()){
             logger.info("StatsGroupAgencyDailyTask定时任务执行成功");
         }else {
-            logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" + result.getMsg());
+            logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" , JSON.toJSONString(result));
         }
     }
 }

epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@@ -113,7 +113,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 60000 #缺省为1000
+            timeoutInMilliseconds: 90000 #缺省为1000
 
 ribbon:
   ReadTimeout: 300000