elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去掉线程

master
jianjun 4 years ago
parent
78c493239c
commit
ef54b6f87a
1 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java

48
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java
View File

@ -77,7 +77,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
List<String> customerIdList = null; List<String> customerIdList = null;
do { do {
customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
if (!CollectionUtils.isEmpty(customerIdList)){ if (!CollectionUtils.isEmpty(customerIdList)) {
customerIds.addAll(customerIdList); customerIds.addAll(customerIdList);
} }
} while (!CollectionUtil.isEmpty(customerIdList) && customerIdList.size() == pageSize); } while (!CollectionUtil.isEmpty(customerIdList) && customerIdList.size() == pageSize);
@ -98,8 +98,8 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
//校正参数里的前一天日期的数据 //校正参数里的前一天日期的数据
//获取所有网格员 //获取所有网格员
List<CustomerGridStaffDTO> allGridMembers = getAllGridMembers(formDTO); List<CustomerGridStaffDTO> allGridMembers = getAllGridMembers(formDTO);
if (CollectionUtils.isEmpty(allGridMembers)){ if (CollectionUtils.isEmpty(allGridMembers)) {
log.warn("executeStaffPatrolStats have any gridMembers,param:{}",JSON.toJSONString(formDTO)); log.warn("executeStaffPatrolStats have any gridMembers,param:{}", JSON.toJSONString(formDTO));
return; return;
} }
String yesterdayStr = getYesterdayString(formDTO); String yesterdayStr = getYesterdayString(formDTO);
@ -109,12 +109,12 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
//初始化参数里日期的数据 如果当前时间在1分钟内 则初始化 //初始化参数里日期的数据 如果当前时间在1分钟内 则初始化
String todayDateDimId = DimIdGenerator.getDateDimId(new Date()); String todayDateDimId = DimIdGenerator.getDateDimId(new Date());
if (todayDateDimId.equals(formDTO.getDateId())){ if (todayDateDimId.equals(formDTO.getDateId())) {
//如果当前时间-1分钟还等于今天 则进行初始化操作 否则执行数据纠正 //如果当前时间-1分钟还等于今天 则进行初始化操作 否则执行数据纠正
String dateDimId = DimIdGenerator.getDateDimId(new Date(System.currentTimeMillis() - 1 * 60 * 1000)); String dateDimId = DimIdGenerator.getDateDimId(new Date(System.currentTimeMillis() - 1 * 60 * 1000));
if (!dateDimId.equals(todayDateDimId)){ if (!dateDimId.equals(todayDateDimId)) {
initStaffPatrolTodayData(formDTO, allGridMembers); initStaffPatrolTodayData(formDTO, allGridMembers);
}else{ } else {
reloadStaffPatrolStatsData(formDTO, allGridMembers); reloadStaffPatrolStatsData(formDTO, allGridMembers);
} }
} }
@ -122,7 +122,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
} }
private void reloadStaffPatrolStatsData(StaffPatrolStatsFormDTO formDTO, List<CustomerGridStaffDTO> allGridMembers) { private void reloadStaffPatrolStatsData(StaffPatrolStatsFormDTO formDTO, List<CustomerGridStaffDTO> allGridMembers) {
log.info("reloadStaffPatrolStatsData param:{}",JSON.toJSONString(formDTO)); log.info("reloadStaffPatrolStatsData param:{}", JSON.toJSONString(formDTO));
//获取昨日的巡查统计记录 //获取昨日的巡查统计记录
//遍历网格员重新初始化数据 //遍历网格员重新初始化数据
@ -202,7 +202,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
} }
private void initStaffPatrolTodayData(StaffPatrolStatsFormDTO formDTO, List<CustomerGridStaffDTO> allGridMembers) { private void initStaffPatrolTodayData(StaffPatrolStatsFormDTO formDTO, List<CustomerGridStaffDTO> allGridMembers) {
log.info("initStaffPatrolTodayData param:{}",JSON.toJSONString(formDTO)); log.info("initStaffPatrolTodayData param:{}", JSON.toJSONString(formDTO));
List<StatsStaffPatrolRecordDailyDTO> insertList = buildInitPatrolStatsData(formDTO, allGridMembers); List<StatsStaffPatrolRecordDailyDTO> insertList = buildInitPatrolStatsData(formDTO, allGridMembers);
Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList); Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
log.debug("initStaffPatrolStats insert rows:{}", effectRow); log.debug("initStaffPatrolStats insert rows:{}", effectRow);
@ -287,24 +287,24 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate()); daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
} }
List<String> finalDaysBetween = daysBetween; List<String> finalDaysBetween = daysBetween;
threadPool.submit(() -> {
if (!isRange) { if (!isRange) {
try { try {
//初始化form里的今天的数据 并纠正昨日的数据 //初始化form里的今天的数据 并纠正昨日的数据
this.executeStaffPatrolStats(formDTO);
} catch (Exception e) {
log.error("【网格员巡查数据统计】发生异常,参数:" + JSON.toJSONString(formDTO), e);
}
} else {
try {
for (String dateDimId : finalDaysBetween) {
formDTO.setDateId(dateDimId);
this.executeStaffPatrolStats(formDTO); this.executeStaffPatrolStats(formDTO);
} catch (Exception e) {
log.error("【网格员巡查数据统计】发生异常,参数:" + JSON.toJSONString(formDTO), e);
}
} else {
try {
for (String dateDimId : finalDaysBetween) {
formDTO.setDateId(dateDimId);
this.executeStaffPatrolStats(formDTO);
}
} catch (Exception e) {
log.error("【网格员巡查数据统计】发生异常,参数:" + JSON.toJSONString(param), e);
} }
} catch (Exception e) {
log.error("【网格员巡查数据统计】发生异常,参数:" + JSON.toJSONString(param), e);
} }
}); }
} }
} }

Write Preview
Loading…
Cancel
Save