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/EventGridMemberWarnLogApi.java |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberWarnLogApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberWarnLogApi.java
index 83bfe68..4012fe7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberWarnLogApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberWarnLogApi.java
@@ -1,5 +1,8 @@
 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.EventGridMemberWarnLogAddDTO;
@@ -10,10 +13,8 @@
 import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO;
 import com.panzhihua.service_grid.service.EventGridMemberWarnLogService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  *
@@ -21,71 +22,78 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Slf4j
 @RestController
 @RequestMapping("/eventgridmemberwarnlog")
-public class EventGridMemberWarnLogApi{
+public class EventGridMemberWarnLogApi {
 
     @Resource
     private EventGridMemberWarnLogService eventGridMemberWarnLogService;
 
     /**
      * 新增网格员定时上报地理预警记录
+     * 
      * @param eventGridMemberWarnLogAddDTO
      * @return 新增结果
      */
     @PostMapping("/add")
-    R add(@RequestBody EventGridMemberWarnLogAddDTO eventGridMemberWarnLogAddDTO){
+    R add(@RequestBody EventGridMemberWarnLogAddDTO eventGridMemberWarnLogAddDTO) {
         return eventGridMemberWarnLogService.add(eventGridMemberWarnLogAddDTO);
-    };
+    }
 
     /**
      * 修改网格员定时上报地理预警记录
+     * 
      * @param eventGridMemberWarnLogEditDTO
      * @return 维护结果
      */
     @PostMapping("/edit")
-    R edit(@RequestBody EventGridMemberWarnLogEditDTO eventGridMemberWarnLogEditDTO){
+    R edit(@RequestBody EventGridMemberWarnLogEditDTO eventGridMemberWarnLogEditDTO) {
         return eventGridMemberWarnLogService.edit(eventGridMemberWarnLogEditDTO);
-    };
+    }
 
     /**
      * 分页查找网格员定时上报地理预警记录
+     * 
      * @param pageEventGridMemberWarnLogDTO
      * @return 维护结果
      */
     @PostMapping("/page")
-    R<IPage<EventGridMemberWarnLogVO>> query(@RequestBody PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO){
+    R<IPage<EventGridMemberWarnLogVO>> query(@RequestBody PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO) {
         return eventGridMemberWarnLogService.query(pageEventGridMemberWarnLogDTO);
-    };
+    }
 
     /**
      * 删除网格员定时上报地理预警记录
+     * 
      * @param EventGridMemberWarnLogDeleteDTO
      * @return 平台用户信息
      */
     @PostMapping("/delete")
-    R delete(@RequestBody EventGridMemberWarnLogDeleteDTO EventGridMemberWarnLogDeleteDTO){
+    R delete(@RequestBody EventGridMemberWarnLogDeleteDTO EventGridMemberWarnLogDeleteDTO) {
         return eventGridMemberWarnLogService.delete(EventGridMemberWarnLogDeleteDTO);
-    };
+    }
 
     /**
      * 查询网格员定时上报地理预警记录详细信息
-     * @param id 网格员定时上报地理预警记录 id
+     * 
+     * @param id
+     *            网格员定时上报地理预警记录 id
      * @return 查找结果
      */
     @PostMapping("/{id}")
-    R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(@PathVariable("id") Long id){
+    R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(@PathVariable("id") Long id) {
         return eventGridMemberWarnLogService.eventGridMemberWarnLogDetails(id);
-    };
+    }
 
     /**
      * 定时任务扫描网格员工作状态
-     * @return  定时任务扫描结果
+     * 
+     * @return 定时任务扫描结果
      */
     @PostMapping("/judge")
-    public R timedTaskGridMember(){
+    public R timedTaskGridMember() {
         return eventGridMemberWarnLogService.timedTaskGridMember();
     }
 

--
Gitblit v1.7.1