From a683718557e1e706ffcd12ecf326397714ac9475 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 三月 2023 21:58:35 +0800
Subject: [PATCH] 驾驶舱接口
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 8413ef5..e8bf477 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
@@ -3,32 +3,29 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.entity.cockpitManage.TeamConstruction;
import com.ycl.entity.cockpitManage.TeamIndex;
-import com.ycl.entity.video.VideoPoint;
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;
/**
@@ -47,6 +44,8 @@
private ITeamConstructionService teamConstructionService;
+ private IOrgGridService orgGridService;
+
@Autowired
public void setTeamConstructionService(ITeamConstructionService teamConstructionService) {
this.teamConstructionService = teamConstructionService;
@@ -55,6 +54,11 @@
@Autowired
public void setVideoPointService(IVideoPointService videoPointService) {
this.videoPointService = videoPointService;
+ }
+
+ @Autowired
+ public void setOrgGridService(IOrgGridService orgGridService) {
+ this.orgGridService = orgGridService;
}
@ApiOperation(value = "鎵ф硶浜嬩欢")
@@ -187,6 +191,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")
@@ -194,7 +206,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