From 42239f79490e7130a63d51a67efd1f2c8d23be37 Mon Sep 17 00:00:00 2001 From: xyh <18782104331@139.com> Date: 星期五, 18 六月 2021 09:50:44 +0800 Subject: [PATCH] 平均耗时格式 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 232 insertions(+), 7 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 96d671a..ca755fe 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 @@ -2,10 +2,11 @@ import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.*; -import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.grid.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @@ -28,11 +29,11 @@ /** * 删除事件 - * @param eventDeleteDTO + * @param CommonEventDeleteDTO * @return 平台用户信息 */ @PostMapping("/event/delete") - R delete(@RequestBody EventDeleteDTO eventDeleteDTO); + R delete(@RequestBody CommonEventDeleteDTO CommonEventDeleteDTO); /** * 查询事件详细信息 @@ -497,19 +498,19 @@ /** * 处理事件 - * @param commonEventRepublicDTO + * @param commonEventRepublishDTO * @return */ @PostMapping("/event/republish") - R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO); + R republishEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO); /** * 网格数据待处理统计信息 * @param eventGridStatisticsDataDTO * @return */ - @PostMapping("/eventgriddata/getGridData") - R getGridData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO); + @PostMapping("/eventgriddata/getGridStatisticsdData") + R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO); /** * 查询用户网格 @@ -623,6 +624,15 @@ R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO); /** + * 分页查询宣传教育事件 + * @param pagePublicityEventDTO 请求参数 + * @return 结果 + */ + @PostMapping("/event/queryPublicityCommunity") + R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO); + + + /** * 分页查询社区列表 * @return 结果 */ @@ -667,4 +677,219 @@ */ @PostMapping("/eventgriddata/getGridTodoData") R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO); + + /** + * 后台获取网格员运动轨迹 + * @param workTrajectoryDTO 请求参数 + * @return 运动轨迹 + */ + @PostMapping("/map/gridMemberWorkTrajectory") + R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO); + + /** + * 后台获取网格员预警记录 + * @param gridMemberWainDTO 请求参数 + * @return 预警记录 + */ + @PostMapping("/map/gridMemberWorkWarning") + R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO); + + /** + * 分页查询网格 + * @param eventGridDataDTO 请求参数 + * @return 网格列表 + */ + @PostMapping("/eventgriddata/data/list") + R getGridDataList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO); + + /** + * 查询社区下所有网格员 + * @param communityId 社区id + * @return 网格员列表 + */ + @PostMapping("/eventgriddata/member/list") + R getGridMemberLists(@RequestParam("communityId") Long communityId); + + /** + * 查询管理事件 + * @param pageEventManageDTO + * @return + */ + @PostMapping("/event/manage/list") + R queryEventToManage(@RequestBody PageEventManageDTO pageEventManageDTO); + + /** + * 社区网格后台标记事件无效 + * @param eventRevokeDTO + * @return + */ + @PostMapping("/event/markInvalid") + R markEventInvalid(@RequestBody EventRevokeDTO eventRevokeDTO); + + /** + * 社区网格后台重新发布已标记无效的事件 + * @param commonEventRepublishDTO + * @return + */ + @PostMapping("/event/republishInvalid") + R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO); + + /** + * 后台新增网格 + * @param eventGridDataDTO 请求参数 + * @return 新增结果 + */ + @PostMapping("/eventgriddata/data/add") + R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO); + + /** + * 后台修改网格 + * @param eventGridDataDTO 请求参数 + * @return 修改结果 + */ + @PostMapping("/eventgriddata/data/edit") + R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO); + + /** + * 后台管理-分页查询随手拍列表 + * @param easyAppDTO 请求参数 + * @return 随手拍列表 + */ + @PostMapping("/easy/admin/list") + R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO); + + /** + * 后台管理-随手拍详情 + * @param easyId 随手拍id + * @return 随手拍详情 + */ + @PostMapping("/easy/admin/detail") + R easyDetailByAdmin(@RequestParam("easyId") Long easyId); + + /** + * 后台管理-随手拍处理 + * @param photoHandleDTO 请求参数 + * @return 处理结果 + */ + @PostMapping("/easy/admin/handle") + R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO); + + /** + * 后台管理-批量修改随手拍公示状态/删除随手拍 + * @param photoHandleDTO 请求参数 + * @return 修改/删除结果 + */ + @PostMapping("/easy/admin/publicity") + 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 统计信息 + */ + @GetMapping("/statistics/admin/eventStatistics") + R eventStatistics(@RequestParam("communityId") Long communityId); + + /** + * 后台管理-删除网格 + * @param Ids 网格id集合 + * @return 删除结果 + */ + @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(); } -- Gitblit v1.7.1