From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 eea8939..e1b7131 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,16 +1,48 @@
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.LoginUserInfoVO;
+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 org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
@RestController
@RequestMapping("/statistics/")
@Api(tags = {"网格综治APP统计模块@lyq"})
public class StatisticsApi extends BaseController {
+ @Resource
+ private GridService gridService;
+ @ApiOperation(value = "根据网格id查询统计详情-lyq",response = GridEventStatisticsVO.class)
+ @PostMapping("event")
+ public R getGridDetail(@RequestParam("gridId") Long gridId){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if(loginUserInfo == null){
+ return R.fail("请先登录");
+ }
+ if(gridId == null){
+ return R.fail("参数错误");
+ }
+ return gridService.getGridEventStatisticsByApp(gridId,loginUserInfo.getUserId());
+ }
+
+ @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