From d3efb56e8f09a01717e397944ff70b62ef5fd69b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 09 七月 2021 15:26:28 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 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 3d5b689..549fe4b 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,13 +1,13 @@
package com.panzhihua.service_grid.api;
+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.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;
@@ -23,6 +23,12 @@
private EventService eventService;
@Resource
private EventGridDataService eventGridDataService;
+ @Resource
+ private EventGridMemberGpsLogService eventGridMemberGpsLogService;
+ @Resource
+ private EventGridMemberWarnLogService eventGridMemberWarnLogService;
+ @Resource
+ private EventGridMemberRelationService eventGridMemberRelationService;
/**
* 地图模块-根据网格id查询网格详细信息
@@ -34,4 +40,47 @@
return eventGridDataService.getMapGridDetail(gridId);
}
+ /**
+ * 根据网格员id查询今日轨迹
+ * @param userId 网格员id
+ * @return 网格员今日轨迹
+ */
+ @PostMapping("/getTrajectoryByApp")
+ public R getTrajectoryByApp(@RequestParam("userId") Long userId){
+ return eventGridMemberGpsLogService.getTrajectoryByApp(userId);
+ }
+
+ /**
+ * 根据网格员id查询关联网格列表
+ * @param userId 网格员id
+ * @return 网格列表
+ */
+ @PostMapping("getMapGridListByApp")
+ public R getMapGridListByApp(@RequestParam("userId") Long userId){
+ 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);
+ }
+
}
--
Gitblit v1.7.1