diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 50382aa75e..e75870980f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/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 customerIds = new ArrayList<>(); - if (StringUtils.isNotBlank(formDTO.getCustomerId())) { - customerIds.add(formDTO.getCustomerId()); - } else { - customerIds = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - } do { - + if (StringUtils.isNotBlank(formDTO.getCustomerId())) { + customerIds.add(formDTO.getCustomerId()); + } else { + customerIds = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + } DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO); if (customerIds.size() != NumConstant.ZERO) { customerIds.forEach(customerId -> { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java index f5ff55f74e..a8f8c7802d 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java +++ b/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)); } } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index 20fc7cb138..aa0d5545ed 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/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 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java index 6e61017ed1..9236ff80a5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java @@ -503,15 +503,15 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl list){ - String result = ""; + StringBuilder r = new StringBuilder(); if (!CollectionUtils.isEmpty(list)){ list.forEach(l -> { - result.concat(l.getCategoryName()).concat(","); + r.append(l.getCategoryName()).append(","); }); } - if (StringUtils.isEmpty(result)){ - return result; + if (StringUtils.isEmpty(r.toString())){ + return r.toString(); } - return result.substring(NumConstant.ZERO,result.length()-NumConstant.ONE); + return r.toString().substring(NumConstant.ZERO,r.length()-NumConstant.ONE); } }