From 0879050c6f47cf61488848d2bdb882ec33bf341d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:46:52 +0800
Subject: [PATCH] 代码优化
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 e31be53..4f247dc 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
@@ -6,10 +6,13 @@
import com.ycl.api.CommonResult;
import com.ycl.entity.cockpitManage.TeamConstruction;
import com.ycl.entity.cockpitManage.TeamIndex;
+import com.ycl.service.apidata.IApiDataService;
import com.ycl.service.cockpitManage.ITeamConstructionService;
+import com.ycl.service.equipment.IOrgGridService;
import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.util.CheckApiUtil;
import com.ycl.vo.cockpit.CockpitVO;
+import com.ycl.vo.cockpit.statisticsEvents.GridMapVO;
import com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO;
import com.ycl.vo.equipment.VideoPointVo;
import io.swagger.annotations.Api;
@@ -42,6 +45,16 @@
private ITeamConstructionService teamConstructionService;
+ private IOrgGridService orgGridService;
+
+
+ private IApiDataService iApiDataService;
+
+ @Autowired
+ public void setIApiDataService(IApiDataService apiDataService){
+ this.iApiDataService = apiDataService;
+ }
+
@Autowired
public void setTeamConstructionService(ITeamConstructionService teamConstructionService) {
this.teamConstructionService = teamConstructionService;
@@ -50,6 +63,11 @@
@Autowired
public void setVideoPointService(IVideoPointService videoPointService) {
this.videoPointService = videoPointService;
+ }
+
+ @Autowired
+ public void setOrgGridService(IOrgGridService orgGridService) {
+ this.orgGridService = orgGridService;
}
@ApiOperation(value = "鎵ф硶浜嬩欢")
@@ -138,13 +156,17 @@
@ApiOperation(value = "top10")
@GetMapping("/top10")
public CommonResult<List<StatisticsEventsVO.Top10VO>> top10(@Validated CockpitVO params) {
- checkApiUtil.cockpit(params);
- List<StatisticsEventsVO.Top10VO> ls = new ArrayList<>();
- ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 100.0));
- ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 90.0));
- ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 80.0));
- ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 70.0));
- return CommonResult.success(ls);
+// checkApiUtil.cockpit(params);
+// List<StatisticsEventsVO.Top10VO> ls = new ArrayList<>();
+// ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 100.0));
+// ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 90.0));
+// ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 80.0));
+// ls.add(new StatisticsEventsVO.Top10VO("xx涓槦", 70.0));
+// return CommonResult.success(ls);
+ String beginTime = params.getBeginTime();
+ String endTime = params.getEndTime();
+ List<StatisticsEventsVO.Top10VO> res = iApiDataService.listTop10(beginTime, endTime);
+ return CommonResult.success(res);
}
@@ -182,6 +204,14 @@
return CommonResult.success(page.getRecords());
}
+ @ApiOperation(value = "缃戞牸鍦板浘")
+ @GetMapping("/grid_map")
+ public CommonResult<List<GridMapVO>> gridMap(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
+
+ List<GridMapVO> list = orgGridService.statisticsGridMap(params.getBeginTime(), params.getEndTime());
+ return CommonResult.success(list);
+ }
@ApiOperation(value = "闃熶紞寤鸿")
@GetMapping("/team_construction")
@@ -189,7 +219,6 @@
checkApiUtil.cockpit(params);
LambdaQueryWrapper<TeamConstruction> queryWrapper = new LambdaQueryWrapper<TeamConstruction>().eq(TeamConstruction::getStatus, 1).eq(TeamConstruction::getIsDelete, 0);
List<TeamConstruction> list = teamConstructionService.list(queryWrapper);
-
return CommonResult.success(list);
}
--
Gitblit v1.8.0