Browse Source

[数据塔台][营销数据][修改场景数据为30天记录]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
e8d285b6dc
2 changed files with 25 additions and 2 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +24
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java View File

@@ -158,7 +158,7 @@ public class DataTowerServiceImpl implements DataTowerService {
HashMap<Object, Object> params = new HashMap<>();
params.put("tenantId",tenantId);
params.put("cmdType",EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode());
String startdate = DateUtils.getTimeBefore(7, new Date());
String startdate = DateUtils.getTimeBefore(29, new Date());
String systemTime = DateUtils.getSystemTime("yyyy-MM-dd");

List<String> tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0");


+ 24
- 1
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java View File

@@ -205,12 +205,35 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
vo.setVerifyCount(verifyCountMap.get(vo.getxTime()) == null ? 0 : verifyCountMap.get(vo.getxTime()));
}

String startdate = DateUtils.getTimeBefore(29, new Date());
String enddate = DateUtils.getTimeBefore(1,new Date());
List<String> tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0");
List<String> tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList());
List<MarkingSceneDataReportVo> tempDatalist =new LinkedList<>();

for(String tj:tjList){
Optional<MarkingSceneDataReportVo> first = list.stream().filter(c -> c.getxTime().equals(tj)).findFirst();
if(!first.isPresent()){
MarkingSceneDataReportVo markingSceneDataReportVo = new MarkingSceneDataReportVo();
markingSceneDataReportVo.setxTime(tj);
markingSceneDataReportVo.setParkCount(0);
markingSceneDataReportVo.setVerifyCount(0);
markingSceneDataReportVo.setTempCount(0);
markingSceneDataReportVo.setCarCount(0);
markingSceneDataReportVo.setParkSendCount(0);
markingSceneDataReportVo.setVerifySendCount(0);
tempDatalist.add(markingSceneDataReportVo);
continue;
}
tempDatalist.add(first.get());
}


HashMap<String, Object> returnMap = new HashMap<>();
returnMap.put("sceneDownDay", sceneDownDay);//比昨日下降
returnMap.put("sceneUpWeek", sceneUpWeek);//比上周提升
returnMap.put("todaySceneCount", todaySceneCount);//今日领取数
returnMap.put("sceneDataMap", list);
returnMap.put("sceneDataMap", tempDatalist);
return returnMap;
}



Loading…
Cancel
Save