干线bug修改

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/report/vo/GreenReportProblemDetailVO.java

@@ -22,6 +22,6 @@ public class GreenReportProblemDetailVO {
     private Double avgSpeed;
 
     @ApiModelProperty(value = "行程时间，单位分钟", example = "10")
-    private Integer travelTime;
+    private double travelTime;
 
 }
\ No newline at end of file

signal-optimize-service/src/main/java/net/wanji/opt/entity/report/CrossRidLaneDTO.java

@@ -25,5 +25,11 @@ public class CrossRidLaneDTO {
     private Integer outDir;
     @ApiModelProperty(value = "驶入方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北" )
     private Integer inDir;
+    @ApiModelProperty(value = "车道类型：1路段车道；2进口车道；3出口车道；4左转弯待转区；6直行待行区" )
+    private Integer laneType;
+    @ApiModelProperty(value = "开始路口编号" )
+    private String startCrossId;
+    @ApiModelProperty(value = "结束路口编号" )
+    private String endCrossId;
 
 }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/judgeanalysis/impl/AnalysisGreenCongestionPeriodServiceImpl.java

@@ -485,7 +485,7 @@ public class AnalysisGreenCongestionPeriodServiceImpl implements AnalysisGreenCo
         greenReportProblemDetail.setProblemSpan(getTimeString(periodVO));
         greenReportProblemDetail.setStatus(ConsgestionStatusEnum.getDesc(periodVO.getStatus()));
         greenReportProblemDetail.setAvgSpeed(Math.round(periodVO.getSpeed() * 100) / 100.0);
-        greenReportProblemDetail.setTravelTime(periodVO.getTravelTime() / 60);
+        greenReportProblemDetail.setTravelTime(Math.round(periodVO.getTravelTime()*10 / 60.0)/10.0);
         greenReportProblemDetail.setCongestIndex(Math.round(periodVO.getCongestIndex() * 100) / 100.0);
         return greenReportProblemDetail;
     }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/report/impl/GreenWaveWeekDataServiceImpl.java

@@ -359,24 +359,24 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
                                 greenReportSamePeriodData.setPeakFlow(greenWaveWeekData.getFlow());
                                 greenReportSamePeriodData.setCongestIndex(Math.round(greenWaveWeekData.getCongestIndex()*100)/100.0);
                                 greenReportSamePeriodData.setAvgSpeed(Math.round(greenWaveWeekData.getSpeed()*100)/100.0);
-                                greenReportSamePeriodData.setTravelTime(Double.valueOf(greenWaveWeekData.getTravelTime()));
+                                greenReportSamePeriodData.setTravelTime(Math.round(greenWaveWeekData.getTravelTime()*100/60.0)/100.0);
                                 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("减少");
+                                    samePeriodData.setAmPeakSituation("减小");
                                 }else if(flow == 0){
                                     samePeriodData.setAmPeakSituation("相等");
                                 }else {
                                     samePeriodData.setAmPeakSituation("增加");
                                 }
                                 if(travelTime<0){
-                                    samePeriodData.setAmTravelTimeSituation("减少");
+                                    samePeriodData.setAmTravelTimeSituation("减少"+Math.abs(travelTime)+"s");
                                 }else if(travelTime == 0){
                                     samePeriodData.setAmTravelTimeSituation("相等");
                                 }else {
-                                    samePeriodData.setAmTravelTimeSituation("增加");
+                                    samePeriodData.setAmTravelTimeSituation("增加"+Math.abs(travelTime)+"s");
                                 }
                                 if(waveWeekData.getSpeed()!=0){
                                     greenReportSamePeriodData.setAvgSpeedRatio(Math.round((speed/waveWeekData.getSpeed()*10000))/100.0);
@@ -413,24 +413,24 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
                                 greenReportSamePeriodData.setPeakFlow(greenWaveWeekData.getFlow());
                                 greenReportSamePeriodData.setCongestIndex(Math.round(greenWaveWeekData.getCongestIndex()*100)/100.0);
                                 greenReportSamePeriodData.setAvgSpeed(Math.round(greenWaveWeekData.getSpeed()*100)/100.0);
-                                greenReportSamePeriodData.setTravelTime(Double.valueOf(greenWaveWeekData.getTravelTime()));
+                                greenReportSamePeriodData.setTravelTime(Math.round(greenWaveWeekData.getTravelTime()*100/60.0)/100.0);
                                 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.setPmPeakSituation("减少");
+                                    samePeriodData.setPmPeakSituation("减小");
                                 }else if(flow == 0){
                                     samePeriodData.setPmPeakSituation("相等");
                                 }else {
                                     samePeriodData.setPmPeakSituation("增加");
                                 }
                                 if(travelTime<0){
-                                    samePeriodData.setPmTravelTimeSituation("减少");
+                                    samePeriodData.setPmTravelTimeSituation("减少"+Math.abs(travelTime)+"s");
                                 }else if(travelTime == 0){
                                     samePeriodData.setPmTravelTimeSituation("相等");
                                 }else {
-                                    samePeriodData.setPmTravelTimeSituation("增加");
+                                    samePeriodData.setPmTravelTimeSituation("增加"+Math.abs(travelTime)+"s");
                                 }
                                 if(waveWeekData.getSpeed()!=0){
                                     greenReportSamePeriodData.setAvgSpeedRatio(Math.round((speed/waveWeekData.getSpeed()*10000))/100.0);
@@ -467,7 +467,7 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
                                 greenReportSamePeriodData.setPeakFlow(greenWaveWeekData.getFlow());
                                 greenReportSamePeriodData.setCongestIndex(Math.round(greenWaveWeekData.getCongestIndex()*100)/100.0);
                                 greenReportSamePeriodData.setAvgSpeed(Math.round(greenWaveWeekData.getSpeed()*100)/100.0);
-                                greenReportSamePeriodData.setTravelTime(Double.valueOf(greenWaveWeekData.getTravelTime()));
+                                greenReportSamePeriodData.setTravelTime(Math.round(greenWaveWeekData.getTravelTime()*100/60.0)/100.0);
                                 double speed = greenWaveWeekData.getSpeed() - waveWeekData.getSpeed();
                                 double flow = greenWaveWeekData.getFlow() - waveWeekData.getFlow();
                                 double travelTime = greenWaveWeekData.getTravelTime() - waveWeekData.getTravelTime();