From a429d8ffa31825c7cca7e005bc9ce8f85c15f1f6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 21 六月 2021 13:26:11 +0800
Subject: [PATCH] 代码合并
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 20 ++++++++++++++++++--
1 files changed, 18 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 2e8c650..4cb1b8f 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
@@ -1,5 +1,6 @@
package com.panzhihua.common.service.grid;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.grid.*;
@@ -29,11 +30,11 @@
/**
* 删除事件
- * @param eventDeleteDTO
+ * @param CommonEventDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/event/delete")
- R delete(@RequestBody EventDeleteDTO eventDeleteDTO);
+ R delete(@RequestBody CommonEventDeleteDTO CommonEventDeleteDTO);
/**
* 查询事件详细信息
@@ -885,4 +886,19 @@
*/
@PostMapping("/event/reportDirect")
R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO);
+
+ /**
+ * 定时任务扫描网格员工作状态
+ * @return 定时任务扫描结果
+ */
+ @PostMapping("/eventgridmemberwarnlog/judge")
+ R timedTaskGridMember();
+
+ /**
+ * 事件大屏查询事件列表
+ * @param eventListDTO 请求参数
+ * @return 事件列表
+ */
+ @PostMapping("/screen/event/list")
+ R getScreenEventList(@RequestBody ScreenEventListDTO eventListDTO);
}
--
Gitblit v1.7.1