|
@@ -95,8 +95,8 @@ public class IndexController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("应用健康趋势-按月")
|
|
|
- @GetMapping("/hl/month/{date}")
|
|
|
- public AjaxResult hlMonth(@ApiParam(value = "时间 yyyy-mm", required = true) @PathVariable("date") Date date) {
|
|
|
+ @GetMapping("/hl/month")
|
|
|
+ public AjaxResult hlMonth(@ApiParam(value = "时间 yyyy-mm", required = true) Date date) {
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
HlScore search = new HlScore();
|
|
|
search.setHlType("2");
|
|
@@ -141,8 +141,8 @@ public class IndexController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("应用健康趋势-按年")
|
|
|
- @GetMapping("/hl/year/{date}")
|
|
|
- public AjaxResult hlYear(@ApiParam(value = "时间 yyyy", required = true) @PathVariable("date") String date) {
|
|
|
+ @GetMapping("/hl/year")
|
|
|
+ public AjaxResult hlYear(@ApiParam(value = "时间 yyyy", required = true) String date) {
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
String sql = "SELECT a.model_name,b.hy,b.hm,b.score from biz_model a,(SELECT model_id,year(hl_date) hy,month(hl_date) hm,AVG(ifnull(hl_score,100)) score" +
|
|
|
" FROM hl_score t WHERE hl_type=2 AND year(hl_date)=? GROUP BY model_id,hy,hm) b WHERE a.model_id=b.model_id order by hm";
|
|
@@ -177,8 +177,8 @@ public class IndexController extends BaseController {
|
|
|
|
|
|
|
|
|
@ApiOperation("应用健康趋势-按天")
|
|
|
- @GetMapping("/hl/day/{date}")
|
|
|
- public AjaxResult hlDay(@ApiParam(value = "时间(yyyy-mm-dd", required = true) @PathVariable("date") Date date) {
|
|
|
+ @GetMapping("/hl/day")
|
|
|
+ public AjaxResult hlDay(@ApiParam(value = "时间(yyyy-mm-dd", required = true) Date date) {
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
HlScore search = new HlScore();
|
|
|
search.setHlType("1");
|
|
@@ -352,8 +352,8 @@ public class IndexController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("重点指标运行趋势图")
|
|
|
- @GetMapping("/ms/trend/{objMetricsId}")
|
|
|
- public AjaxResult msChat(@PathVariable("objMetricsId") Long objMetricsId) {
|
|
|
+ @GetMapping("/ms/trend-d")
|
|
|
+ public AjaxResult msChat(Long id) {
|
|
|
List<Map<String, Object>> trendList = new ArrayList<>();
|
|
|
|
|
|
LocalDateTime endTime = LocalDateTime.now();
|
|
@@ -362,7 +362,7 @@ public class IndexController extends BaseController {
|
|
|
params.put("beginTime", beginTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
params.put("endTime", endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
BizObjMetricsData q = new BizObjMetricsData();
|
|
|
- q.setObjMetricsId(objMetricsId);
|
|
|
+ q.setObjMetricsId(id);
|
|
|
q.setParams(params);
|
|
|
List<BizObjMetricsData> list = dataService.selectBizObjMetricsDataList(q);
|
|
|
list.forEach(data -> {
|