From f8466a8905261edc14c3d8015748a9a617d8fe3c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 11:10:13 +0800
Subject: [PATCH] 修改综治后台关联市平台网格员以及网格接口
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
index 38d08e3..d4deec9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
@@ -1,15 +1,14 @@
package com.panzhihua.service_grid.api;
+import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberWainDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberWorkTrajectoryDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.service_grid.service.EventGridDataService;
-import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
-import com.panzhihua.service_grid.service.EventGridMemberRelationService;
-import com.panzhihua.service_grid.service.EventService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_grid.service.*;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -27,6 +26,8 @@
private EventGridDataService eventGridDataService;
@Resource
private EventGridMemberGpsLogService eventGridMemberGpsLogService;
+ @Resource
+ private EventGridMemberWarnLogService eventGridMemberWarnLogService;
@Resource
private EventGridMemberRelationService eventGridMemberRelationService;
@@ -60,4 +61,37 @@
return eventGridMemberRelationService.getMapGridListByApp(userId);
}
+ /**
+ * 后台获取网格员运动轨迹
+ * @param workTrajectoryDTO 请求参数
+ * @return 运动轨迹
+ */
+ @PostMapping("gridMemberWorkTrajectory")
+ public R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO){
+ if(StringUtils.isEmpty(workTrajectoryDTO.getTime())){
+ workTrajectoryDTO.setTime(DateUtils.getCurrentDateStrymd());
+ }
+ return eventGridMemberGpsLogService.gridMemberWorkTrajectory(workTrajectoryDTO);
+ }
+
+ /**
+ * 后台获取网格员预警记录
+ * @param gridMemberWainDTO 请求参数
+ * @return 预警记录
+ */
+ @PostMapping("gridMemberWorkWarning")
+ public R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO){
+ return eventGridMemberWarnLogService.gridMemberWorkWarning(gridMemberWainDTO);
+ }
+
+ @PostMapping("getMapGridListsByApp")
+ public R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO){
+ return eventGridMemberRelationService.getMapGridListsByApp(cascadeListDTO);
+ }
+
+ @PostMapping("getMapGridsListsByApp")
+ public R getMapGridsListsByApp(@RequestParam("userId") Long userId){
+ return eventGridMemberRelationService.getMapGridsListsByApp(userId);
+ }
+
}
--
Gitblit v1.7.1