From 09188b70a64cea8de763c9ab7fe9c2f36c39db01 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 05 六月 2021 14:03:46 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
index 322b251..ddb1c88 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -87,7 +84,7 @@
* @return 网格列表
*/
@PostMapping("/data/list")
- public R getGridMemberList(@RequestBody PageEventGridDataDTO eventGridDataDTO){
+ public R getGridMemberList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO){
return eventGridDataService.getGridMemberList(eventGridDataDTO);
}
@@ -101,4 +98,43 @@
return eventGridDataService.getGridMemberLists(communityId);
}
+ /**
+ * 首页待处理
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ @PostMapping("/getGridTodoData")
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO){
+ return eventGridDataService.getGridTodoData(eventGridTodoDataDTO);
+ }
+
+ /**
+ * 网格数据待处理统计信息
+ * @param eventGridStatisticsDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO){
+ return R.ok();
+ }
+
+ /**
+ * 后台新增网格
+ * @param eventGridDataDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/data/add")
+ public R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO){
+ return eventGridDataService.addGridDataByAdmin(eventGridDataDTO);
+ }
+
+ /**
+ * 后台修改网格
+ * @param eventGridDataDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/data/edit")
+ public R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO){
+ return eventGridDataService.editGridDataByAdmin(eventGridDataDTO);
+ }
}
--
Gitblit v1.7.1