From a0912fe376f382cf7056e9ff3bc87a607681c981 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 三月 2023 11:35:41 +0800
Subject: [PATCH] 驾驶舱接口优化
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 11 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 2d2ac7a..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
@@ -1,23 +1,32 @@
package com.ycl.controller.cockpit.statisticsEvents;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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;
-import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -31,6 +40,35 @@
public class StatisticsEventsController {
@Resource
private CheckApiUtil checkApiUtil;
+
+ private IVideoPointService videoPointService;
+
+ 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;
+ }
+
+ @Autowired
+ public void setVideoPointService(IVideoPointService videoPointService) {
+ this.videoPointService = videoPointService;
+ }
+
+ @Autowired
+ public void setOrgGridService(IOrgGridService orgGridService) {
+ this.orgGridService = orgGridService;
+ }
@ApiOperation(value = "鎵ф硶浜嬩欢")
@GetMapping("/law_enforcement_event")
@@ -118,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);
}
@@ -146,8 +188,57 @@
public CommonResult<StatisticsEventsVO.CityPanelVo> cityPanel(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- StatisticsEventsVO.CityPanelVo vo = new StatisticsEventsVO.CityPanelVo(92, 22, 12, 22, 34, 99, 9, 34, 6);
+ StatisticsEventsVO.CityPanelVo vo = new StatisticsEventsVO.CityPanelVo(92, true, 22, false, 12, true,
+ 22, false, 34, true, 99, false, 9, true,
+ 34, false, 6, true);
return CommonResult.success(vo);
}
+
+
+ @ApiOperation(value = "鐐逛綅")
+ @GetMapping("/video_point")
+ public CommonResult<List<VideoPointVo>> videoPoint(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
+ IPage<VideoPointVo> page = videoPointService.getList(null, null, 1, 500);
+ 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")
+ public CommonResult<List<TeamConstruction>> teamConstruction(@Validated CockpitVO params) {
+ 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);
+ }
+
+
+ @ApiOperation(value = "涓槦鎸囨暟浣撳緛")
+ @GetMapping("/team_index")
+ public CommonResult<List<TeamIndex>> teamIndex(@Validated CockpitVO params) {
+ checkApiUtil.cockpit(params);
+ LambdaQueryWrapper<TeamConstruction> queryWrapper = new LambdaQueryWrapper<TeamConstruction>().eq(TeamConstruction::getStatus, 1).eq(TeamConstruction::getIsDelete, 0);
+ List<TeamConstruction> list = teamConstructionService.list(queryWrapper);
+ List<TeamIndex> teamIndexList = BeanUtil.copyToList(list, TeamIndex.class);
+ teamIndexList.forEach(o -> {
+ o.setStepTimely(0.6);
+ o.setStepDelayed(0.3);
+ o.setStepOvertime(0.1);
+ o.setHandleTimely(0.6);
+ o.setHandleDelayed(0.2);
+ o.setHandleOvertime(0.1);
+ o.setNoHandle(0.1);
+ });
+ return CommonResult.success(teamIndexList);
+ }
}
--
Gitblit v1.8.0