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/BigScreenApi.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
index 0315fcf..eb29161 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
@@ -1,14 +1,16 @@
package com.panzhihua.service_grid.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
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;
/**
* @ClasssName BigScreenApi
@@ -27,8 +29,10 @@
/**
* 事件大屏查询事件列表
- * @param eventListDTO 请求参数
- * @return 事件列表
+ *
+ * @param eventListDTO
+ * 请求参数
+ * @return 事件列表
*/
@PostMapping("/event/list")
public R eventList(@RequestBody ScreenEventListDTO eventListDTO) {
@@ -37,18 +41,22 @@
/**
* 工作大屏-事件播报数据统计
- * @param communityId 社区id
- * @return 事件播报数据统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 事件播报数据统计
*/
@GetMapping("/work/event")
- public R eventWork(@RequestParam("communityId")Long communityId) {
+ public R eventWork(@RequestParam("communityId") Long communityId) {
return eventService.eventWork(communityId);
}
/**
* 绘制多边形统计数据
- * @param eventListDTO 请求参数
- * @return 统计数据
+ *
+ * @param eventListDTO
+ * 请求参数
+ * @return 统计数据
*/
@PostMapping("/getCivilDrawList")
public R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO) {
@@ -57,8 +65,10 @@
/**
* 大屏-根据小区id查询小区统计人数
- * @param villageId 小区id
- * @return 小区统计数据
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区统计数据
*/
@GetMapping("/village/statistics")
public R civilVillageStatistics(@RequestParam("villageId") Long villageId) {
--
Gitblit v1.7.1