From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 162 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 435b3b3..131f463 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);
/**
* 查询事件详细信息
@@ -624,6 +625,15 @@
R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
/**
+ * 分页查询宣传教育事件
+ * @param pagePublicityEventDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("/event/queryPublicityCommunity")
+ R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO);
+
+
+ /**
* 分页查询社区列表
* @return 结果
*/
@@ -774,6 +784,22 @@
R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);
/**
+ * 查询网格下所有网格员
+ * @param gridId
+ * @return
+ */
+ @PostMapping("/eventgriddata/grid/member")
+ R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId);
+
+ /**
+ * 查询网格下所有网格员
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eventgriddata/communitygrid")
+ R getGridDataListByCommunity(@RequestParam("gridId") Long communityId);
+
+ /**
* 后台管理-统计模块
* @param communityId 社区id
* @return 统计信息
@@ -788,4 +814,138 @@
*/
@PostMapping("/eventgriddata/data/delete")
R deleteGridData(@RequestBody List<Long> Ids);
+
+ /**
+ * 后台管理-网格员统计
+ * @param statisticsAdminDTO 请求参数
+ * @return 网格员统计信息
+ */
+ @PostMapping("/statistics/admin/gridMemberStatistics")
+ R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
+
+ /**
+ * 批量删除
+ * @param eventDeleteDTO
+ * @return
+ */
+ @PostMapping("/event/deleteEventBatch")
+ R deleteEventBatch(@RequestBody EventDeleteDTO eventDeleteDTO);
+
+ /**
+ * 批量发布事件
+ * @param commonEventBatchRepublishDTO
+ * @return
+ */
+ @PostMapping("/event/batchRepublishEvent")
+ R batchRepublishEvent(@RequestBody CommonEventBatchRepublishDTO commonEventBatchRepublishDTO);
+
+ /**
+ * 批量事件标为无效
+ * @param eventBatchRevokeDTO
+ * @return
+ */
+ @PostMapping("/event/batchMarkInvalid")
+ R batchMarkEventInvalid(@RequestBody EventBatchRevokeDTO eventBatchRevokeDTO);
+
+ /**
+ * 批量事件标为无效
+ * @param pageEventGridNearbyDTO
+ * @return
+ */
+ @PostMapping("/event/grid/nearby")
+ R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO);
+
+ /**
+ * 根据网格id查询网格统计数据
+ * @param gridId 网格id
+ * @return 网格统计数据
+ */
+ @PostMapping("/statistics/getGridEventStatistics")
+ R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId);
+
+ /**
+ * 查询网格事件统计数据
+ * @param statisticsDTO 请求参数
+ * @return 网格事件统计数据
+ */
+ @PostMapping("/statistics/event/getGridEventStatistics")
+ R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO);
+
+ /**
+ * 网格员上报地理位置
+ * @param memberPositionDTO 请求参数
+ * @return 上报结果
+ */
+ @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();
+
+ /**
+ * 事件大屏查询事件列表
+ * @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);
}
--
Gitblit v1.7.1