From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
index 330f40c..4c91fad 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
@@ -177,9 +177,9 @@
public CommonResult<StatisticsEventsVO.CityPanelVo> cityPanel(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- StatisticsEventsVO.CityPanelVo vo = new StatisticsEventsVO.CityPanelVo(92, true, 22, false, 12, true,
- 22, false, 34, true, 99, false, 9, true,
- 34, false, 6, true);
+ StatisticsEventsVO.CityPanelVo vo = new StatisticsEventsVO.CityPanelVo(7621, true, 0, false, 99.46, true,
+ 2, false, 0, true, 2743, false, 76, true,
+ 482, false, 1, true);
return CommonResult.success(vo);
}
@@ -189,7 +189,7 @@
@GetMapping("/video_point")
public CommonResult<List<VideoPointVo>> videoPoint(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- IPage<VideoPointVo> page = videoPointService.getList(null, null, 1, 500);
+ IPage<VideoPointVo> page = videoPointService.getList(null, null, null, 1, 500);
return CommonResult.success(page.getRecords());
}
--
Gitblit v1.8.0