From 14e9e46c441de408616f5ce500623ac1d3d93b5c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 24 六月 2021 13:55:18 +0800
Subject: [PATCH] Merge branch 'test_visit' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 172 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..bf2eca9 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,8 +1,13 @@
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.query.visit.EventTasksQuery;
+import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.grid.*;
+import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -29,11 +34,11 @@
/**
* 删除事件
- * @param eventDeleteDTO
+ * @param CommonEventDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/event/delete")
- R delete(@RequestBody EventDeleteDTO eventDeleteDTO);
+ R delete(@RequestBody CommonEventDeleteDTO CommonEventDeleteDTO);
/**
* 查询事件详细信息
@@ -885,4 +890,169 @@
*/
@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);
+
+ /**
+ * 特殊人群上报-社区人口数据列表
+ * @param specialPopulationDTO 请求参数
+ * @return 社区人口数据列表
+ */
+ @PostMapping("/event/special/population/list")
+ R specialPopulationList(@RequestBody PageEventSpecialPopulationDTO specialPopulationDTO);
+
+ /**
+ * 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);
+
+
+ /**
+ * 后台统计走访任务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/eventvisitingtasks/count")
+ R countVisit(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询走访记录
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/list")
+ R list(@RequestBody EventTasksQuery query);
+
+ /**
+ * 走访任务列表
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/taskList")
+ R taskList(@RequestBody EventTasksQuery query);
+
+ /**
+ * 导出
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/exportTaskList")
+ List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query);
+
+ /**
+ * 删除走访任务
+ * @param ids
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/delete")
+ R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 被走访人员列表
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/visitorList")
+ R visitorList(@RequestBody EventVisitListQuery query);
+
+
+
+ /**
+ * 走访详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/eventvisitingtasks/detail/{id}")
+ R detail(@PathVariable("id") Long id);
+
+
+ /**
+ * 撤销走访
+ * @param id
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/cancel/{id}")
+ R cancel(@PathVariable("id") Long id);
+
+ /**
+ * 恢复走访
+ * @param id
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/reset/{id}")
+ R reset(@PathVariable("id") Long id);
+
+ /**
+ * 新增走访
+ * @param ids
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/add")
+ R addVisitingTask(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 开始走访
+ * @param id
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/start")
+ R start(@RequestParam("id")Long id);
+
+ /**
+ * 完成走访记录
+ * @param taskCompleteDTO
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/complete")
+ R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO);
}
--
Gitblit v1.7.1