Skip to content

T
traffic-signal-platform
Commit b1a42a3b authored by 董国亮's avatar 董国亮
Browse files
Options

武汉分支

parent f6ec1dcd
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 5 deletions
signal-control-service/src/main/resources/bootstrap-docker.yaml
View file @ b1a42a3b
......@@ -5,7 +5,7 @@ spring:
cloud:
nacos:
config:
server-addr: 173.17.0.1:8848
server-addr: 192.168.208.41:8848
file-extension: yaml
group: signal
namespace: signal
......
signal-control-service/src/main/resources/bootstrap.yaml
View file @ b1a42a3b
spring:
profiles:
active: dev
\ No newline at end of file
active: docker
\ No newline at end of file
signal-feign-service/src/main/resources/application-wuhan.properties 0 → 100644
View file @ b1a42a3b
utc.service.url=http://192.168.208.43:32000/utc
utc.dt.service.url=http://192.168.208.43:39002/utc-dt
utc.hisense.service.url=http://192.168.208.43:39003/utc-hisense
control.url=http://192.168.208.43:32001/web
signal-feign-service/src/main/resources/application.properties
View file @ b1a42a3b
#spring.profiles.active=???????
\ No newline at end of file
spring.profiles.active=wuhan
\ No newline at end of file
signal-optimize-service/src/main/java/net/wanji/opt/controller/TrendController.java
View file @ b1a42a3b
......@@ -315,6 +315,12 @@ public class TrendController {
return JsonViewObject.newInstance().success(result);
}
/**
* 车道交通指标
* @param lanePeriodTurnVO
* @return
* @throws Exception
*/
@ApiOperation(value = "车道周期转向数据", notes = "车道周期转向数据", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@PostMapping(value = "/lanePeriodTurnData",
......
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java
View file @ b1a42a3b
......@@ -1418,11 +1418,35 @@ public class TrendServiceImpl implements TrendService {
Integer delayTime = po.getDelayTime();
vo.setDelayTime(delayTime);
//路口效率指数
vo.setEfficiencyIndex(0.0);
//效率评价等级
vo.setEfficiencyEvaluateLevel(0.0);
Double stopTimes = po.getStopTimes();
vo.setStopTimes((int) Math.round(stopTimes));
Double vehheadTime = po.getVehheadTime();
vo.setVehheadTime((int) Math.round(vehheadTime));
//饱和度
vo.setSaturation(0.0);//po.getSaturation()
//拥堵指数
vo.setCongestionIndex(0.0);
//溢出指数
vo.setOverflowIndex(0.0);
//失衡指数
vo.setImbalanceIndex(0.0);
//拥堵次数
vo.setCongestionTimes(0);
//溢出次数
vo.setOverflowTimes(0);
//失衡次数
vo.setImbalanceTimes(0);
//空放次数
vo.setFreeFlowTimes(0);
//溢流率
vo.setOverflowRate(0.0);
//冲突点
vo.setConflictPoint(0);
Double timeOccupancyDouble = po.getTimeOccupancy();
if (timeOccupancyDouble != null) {
......@@ -1433,6 +1457,16 @@ public class TrendServiceImpl implements TrendService {
if (vehicleLengthRatioMean != null) {
vo.setVehicleNumsRatioMean((int) Math.round(vehicleLengthRatioMean * 100));
}
//路口服务水平
vo.setServiceLevel(0);
//路口安全系数
vo.setSafetyCoefficient(0.0);
//安全评价等级
vo.setSafetyEvaluateLevel(0);
//交通事件数
vo.setTrafficEventNum(0);
//交通事故数
vo.setTrafficAccidentNum(0);
vo.setVehheadDist(po.getVehheadDist());
vo.setTrafficFlowA(po.getTrafficFlowA());
......
signal-optimize-service/src/main/java/net/wanji/opt/vo/TableQueryVO.java
View file @ b1a42a3b
......@@ -141,6 +141,14 @@ public class TableQueryVO {
@ExcelProperty("平均延误")
private Integer delayTime ;
@ApiModelProperty(value = "路口效率指数")
@ExcelProperty("路口效率指数")
private Double efficiencyIndex ;
@ApiModelProperty(value = "效率评价等级")
@ExcelProperty("效率评价等级")
private Double efficiencyEvaluateLevel ;
@ApiModelProperty(value = "平均停车次数")
@ExcelProperty("平均停车次数")
private Integer stopTimes;
......@@ -149,6 +157,22 @@ public class TableQueryVO {
@ExcelProperty("平均车头时距")
private Integer vehheadTime;
@ApiModelProperty(value = "饱和度")
@ExcelProperty("饱和度")
private Double saturation;
@ApiModelProperty(value = "拥堵指数")
@ExcelProperty("拥堵指数")
private Double congestionIndex;
@ApiModelProperty(value = "溢出指数")
@ExcelProperty("溢出指数")
private Double overflowIndex;
@ApiModelProperty(value = "失衡指数")
@ExcelProperty("失衡指数")
private Double imbalanceIndex;
@ApiModelProperty(value = "平均车头间距")
@ExcelProperty("平均车身间距")
private Double vehheadDist;
......@@ -178,6 +202,51 @@ public class TableQueryVO {
@ApiModelProperty(value = "行人流量")
@ExcelProperty("行人流量")
private int pedFlow;
@ApiModelProperty(value = "路口服务水平")
@ExcelProperty("路口服务水平")
private int serviceLevel;
@ApiModelProperty(value = "拥堵次数")
@ExcelProperty("拥堵次数")
private int congestionTimes;
@ApiModelProperty(value = "溢出次数")
@ExcelProperty("溢出次数")
private int overflowTimes;
@ApiModelProperty(value = "失衡次数")
@ExcelProperty("失衡次数")
private int imbalanceTimes;
@ApiModelProperty(value = "空放次数")
@ExcelProperty("空放次数")
private int freeFlowTimes;
@ApiModelProperty(value = "溢流率")
@ExcelProperty("溢流率")
private double overflowRate;
@ApiModelProperty(value = "冲突点")
@ExcelProperty("冲突点")
private int conflictPoint;
@ApiModelProperty(value = "路口安全系数")
@ExcelProperty("路口安全系数")
private double safetyCoefficient;
@ApiModelProperty(value = "安全评价等级")
@ExcelProperty("安全评价等级")
private double safetyEvaluateLevel;
@ApiModelProperty(value = "交通事件数")
@ExcelProperty("交通事件数")
private int trafficEventNum;
@ApiModelProperty(value = "交通事故数")
@ExcelProperty("交通事故数")
private int trafficAccidentNum;
@ApiModelProperty(value = "车辆总和")
@ExcelProperty("车辆总和")
private int allVehiceleFlow;
......
signal-optimize-service/src/main/resources/bootstrap-docker.yaml
View file @ b1a42a3b
......@@ -2,7 +2,7 @@ spring:
cloud:
nacos:
config:
server-addr: 173.17.0.1:8848
server-addr: 192.168.208.41:8848
file-extension: yaml
group: signal
namespace: signal
......
signal-optimize-service/src/main/resources/bootstrap.yaml
View file @ b1a42a3b
spring:
profiles:
active: dev
\ No newline at end of file
active: docker
\ No newline at end of file
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