xhxu 4 лет назад
Родитель
Сommit
b4e42f49f1
3 измененных файлов: 21 добавлений и 18 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java
  2. +7
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
  3. +13
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java Просмотреть файл

@@ -54,7 +54,7 @@ public interface WxCarCmdLogService {

WxCarCmdLog getBySynId(HashMap<String, Object> params);

Map<String, Integer> getHourCountMap(WxCarCmdLog wxCarCmdLog);
Map<String, Long> getHourCountMap(WxCarCmdLog wxCarCmdLog);

long queryHistoryCount(HashMap<String, Object> weekParams);
}

+ 7
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java Просмотреть файл

@@ -78,28 +78,28 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService {
}

@Override
public Map<String, Integer> getHourCountMap(WxCarCmdLog wxCarCmdLog) {
public Map<String, Long> getHourCountMap(WxCarCmdLog wxCarCmdLog) {
if(StringUtils.isBlank(wxCarCmdLog.getTenantId())
&& StringUtils.isNotBlank(wxCarCmdLog.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(wxCarCmdLog);
Map<String, Integer> map = new HashMap<>();
Map<String, Long> map = new HashMap<>();
for (TenantEntity tenantEntity:tenantEntitys) {
wxCarCmdLog.updateTenantInfo(tenantEntity);
List<Map<String, Object>> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog);
Map<String, Integer> collect = list.stream().collect(Collectors.toMap(m -> {
Map<String, Long> collect = list.stream().collect(Collectors.toMap(m -> {
return (String)m.get("create_time");
}, m -> {
return (Integer)m.get("carcount");
return (Long)m.get("carcount");
}));
collect.forEach((key,value) -> map.merge(key,value,Integer::sum));
collect.forEach((key,value) -> map.merge(key,value,Long::sum));
}
return map;
}
List<Map<String, Object>> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog);
Map<String, Integer> collect = list.stream().collect(Collectors.toMap(m -> {
Map<String, Long> collect = list.stream().collect(Collectors.toMap(m -> {
return (String)m.get("create_time");
}, m -> {
return (Integer)m.get("carcount");
return (Long)m.get("carcount");
}));
return collect;
}


+ 13
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Просмотреть файл

@@ -859,7 +859,7 @@ public class WxChartServiceImpl implements WxChartDataService {
wxCarCmdLog.setCmdTypes(EnumCarCmd.getCarIn());
wxCarCmdLog.setStartdate(DateUtils.stringToDate(systemTime + " 05:00:00","yyyy-MM-dd HH:mm:ss"));
wxCarCmdLog.setEnddate(new Date());
Map<String, Integer> todaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog);
Map<String, Long> todaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog);

List<String> hourList = new ArrayList<>();
Calendar instance = Calendar.getInstance();
@@ -870,12 +870,13 @@ public class WxChartServiceImpl implements WxChartDataService {
for (int i = startHour; i < endHour; i++) {
hourList.add(i < 10 ? "0" + i + ":00" : i + ":00");
}
List<Object> todayCarList = new ArrayList<>();
List<Long> todayCarList = new ArrayList<>();
for (int i = startHour; i < endHour; i++) {
if(i<hour) {
todayCarList.add(todaycollect.get((Object) hourList.get(i-startHour)));
Long count = todaycollect.get(hourList.get(i - startHour));
todayCarList.add(count == null?0l:count);
} else {
todayCarList.add("");
todayCarList.add(0l);
}
}
datamap.put("currentimeindex", hourList);
@@ -883,19 +884,21 @@ public class WxChartServiceImpl implements WxChartDataService {

wxCarCmdLog.setStartdate(DateUtils.stringToDate(yesterday + " 05:00:00","yyyy-MM-dd HH:mm:ss"));
wxCarCmdLog.setEnddate(DateUtils.stringToDate(yesterday + " 22:59:59","yyyy-MM-dd HH:mm:ss"));
Map<String, Integer> yesterdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog);
List<Object> yesterdayCarList = new ArrayList<>();
Map<String, Long> yesterdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog);
List<Long> yesterdayCarList = new ArrayList<>();
for (int i = startHour; i < endHour; i++) {
yesterdayCarList.add(yesterdaycollect.get((Object) hourList.get(i-startHour)));
Long count = yesterdaycollect.get(hourList.get(i - startHour));
yesterdayCarList.add(count == null?0l:count);
}
datamap.put("yesterdaycardata", yesterdayCarList);

wxCarCmdLog.setStartdate(DateUtils.stringToDate(lastweek + " 05:00:00","yyyy-MM-dd HH:mm:ss"));
wxCarCmdLog.setEnddate(DateUtils.stringToDate(lastweek + " 22:59:59","yyyy-MM-dd HH:mm:ss"));
Map<String, Integer> lastweekdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog);
List<Object> lastweekdayCarList = new ArrayList<>();
Map<String, Long> lastweekdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog);
List<Long> lastweekdayCarList = new ArrayList<>();
for (int i = startHour; i < endHour; i++) {
lastweekdayCarList.add(lastweekdaycollect.get((Object) hourList.get(i-startHour)));
Long count = lastweekdaycollect.get(hourList.get(i - startHour));
lastweekdayCarList.add(count == null?0l:count);
}
datamap.put("lastdaycardata", lastweekdayCarList);



Загрузка…
Отмена
Сохранить