优化代码

signal-optimize-service/src/main/java/net/wanji/opt/vo/CrossingDirectionQueryVO.java

@@ -47,7 +47,7 @@ public class CrossingDirectionQueryVO {
 
         @ApiModelProperty(value = "非机动车流量")
         @ExcelProperty("非机动车流量")
-        private int nonMotorFlow;
+        private double nonMotorFlow;
 
         @ExcelProperty("小车流量")
         private Integer trafficFlowC;
@@ -60,7 +60,7 @@ public class CrossingDirectionQueryVO {
 
         @ApiModelProperty(value = "平均速度")
         @ExcelProperty("平均速度")
-        private Integer speed;
+        private double speed;
 
         @ApiModelProperty(value = "平均车头间距")
         @ExcelProperty("平均车头间距")
@@ -68,15 +68,15 @@ public class CrossingDirectionQueryVO {
 
         @ApiModelProperty(value = "平均车头时距")
         @ExcelProperty("平均车头时距")
-        private Integer vehheadTime;
+        private double vehheadTime;
 
         @ApiModelProperty(value = "最大排队")
         @ExcelProperty("最大排队")
-        private Integer queueLength;
+        private double queueLength;
 
         @ApiModelProperty(value = "平均停车次数")
         @ExcelProperty("平均停车次数")
-        private Integer stopTimes;
+        private double stopTimes;
 
         //-----------------------------
 
@@ -122,7 +122,7 @@ public class CrossingDirectionQueryVO {
 
         @ApiModelProperty(value = "时间占有率")
         @ExcelProperty("平均时间占有率%")
-        private Integer timeOccupancy;
+        private double timeOccupancy;
 
         @ApiModelProperty(value = "空间占有率")
         // 空间长度占比 todo字段名称展示先不改了

signal-optimize-service/src/main/java/net/wanji/opt/vo/CrossingQueryVO.java

@@ -60,7 +60,7 @@ public class CrossingQueryVO {
 
         @ApiModelProperty(value = "平均速度")
         @ExcelProperty("平均速度")
-        private Integer speed;
+        private double speed;
 
         @ApiModelProperty(value = "平均车头间距")
         @ExcelProperty("平均车头间距")
@@ -68,15 +68,15 @@ public class CrossingQueryVO {
 
         @ApiModelProperty(value = "平均车头时距")
         @ExcelProperty("平均车头时距")
-        private Integer vehheadTime;
+        private double vehheadTime;
 
         @ApiModelProperty(value = "最大排队")
         @ExcelProperty("最大排队")
-        private Integer queueLength;
+        private double queueLength;
 
         @ApiModelProperty(value = "平均停车次数")
         @ExcelProperty("平均停车次数")
-        private Integer stopTimes;
+        private double stopTimes;
 
         //-----------------------------
 
@@ -122,12 +122,12 @@ public class CrossingQueryVO {
 
         @ApiModelProperty(value = "时间占有率")
         @ExcelProperty("平均时间占有率%")
-        private Integer timeOccupancy;
+        private double timeOccupancy;
 
         @ApiModelProperty(value = "空间占有率")
         // 空间长度占比 todo字段名称展示先不改了
         @ExcelProperty("平均空间占有率%")
-        private Integer vehicleNumsRatioMean;
+        private double vehicleNumsRatioMean;
         @ExcelProperty("85位速度")
         private double v85;
 
@@ -187,6 +187,10 @@ public class CrossingQueryVO {
         @ExcelProperty("二次停车通过率")
         private double twoStopPassRate;
 
+        @ApiModelProperty(name = "三次停车通过率")
+        @ExcelProperty("三次停车通过率")
+        public double threeStopRate;
+
         @ApiModelProperty(value = "路口未清空率")
         @ExcelProperty("路口未清空率")
         private double crossNoClearRate;
@@ -211,4 +215,12 @@ public class CrossingQueryVO {
         @ExcelProperty("车辆总和")
         private int allVehiceleFlow;
     }
+
+    public static void main(String[] args) {
+        //保留两位小数
+        double b = Math.round(0.01d * 100) / 100.0;
+        System.out.println(b);
+        double a = (double) Math.round(0.01d);
+        System.out.println(a);
+    }
 }

signal-optimize-service/src/main/java/net/wanji/opt/vo/CrossingTurnQueryVO.java

@@ -72,7 +72,7 @@ public class CrossingTurnQueryVO {
 
         @ApiModelProperty(value = "平均速度")
         @ExcelProperty("平均速度")
-        private Integer speed;
+        private double speed;
 
         @ApiModelProperty(value = "平均车头间距")
         @ExcelProperty("平均车头间距")
@@ -80,15 +80,15 @@ public class CrossingTurnQueryVO {
 
         @ApiModelProperty(value = "平均车头时距")
         @ExcelProperty("平均车头时距")
-        private Integer vehheadTime;
+        private double vehheadTime;
 
         @ApiModelProperty(value = "最大排队")
         @ExcelProperty("最大排队")
-        private Integer queueLength;
+        private double queueLength;
 
         @ApiModelProperty(value = "平均停车次数")
         @ExcelProperty("平均停车次数")
-        private Integer stopTimes;
+        private double stopTimes;
 
         //-----------------------------
 
@@ -134,7 +134,7 @@ public class CrossingTurnQueryVO {
 
         @ApiModelProperty(value = "时间占有率")
         @ExcelProperty("平均时间占有率%")
-        private Integer timeOccupancy;
+        private double timeOccupancy;
 
         @ApiModelProperty(value = "空间占有率")
         // 空间长度占比 todo字段名称展示先不改了

signal-optimize-service/src/main/java/net/wanji/opt/vo/TableQueryVO.java

@@ -135,7 +135,7 @@ public class TableQueryVO {
 
         @ApiModelProperty(value = "最大排队")
         @ExcelProperty("最大排队")
-        private Integer queueLength;
+        private double queueLength;
 
         @ApiModelProperty(value = "平均延误")
         @ExcelProperty("平均延误")
@@ -151,11 +151,11 @@ public class TableQueryVO {
 
         @ApiModelProperty(value = "平均停车次数")
         @ExcelProperty("平均停车次数")
-        private Integer stopTimes;
+        private double stopTimes;
 
         @ApiModelProperty(value = "平均车头时距")
         @ExcelProperty("平均车头时距")
-        private Integer vehheadTime;
+        private double vehheadTime;
 
         @ApiModelProperty(value = "饱和度")
         @ExcelProperty("饱和度")
@@ -179,17 +179,17 @@ public class TableQueryVO {
 
         @ApiModelProperty(value = "时间占有率")
         @ExcelProperty("平均时间占有率%")
-        private Integer timeOccupancy;
+        private double timeOccupancy;
 
         @ApiModelProperty(value = "空间占有率")
         // 空间长度占比 todo字段名称展示先不改了
         @ExcelProperty("平均空间占有率%")
-        private Integer vehicleNumsRatioMean;
+        private double vehicleNumsRatioMean;
         @ExcelProperty("85位速度")
         private double v85;
         @ApiModelProperty(value = "速度")
         @ExcelProperty("平均速度")
-        private Integer speed;
+        private double speed;
         @ExcelProperty("大车流量")
         private Integer trafficFlowA;
         @ExcelProperty("中车流量")
@@ -213,7 +213,7 @@ public class TableQueryVO {
 
         @ApiModelProperty(value = "溢出次数")
         @ExcelProperty("溢出次数")
-        private int overflowTimes;
+        private double overflowTimes;
 
         @ApiModelProperty(value = "失衡次数")
         @ExcelProperty("失衡次数")