From c7c38dfd96047930999bcd7cf62d18d6d8651108 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 123 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 6 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 53bc686..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
@@ -2,7 +2,6 @@
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.*;
@@ -497,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);
/**
* 查询用户网格
@@ -659,4 +658,116 @@
*/
@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