From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 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..fad63b8 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,58 @@
*/
@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);
+
+ /**
+ * description 根据本地网格ID，查询对于的浪潮市平台对应的ID
+ *
+ * @param id 本地网格ID
+ * @return String 浪潮市平台对应的ID
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/lc_compare/{id}")
+ String getLcGridIdByLocal(@PathVariable("id") Long id);
+ /**
+ * description 根据本地网格ID，查询对于的浪潮市平台对应的ID
+ *
+ * @param localUserId 本地网格员ID
+ * @return String 浪潮市平台对应的ID
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/lc_compare/getLcUserId")
+ String getLcUserIdByLocalUserId(@RequestParam("localUserId") String localUserId);
+ /**
+ * description 获取所有未上传到浪潮平台的事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/event/getUnUploadEvent")
+ List<EventDetailsVO> getUnUploadEvent();
+ /**
+ * description 更新上传是否成功标识
+ * @param id 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/event/updateLcUploadFlag")
+ Boolean updateLcUploadFlag(@RequestParam("id")Long id);
}
--
Gitblit v1.7.1