From 26e9429512245f4b441b55c3ce59c21a5ebb570f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 12:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/test_excel610' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 ca755fe..6fb4835 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
@@ -892,4 +892,43 @@
*/
@PostMapping("/eventgridmemberwarnlog/judge")
R timedTaskGridMember();
+
+ /**
+ * 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