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 | 198 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 179 insertions(+), 19 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 9f93471..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);
/**
* 分页查找网格和网格员的关联关系
@@ -462,6 +448,110 @@
R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id);
/**
+ * 添加事件
+ * @param commonEventAddDTO
+ * @return
+ */
+ @PostMapping("/event/addCommon")
+ R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO);
+
+ /**
+ * 保存事件草稿
+ * @param commonEventEditDTO
+ * @return
+ */
+ @PostMapping("/event/saveDraft")
+ R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO);
+
+ /**
+ * 突发事件上报社区
+ * @param commonEventReportDTO
+ * @return
+ */
+ @PostMapping("/event/report")
+ R report(@RequestBody CommonEventReportDTO commonEventReportDTO);
+
+ /**
+ * 突发事件撤销
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/event/emergenciesRevoke")
+ R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO);
+
+ /**
+ * 处理事件
+ * @param commonEventDealDTO
+ * @return
+ */
+ @PostMapping("/event/dealEvent")
+ R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO);
+
+ /**
+ * 处理事件
+ * @param commonEventVerifyDTO
+ * @return
+ */
+ @PostMapping("/event/verify")
+ R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO);
+
+ /**
+ * 处理事件
+ * @param commonEventRepublicDTO
+ * @return
+ */
+ @PostMapping("/event/republish")
+ R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO);
+
+ /**
+ * 网格数据待处理统计信息
+ * @param eventGridStatisticsDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
+
+ /**
+ * 查询用户网格
+ * @param pageEventGridDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/userGrid")
+ R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+
+ /**
+ * 特殊人员信息上报
+ * @param specialEventAddDTO
+ * @return
+ */
+ @PostMapping("/event/addSpecial")
+ R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO);
+
+ /**
+ * 获取指定特殊人员信息
+ * @param idCard
+ * @return
+ */
+ @PostMapping("/event/getSpecialPopulation")
+ R getSpecialPopulation(String idCard);
+
+ /**
+ * 保存殊人群事件上报草稿
+ * @param specialEventEditDTO
+ * @return
+ */
+ @PostMapping("/event/saveSpecialDraft")
+ R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO);
+
+ /**
+ * 草稿发布
+ * @param commonEventPublicDTO
+ * @return
+ */
+ @PostMapping("/event/draftRelease")
+ R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);
+
+ /**
* 查询随手拍列表
* @param easyAppDTO 请求参数
* @return 随手拍列表
@@ -507,4 +597,74 @@
*/
@PostMapping("/easy/report")
R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+ /**
+ * 添加发布宣传教育事件
+ * @param publicityEventAddDTO 请求参数
+ * @return 添加发布结果
+ */
+ @PostMapping("/event/addPublicity")
+ R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO);
+
+ /**
+ * 保存宣传教育事件草稿
+ * @param publicityEventEditDTO 请求参数
+ * @return 保存结果
+ */
+ @PostMapping("/event/savePublicityDraft")
+ R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO);
+
+ /**
+ * 分页查询宣传教育事件
+ * @param pagePublicityEventDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("/event/queryPublicity")
+ R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
+
+ /**
+ * 分页查询社区列表
+ * @return 结果
+ */
+ @PostMapping("/event/actList")
+ R actList();
+
+ /**
+ * 地图模块-根据网格id查询网格详细信息
+ * @param gridId 网格id
+ * @return 网格详细信息
+ */
+ @PostMapping("/map/getGridDetail")
+ R getGridDetail(@RequestParam("gridId") Long gridId);
+
+ /**
+ * 地图模块-根据网格员id查询今日运动轨迹
+ * @param userId 网格员id
+ * @return 运动轨迹
+ */
+ @PostMapping("/map/getTrajectoryByApp")
+ R getTrajectoryByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 地图模块-根据网格员id查询关联网格列表
+ * @param userId 网格员id
+ * @return 网格列表
+ */
+ @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