From 1fbdd1f48a5ec551a4c044d4babd95633e36d62e Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期四, 03 六月 2021 21:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index 7511707..a653755 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -16,21 +17,6 @@
@FeignClient(name = "grid")
public interface GridService {
- /**
- * 新增事件
- * @param eventAddDTO
- * @return 新增结果
- */
- @PostMapping("/event/add")
- R add(@RequestBody EventAddDTO eventAddDTO);
-
- /**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
- */
- @PostMapping("/event/edit")
- R edit(@RequestBody EventEditDTO eventEditDTO);
/**
* 分页查找事件
@@ -58,19 +44,19 @@
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
@PostMapping("/eventgridmemberrelation/add")
- R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
+ R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
@PostMapping("/eventgridmemberrelation/edit")
- R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
+ R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO);
/**
* 分页查找网格和网格员的关联关系
@@ -519,11 +505,11 @@
/**
* 网格数据待处理统计信息
- * @param pageEventGridDataDTO
+ * @param eventGridStatisticsDataDTO
* @return
*/
- @PostMapping("/eventgriddata/getGridData")
- R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
/**
* 查询用户网格
@@ -637,6 +623,13 @@
R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
/**
+ * 分页查询社区列表
+ * @return 结果
+ */
+ @PostMapping("/event/actList")
+ R actList();
+
+ /**
* 地图模块-根据网格id查询网格详细信息
* @param gridId 网格id
* @return 网格详细信息
@@ -659,4 +652,19 @@
*/
@PostMapping("/map/getMapGridListByApp")
R getMapGridListByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 获取最新版本信息
+ * @return 版本信息
+ */
+ @GetMapping("/eventapplicationapprelease/edition")
+ R editionUpdate();
+
+ /**
+ * 首页待处理
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridTodoData")
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO);
}
--
Gitblit v1.7.1