From c62d25bf9cf51d7421035abd6489945e77db1f04 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 04 六月 2021 18:29:18 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 159 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 135 insertions(+), 24 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..d4a6152 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
@@ -16,21 +16,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 +43,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);
/**
* 分页查找网格和网格员的关联关系
@@ -511,19 +496,19 @@
/**
* 处理事件
- * @param commonEventRepublicDTO
+ * @param commonEventRepublishDTO
* @return
*/
@PostMapping("/event/republish")
- R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO);
+ R republishEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);
/**
* 网格数据待处理统计信息
- * @param pageEventGridDataDTO
+ * @param eventGridStatisticsDataDTO
* @return
*/
- @PostMapping("/eventgriddata/getGridData")
- R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
/**
* 查询用户网格
@@ -637,6 +622,13 @@
R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
/**
+ * 分页查询社区列表
+ * @return 结果
+ */
+ @PostMapping("/event/actList")
+ R actList();
+
+ /**
* 地图模块-根据网格id查询网格详细信息
* @param gridId 网格id
* @return 网格详细信息
@@ -659,4 +651,123 @@
*/
@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);
+
+ /**
+ * 后台获取网格员运动轨迹
+ * @param workTrajectoryDTO 请求参数
+ * @return 运动轨迹
+ */
+ @PostMapping("/map/gridMemberWorkTrajectory")
+ R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
+
+ /**
+ * 后台获取网格员预警记录
+ * @param gridMemberWainDTO 请求参数
+ * @return 预警记录
+ */
+ @PostMapping("/map/gridMemberWorkWarning")
+ R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO);
+
+ /**
+ * 分页查询网格
+ * @param eventGridDataDTO 请求参数
+ * @return 网格列表
+ */
+ @PostMapping("/eventgriddata/data/list")
+ R getGridDataList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO);
+
+ /**
+ * 查询社区下所有网格员
+ * @param communityId 社区id
+ * @return 网格员列表
+ */
+ @PostMapping("/eventgriddata/member/list")
+ R getGridMemberLists(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询管理事件
+ * @param pageEventManageDTO
+ * @return
+ */
+ @PostMapping("/event/manage/list")
+ R queryEventToManage(@RequestBody PageEventManageDTO pageEventManageDTO);
+
+ /**
+ * 社区网格后台标记事件无效
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/event/markInvalid")
+ R markEventInvalid(@RequestBody EventRevokeDTO eventRevokeDTO);
+
+ /**
+ * 社区网格后台重新发布已标记无效的事件
+ * @param commonEventRepublishDTO
+ * @return
+ */
+ @PostMapping("/event/republishInvalid")
+ R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);
+
+ /**
+ * 后台新增网格
+ * @param eventGridDataDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/eventgriddata/data/add")
+ R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台修改网格
+ * @param eventGridDataDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/eventgriddata/data/edit")
+ R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台管理-分页查询随手拍列表
+ * @param easyAppDTO 请求参数
+ * @return 随手拍列表
+ */
+ @PostMapping("/easy/admin/list")
+ R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO);
+
+ /**
+ * 后台管理-随手拍详情
+ * @param easyId 随手拍id
+ * @return 随手拍详情
+ */
+ @PostMapping("/easy/admin/detail")
+ R easyDetailByAdmin(@RequestParam("easyId") Long easyId);
+
+ /**
+ * 后台管理-随手拍处理
+ * @param photoHandleDTO 请求参数
+ * @return 处理结果
+ */
+ @PostMapping("/easy/admin/handle")
+ R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+ /**
+ * 后台管理-批量修改随手拍公示状态/删除随手拍
+ * @param photoHandleDTO 请求参数
+ * @return 修改/删除结果
+ */
+ @PostMapping("/easy/admin/publicity")
+ R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);
}
--
Gitblit v1.7.1