Skip to content

T
traffic-signal-platform
Commit 4b5539c8 authored by duanruiming's avatar duanruiming
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents deabd3cf 3d0f134c
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 13 deletions
signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/AnalysisProblemAreaDayController.java
View file @ 4b5539c8
......@@ -34,10 +34,14 @@ public class AnalysisProblemAreaDayController {
@ApiOperation(value = "区域-问题数量总览", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@GetMapping(value = "/overview")
@ApiImplicitParams({
@ApiImplicitParam(name = "areaId", value = "区域ID", required = true, dataType = "String", defaultValue = "1"),
@ApiImplicitParam(name = "timeType", value = "事件类型 1：近一个月 2：近一周", required = true, dataType = "int", defaultValue = "1"),
})
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = AreaProblemOverview.class),
})
public JsonViewObject areaProblemOverview() {
public JsonViewObject areaProblemOverview(String timeType,String areaId) {
return JsonViewObject.newInstance().success(null);
}
......@@ -45,10 +49,14 @@ public class AnalysisProblemAreaDayController {
@ApiOperation(value = "区域-问题数量趋势分析", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@GetMapping(value = "/trend")
@ApiImplicitParams({
@ApiImplicitParam(name = "areaId", value = "区域ID", required = true, dataType = "String", defaultValue = "1"),
@ApiImplicitParam(name = "timeType", value = "事件类型 1：近一个月 2：近一周", required = true, dataType = "int", defaultValue = "1"),
})
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = AreaProblemTrendAnalysisResult.class),
})
public JsonViewObject trend() {
public JsonViewObject trend(String timeType,String areaId) {
return JsonViewObject.newInstance().success(null);
}
......@@ -57,13 +65,15 @@ public class AnalysisProblemAreaDayController {
@ApiOperation(value = "区域-路口问题数量分析", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@ApiImplicitParams({
@ApiImplicitParam(name = "eventType", value = "事件代码 701：空放 702：路口失衡，703：路口溢出", required = true, dataType = "String", defaultValue = "")
@ApiImplicitParam(name = "eventType", value = "事件代码 701：路口空放 702：路口失衡，703：路口溢出 705:干线缓行 706：干线拥堵 707：路口拥堵", required = true, dataType = "String", defaultValue = ""),
@ApiImplicitParam(name = "areaId", value = "区域ID", required = true, dataType = "String", defaultValue = "1"),
})
@GetMapping(value = "/cross-problem-number")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = AreaCrossProblemAnalysisResult.class),
})
public JsonViewObject crossProblemNumber(String eventType) {
public JsonViewObject crossProblemNumber(String eventType,String timeType,String areaId) {
return JsonViewObject.newInstance().success(null);
}
......@@ -71,13 +81,15 @@ public class AnalysisProblemAreaDayController {
@ApiOperation(value = "区域-干线问题数量分析", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@ApiImplicitParams({
@ApiImplicitParam(name = "eventType", value = "事件代码 705：干线缓行 706：干线拥堵", required = true, dataType = "String", defaultValue = "")
@ApiImplicitParam(name = "eventType", value = "事件代码 701：路口空放 702：路口失衡，703：路口溢出 705:干线缓行 706：干线拥堵 707：路口拥堵 ", required = true, dataType = "String", defaultValue = ""),
@ApiImplicitParam(name = "areaId", value = "区域ID", required = true, dataType = "String", defaultValue = "1"),
@ApiImplicitParam(name = "timeType", value = "事件类型 1：近一个月 2：近一周", required = true, dataType = "int", defaultValue = "1"),
})
@GetMapping(value = "/green-problem-number")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = AreaGreenProblemAnalysisResult.class),
})
public JsonViewObject greenProblemNumber(String eventType) {
public JsonViewObject greenProblemNumber(String eventType,String timeType,String areaId) {
return JsonViewObject.newInstance().success(null);
}
......
signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/AnalysisProblemCrossDayController.java
View file @ 4b5539c8
......@@ -41,13 +41,14 @@ public class AnalysisProblemCrossDayController {
@ApiOperation(value = "单路口-问题数量总览", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@ApiImplicitParams({
@ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String", defaultValue = "")
@ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String", defaultValue = ""),
@ApiImplicitParam(name = "timeType", value = "事件类型 1：近一个月 2：近一周", required = true, dataType = "int", defaultValue = "1"),
})
@GetMapping(value = "/overview")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = AreaProblemOverview.class),
})
public JsonViewObject problemOverview(String crossId) {
public JsonViewObject problemOverview(String crossId,Integer timeType) {
return JsonViewObject.newInstance().success(null);
}
......@@ -55,13 +56,14 @@ public class AnalysisProblemCrossDayController {
@ApiOperation(value = "单路口-路口报警走势", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@ApiImplicitParams({
@ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String", defaultValue = "")
@ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String", defaultValue = ""),
@ApiImplicitParam(name = "timeType", value = "事件类型 1：近一个月 2：近一周", required = true, dataType = "int", defaultValue = "1"),
})
@GetMapping(value = "/trend")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = AreaProblemTrendAnalysisResult.class),
})
public JsonViewObject trend(String crossId) {
public JsonViewObject trend(String crossId,Integer timeType) {
return JsonViewObject.newInstance().success(null);
}
......@@ -70,13 +72,14 @@ public class AnalysisProblemCrossDayController {
@ApiOperation(value = "单路口-问题发生时段、方向、原因分析", response = JsonViewObject.class,
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@ApiImplicitParams({
@ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String", defaultValue = "")
@ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String", defaultValue = ""),
@ApiImplicitParam(name = "timeType", value = "事件类型 1：近一个月 2：近一周", required = true, dataType = "int", defaultValue = "1"),
})
@GetMapping(value = "/detail")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = CrossProblemTimeDirReasonResult.class),
})
public JsonViewObject detail(String crossId) {
public JsonViewObject detail(String crossId,String timeType) {
return JsonViewObject.newInstance().success(null);
}
......@@ -85,13 +88,14 @@ public class AnalysisProblemCrossDayController {
produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
@ApiImplicitParams({
@ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String", defaultValue = ""),
@ApiImplicitParam(name = "timeType", value = "事件类型 1：近一个月 2：近一周", required = true, dataType = "int", defaultValue = "1"),
@ApiImplicitParam(name = "eventType", value = "事件代码 701：空放 702：路口失衡，703：路口溢出 707：路口拥堵", required = true, dataType = "String", defaultValue = "")
})
@GetMapping(value = "/dir-trend")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = AreaProblemTrendAnalysisResult.class),
})
public JsonViewObject dirTrend(String crossId,String eventType) {
public JsonViewObject dirTrend(String crossId,String timeType,String eventType) {
return JsonViewObject.newInstance().success(null);
}
......
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