From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java
index 70a9501..a0e23eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java
@@ -1,13 +1,15 @@
package com.panzhihua.service_grid.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.dtos.grid.GridEventStatisticsDTO;
import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.EventService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -19,51 +21,61 @@
/**
* 后台管理-统计模块
- * @param communityId 社区id
- * @return 统计信息
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计信息
*/
@GetMapping("/admin/eventStatistics")
- public R eventStatistics(@RequestParam("communityId") Long communityId){
+ public R eventStatistics(@RequestParam("communityId") Long communityId) {
return eventService.eventStatistics(communityId);
}
/**
* 后台管理-网格员统计
- * @param statisticsAdminDTO 请求参数
- * @return 网格员统计信息
+ *
+ * @param statisticsAdminDTO
+ * 请求参数
+ * @return 网格员统计信息
*/
@PostMapping("/admin/gridMemberStatistics")
- public R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO){
+ public R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO) {
return eventService.gridMemberStatistics(statisticsAdminDTO);
}
/**
* 根据网格id查询网格统计数据
- * @param gridId 网格id
- * @return 网格统计数据
+ *
+ * @param gridId
+ * 网格id
+ * @return 网格统计数据
*/
@PostMapping("/getGridEventStatistics")
- public R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId,@RequestParam("userId") Long userId){
- return eventService.getGridEventStatisticsByApp(gridId,userId);
+ public R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId, @RequestParam("userId") Long userId) {
+ return eventService.getGridEventStatisticsByApp(gridId, userId);
}
/**
* 查询网格事件统计数据
- * @param statisticsDTO 请求参数
- * @return 网格事件统计数据
+ *
+ * @param statisticsDTO
+ * 请求参数
+ * @return 网格事件统计数据
*/
@PostMapping("/event/getGridEventStatistics")
- public R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO){
+ public R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO) {
return eventService.getGridEventDetailStatisticsByApp(statisticsDTO);
}
/**
* 查询所有网格员工作汇总数据
- * @param statisticsAdminDTO 请求参数
- * @return 网格员工作汇总数据
+ *
+ * @param statisticsAdminDTO
+ * 请求参数
+ * @return 网格员工作汇总数据
*/
@PostMapping("/admin/gridMemberStatisticsAll")
- public R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO){
+ public R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO) {
return eventService.gridMemberStatisticsAll(statisticsAdminDTO);
}
}
--
Gitblit v1.7.1