From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberGpsLogApi.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberGpsLogApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberGpsLogApi.java
index 32aa2d5..51ade0d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberGpsLogApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberGpsLogApi.java
@@ -1,8 +1,10 @@
package com.panzhihua.service_grid.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
@@ -11,10 +13,8 @@
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
/**
*
@@ -22,63 +22,70 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Slf4j
@RestController
@RequestMapping("/eventgridmembergpslog")
-public class EventGridMemberGpsLogApi{
+public class EventGridMemberGpsLogApi {
@Resource
private EventGridMemberGpsLogService eventGridMemberGpsLogService;
/**
* 新增网格员定时上报地理信息
- * @param memberPositionDTO 请求参数
+ *
+ * @param memberPositionDTO
+ * 请求参数
* @return 新增结果
*/
@PostMapping("/add")
- public R add(@RequestBody GridMemberPositionDTO memberPositionDTO){
+ public R add(@RequestBody GridMemberPositionDTO memberPositionDTO) {
return eventGridMemberGpsLogService.add(memberPositionDTO);
}
/**
* 修改网格员定时上报地理信息
+ *
* @param eventGridMemberGpsLogEditDTO
* @return 维护结果
*/
@PostMapping("/edit")
- R edit(@RequestBody EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO){
+ R edit(@RequestBody EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO) {
return eventGridMemberGpsLogService.edit(eventGridMemberGpsLogEditDTO);
- };
+ }
/**
* 分页查找网格员定时上报地理信息
+ *
* @param pageEventGridMemberGpsLogDTO
* @return 维护结果
*/
@PostMapping("/page")
- R<IPage<EventGridMemberGpsLogVO>> query(@RequestBody PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO){
+ R<IPage<EventGridMemberGpsLogVO>> query(@RequestBody PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO) {
return eventGridMemberGpsLogService.query(pageEventGridMemberGpsLogDTO);
- };
+ }
/**
* 删除网格员定时上报地理信息
+ *
* @param EventGridMemberGpsLogDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/delete")
- R delete(@RequestBody EventGridMemberGpsLogDeleteDTO EventGridMemberGpsLogDeleteDTO){
+ R delete(@RequestBody EventGridMemberGpsLogDeleteDTO EventGridMemberGpsLogDeleteDTO) {
return eventGridMemberGpsLogService.delete(EventGridMemberGpsLogDeleteDTO);
- };
+ }
/**
* 查询网格员定时上报地理信息详细信息
- * @param id 网格员定时上报地理信息 id
+ *
+ * @param id
+ * 网格员定时上报地理信息 id
* @return 查找结果
*/
@PostMapping("/{id}")
- R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id){
+ R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id) {
return eventGridMemberGpsLogService.eventGridMemberGpsLogDetails(id);
- };
+ }
}
--
Gitblit v1.7.1