From 07e29422c8559295bd6a5594e6f95f9e08d0bc95 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 31 三月 2022 17:07:48 +0800
Subject: [PATCH] 党建bug修改
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 bf8ca4a..2ee85bd 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,17 +1,19 @@
package com.panzhihua.grid_app.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
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 io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
@RestController
@RequestMapping("/statistics/")
@@ -21,23 +23,26 @@
@Resource
private GridService gridService;
- @ApiOperation(value = "根据网格id查询统计详情-lyq",response = GridEventStatisticsVO.class)
+ @ApiOperation(value = "根据网格id查询统计详情-lyq", response = GridEventStatisticsVO.class)
@PostMapping("event")
- public R getGridDetail(@RequestParam("gridId") Long gridId){
- if(gridId == null){
+ 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);
+ return gridService.getGridEventStatisticsByApp(gridId, loginUserInfo.getUserId());
}
- @ApiOperation(value = "网格id查询统计事件详情-lyq",response = GridEventStatisticsDetailVO.class)
+ @ApiOperation(value = "网格id查询统计事件详情-lyq", response = GridEventStatisticsDetailVO.class)
@PostMapping("event/detail")
- public R getGridEventDetailStatistics(@RequestBody GridEventStatisticsDTO statisticsDTO){
- if(statisticsDTO == null || statisticsDTO.getGridId() == null){
+ public R getGridEventDetailStatistics(@RequestBody GridEventStatisticsDTO statisticsDTO) {
+ if (statisticsDTO == null || statisticsDTO.getGridId() == null) {
return R.fail("参数错误");
}
return gridService.getGridEventDetailStatisticsByApp(statisticsDTO);
}
-
}
--
Gitblit v1.7.1