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_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
index 866d25f..2fb96f6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -1,13 +1,15 @@
package com.panzhihua.service_community.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -19,8 +21,10 @@
/**
* 首页大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
*/
@GetMapping("/getScreenIndex")
public R index(@RequestParam("communityId") Long communityId) {
@@ -29,8 +33,10 @@
/**
* 事件大屏统计接口
- * @param screenEventDTO 请求参数
- * @return 统计结果
+ *
+ * @param screenEventDTO
+ * 请求参数
+ * @return 统计结果
*/
@PostMapping("/getScreenEvent")
public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
@@ -39,8 +45,10 @@
/**
* 民生大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
*/
@GetMapping("/getScreenCivil")
public R civil(@RequestParam("communityId") Long communityId) {
@@ -50,7 +58,8 @@
/**
* 获取社区网格
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 网格数据
*/
@GetMapping("/getScreenGirds")
@@ -61,13 +70,13 @@
/**
* 事件大屏查询事件详情
*
- * @param eventDetailDTO 请求参数
+ * @param eventDetailDTO
+ * 请求参数
* @return 事件详情
*/
@PostMapping("/getScreenEventDetail")
public R eventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO) {
return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO));
}
-
}
--
Gitblit v1.7.1