Skip to content

T
traffic-signal-platform
Commit 39647f79 authored by zhoushiguang's avatar zhoushiguang
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 85cbc010 4e7d45aa
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
signal-optimize-service/src/main/java/net/wanji/opt/servicev2/report/impl/GreenWaveWeekDataServiceImpl.java
View file @ 39647f79
......@@ -316,7 +316,7 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
greenWaveWeekDataVO.setGreenRoadType(RoadLevelEnum.getDesc(greenInfoList.get(0).getLevel()));
greenWaveWeekDataVOList.add(greenWaveWeekDataVO);
}
List<GreenWaveWeekDataVO> collect = greenWaveWeekDataVOList.stream().sorted(Comparator.comparingDouble(GreenWaveWeekDataVO::getMaxCongestIndex).reversed()).collect(Collectors.toList());
List<GreenWaveWeekDataVO> collect = greenWaveWeekDataVOList.stream().sorted(Comparator.comparingDouble(GreenWaveWeekDataVO::getCongestCount).reversed()).collect(Collectors.toList());
collect.forEach(x->{
x.setRank(collect.indexOf(x)+1);
});
......@@ -338,7 +338,7 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
.collect(Collectors.toList());
}
List<GreenWaveWeekData> greenWaveWeekDatas = greenWaveWeekDataMapper.getDataByWeek(greenIdList,yearWeek);
List<GreenWaveWeekData> greenWaveWeekDatasLast = greenWaveWeekDataMapper.getDataByWeek(greenIdList,yearWeek-1);
List<GreenWaveWeekData> greenWaveWeekDatasLast = greenWaveWeekDataMapper.getDataByWeek(greenIdList,yearWeekLast);
List<GreenReportSamePeriodCompareData> result = new ArrayList<>();
if(!ObjectUtils.isEmpty(greenWaveWeekDatas) && !ObjectUtils.isEmpty(greenWaveWeekDatasLast)){
Map<Integer, List<GreenWaveWeekData>> collect = greenWaveWeekDatas.stream().collect(Collectors.groupingBy(GreenWaveWeekData::getGreenId));
......@@ -357,8 +357,8 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
if("1".equals(waveWeekData.getPeakType())){
greenReportSamePeriodData.setPeakName(PeakNameEnum.getDesc(Integer.valueOf(greenWaveWeekData.getPeakType())));
greenReportSamePeriodData.setPeakFlow(greenWaveWeekData.getFlow());
greenReportSamePeriodData.setCongestIndex(greenWaveWeekData.getCongestIndex());
greenReportSamePeriodData.setAvgSpeed(greenWaveWeekData.getSpeed());
greenReportSamePeriodData.setCongestIndex(Math.round(greenWaveWeekData.getCongestIndex()*100)/100.0);
greenReportSamePeriodData.setAvgSpeed(Math.round(greenWaveWeekData.getSpeed()*100)/100.0);
greenReportSamePeriodData.setTravelTime(Double.valueOf(greenWaveWeekData.getTravelTime()));
double speed = greenWaveWeekData.getSpeed() - waveWeekData.getSpeed();
double flow = greenWaveWeekData.getFlow() - waveWeekData.getFlow();
......@@ -393,8 +393,8 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
}else{
greenReportSamePeriodData.setCongestIndexRatio(100.0);
}
if(waveWeekData.getSpeed()!=0){
greenReportSamePeriodData.setTravelTimeRatio(Math.round((speed/waveWeekData.getTravelTime()*10000))/100.0);
if(waveWeekData.getTravelTime()!=0){
greenReportSamePeriodData.setTravelTimeRatio(Math.round((travelTime/waveWeekData.getTravelTime()*10000))/100.0);
}else{
greenReportSamePeriodData.setTravelTimeRatio(100.0);
}
......@@ -411,8 +411,8 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
if("2".equals(waveWeekData.getPeakType())){
greenReportSamePeriodData.setPeakName(PeakNameEnum.getDesc(Integer.valueOf(greenWaveWeekData.getPeakType())));
greenReportSamePeriodData.setPeakFlow(greenWaveWeekData.getFlow());
greenReportSamePeriodData.setCongestIndex(greenWaveWeekData.getCongestIndex());
greenReportSamePeriodData.setAvgSpeed(greenWaveWeekData.getSpeed());
greenReportSamePeriodData.setCongestIndex(Math.round(greenWaveWeekData.getCongestIndex()*100)/100.0);
greenReportSamePeriodData.setAvgSpeed(Math.round(greenWaveWeekData.getSpeed()*100)/100.0);
greenReportSamePeriodData.setTravelTime(Double.valueOf(greenWaveWeekData.getTravelTime()));
double speed = greenWaveWeekData.getSpeed() - waveWeekData.getSpeed();
double flow = greenWaveWeekData.getFlow() - waveWeekData.getFlow();
......@@ -447,8 +447,8 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
}else{
greenReportSamePeriodData.setCongestIndexRatio(100.0);
}
if(waveWeekData.getSpeed()!=0){
greenReportSamePeriodData.setTravelTimeRatio(Math.round((speed/waveWeekData.getTravelTime()*10000))/100.0);
if(waveWeekData.getTravelTime()!=0){
greenReportSamePeriodData.setTravelTimeRatio(Math.round((travelTime/waveWeekData.getTravelTime()*10000))/100.0);
}else{
greenReportSamePeriodData.setTravelTimeRatio(100.0);
}
......@@ -465,27 +465,27 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
if("3".equals(waveWeekData.getPeakType())){
greenReportSamePeriodData.setPeakName(PeakNameEnum.getDesc(Integer.valueOf(greenWaveWeekData.getPeakType())));
greenReportSamePeriodData.setPeakFlow(greenWaveWeekData.getFlow());
greenReportSamePeriodData.setCongestIndex(greenWaveWeekData.getCongestIndex());
greenReportSamePeriodData.setAvgSpeed(greenWaveWeekData.getSpeed());
greenReportSamePeriodData.setCongestIndex(Math.round(greenWaveWeekData.getCongestIndex()*100)/100.0);
greenReportSamePeriodData.setAvgSpeed(Math.round(greenWaveWeekData.getSpeed()*100)/100.0);
greenReportSamePeriodData.setTravelTime(Double.valueOf(greenWaveWeekData.getTravelTime()));
double speed = greenWaveWeekData.getSpeed() - waveWeekData.getSpeed();
double flow = greenWaveWeekData.getFlow() - waveWeekData.getFlow();
double travelTime = greenWaveWeekData.getTravelTime() - waveWeekData.getTravelTime();
double congestIndex = greenWaveWeekData.getCongestIndex() - waveWeekData.getCongestIndex();
if(flow<0){
samePeriodData.setAmPeakSituation("减少");
}else if(flow == 0){
samePeriodData.setAmPeakSituation("相等");
}else {
samePeriodData.setAmPeakSituation("增加");
}
if(travelTime<0){
samePeriodData.setAmTravelTimeSituation("减少");
}else if(travelTime == 0){
samePeriodData.setAmTravelTimeSituation("相等");
}else {
samePeriodData.setAmTravelTimeSituation("增加");
}
// if(flow<0){
// samePeriodData.setAmPeakSituation("减少");
// }else if(flow == 0){
// samePeriodData.setAmPeakSituation("相等");
// }else {
// samePeriodData.setAmPeakSituation("增加");
// }
// if(travelTime<0){
// samePeriodData.setAmTravelTimeSituation("减少");
// }else if(travelTime == 0){
// samePeriodData.setAmTravelTimeSituation("相等");
// }else {
// samePeriodData.setAmTravelTimeSituation("增加");
// }
if(waveWeekData.getSpeed()!=0){
greenReportSamePeriodData.setAvgSpeedRatio(Math.round((speed/waveWeekData.getSpeed()*10000))/100.0);
}else{
......@@ -501,8 +501,8 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
}else{
greenReportSamePeriodData.setCongestIndexRatio(100.0);
}
if(waveWeekData.getSpeed()!=0){
greenReportSamePeriodData.setTravelTimeRatio(Math.round((speed/waveWeekData.getTravelTime()*10000))/100.0);
if(waveWeekData.getTravelTime()!=0){
greenReportSamePeriodData.setTravelTimeRatio(Math.round((travelTime/waveWeekData.getTravelTime()*10000))/100.0);
}else{
greenReportSamePeriodData.setTravelTimeRatio(100.0);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment