From 98e440f566479fe07b0a6d0028e3df21843c86ee Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 17 六月 2021 17:21:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 f224067..ca755fe 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
@@ -29,11 +29,11 @@
/**
* 删除事件
- * @param eventDeleteDTO
+ * @param CommonEventDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/event/delete")
- R delete(@RequestBody EventDeleteDTO eventDeleteDTO);
+ R delete(@RequestBody CommonEventDeleteDTO CommonEventDeleteDTO);
/**
* 查询事件详细信息
@@ -877,4 +877,19 @@
*/
@PostMapping("/eventgridmembergpslog/add")
R gridReportPosition(@RequestBody GridMemberPositionDTO memberPositionDTO);
+
+ /**
+ * 直接上报社区
+ * @param commonEventDirectReportDTO
+ * @return
+ */
+ @PostMapping("/event/reportDirect")
+ R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO);
+
+ /**
+ * 定时任务扫描网格员工作状态
+ * @return 定时任务扫描结果
+ */
+ @PostMapping("/eventgridmemberwarnlog/judge")
+ R timedTaskGridMember();
}
--
Gitblit v1.7.1