From 8f173595405f004f94d8a7022884a8fa98540b20 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 10:40:24 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java
index f34fcad..1d6c92c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.grid.EventGridDataAreaVO;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -45,7 +46,7 @@
ClazzUtils.setIfStringIsEmpty(eventRevokeDTO);
LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
- eventRevokeDTO.setUserName(loginUserInfoVO.getName());
+ eventRevokeDTO.setUserName(loginUserInfoVO.getNickName());
return gridService.emergenciesRevoke(eventRevokeDTO);
}
@@ -62,14 +63,14 @@
/**
* 删除
- * @param eventDeleteDTO 删除事件传递对象
+ * @param eventDeleteSingleDTO 删除事件传递对象
* @return 删除结果
*/
@DeleteMapping()
@ApiOperation(value = "删除事件", response = R.class)
- R delete(@Validated @RequestBody EventDeleteDTO eventDeleteDTO){
- ClazzUtils.setIfStringIsEmpty(eventDeleteDTO);
- return gridService.delete(eventDeleteDTO);
+ R delete(@Validated @RequestBody EventDeleteSingleDTO eventDeleteSingleDTO){
+ ClazzUtils.setIfStringIsEmpty(eventDeleteSingleDTO);
+ return gridService.delete(eventDeleteSingleDTO);
}
/**
* 重新发布事件
@@ -82,7 +83,7 @@
ClazzUtils.setIfStringIsEmpty(commonEventRepublishDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventRepublishDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventRepublishDTO.setUserName(loginUserInfoVO.getName());
+ commonEventRepublishDTO.setUserName(loginUserInfoVO.getNickName());
return gridService.republishEvent(commonEventRepublishDTO);
}
@@ -98,7 +99,7 @@
ClazzUtils.setIfStringIsEmpty(commonEventPublicDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventPublicDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventPublicDTO.setUserName(loginUserInfoVO.getName());
+ commonEventPublicDTO.setUserName(loginUserInfoVO.getNickName());
return gridService.draftRelease(commonEventPublicDTO);
}
@@ -111,4 +112,16 @@
R actList(){
return gridService.actList();
}
+
+ /**
+ * 查询距离当前事件最近的网格数据
+ * @param pageEventGridNearbyDTO
+ * @return
+ */
+ @PostMapping("/grid/nearby")
+ @ApiOperation(value = "查询经纬度所在的网格", response = EventGridDataAreaVO.class)
+ R getNearByGrid(@Validated @RequestBody PageEventGridNearbyDTO pageEventGridNearbyDTO){
+ return gridService.getNearByGrid(pageEventGridNearbyDTO);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.7.1