From 67b9a654ef3dc38366962e8ea867fc291dcdcdd0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 17:33:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java
index 83412b2..bf8ca4a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java
@@ -1,15 +1,15 @@
package com.panzhihua.grid_app.api;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.grid.GridEventStatisticsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComMapGridDetailVO;
+import com.panzhihua.common.model.vos.grid.GridEventStatisticsDetailVO;
+import com.panzhihua.common.model.vos.grid.GridEventStatisticsVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -21,13 +21,22 @@
@Resource
private GridService gridService;
- @ApiOperation(value = "根据网格id查询统计详情-lyq",response = ComMapGridDetailVO.class)
+ @ApiOperation(value = "根据网格id查询统计详情-lyq",response = GridEventStatisticsVO.class)
@PostMapping("event")
public R getGridDetail(@RequestParam("gridId") Long gridId){
if(gridId == null){
return R.fail("参数错误");
}
- return null;
+ return gridService.getGridEventStatisticsByApp(gridId);
+ }
+
+ @ApiOperation(value = "网格id查询统计事件详情-lyq",response = GridEventStatisticsDetailVO.class)
+ @PostMapping("event/detail")
+ public R getGridEventDetailStatistics(@RequestBody GridEventStatisticsDTO statisticsDTO){
+ if(statisticsDTO == null || statisticsDTO.getGridId() == null){
+ return R.fail("参数错误");
+ }
+ return gridService.getGridEventDetailStatisticsByApp(statisticsDTO);
}
--
Gitblit v1.7.1