From 2b322522e7b801377cdba46c66a1c4ae61f56be0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:38:31 +0800
Subject: [PATCH] Merge branch 'test_wangge_two' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 b29a28a..92eb4b4 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,8 @@
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.model.vos.grid.EventSpecialPopulationVO;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -46,6 +48,8 @@
LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
eventRevokeDTO.setUserName(loginUserInfoVO.getNickName());
+ eventRevokeDTO.setRevokeType(1);
+ eventRevokeDTO.setRevokeId(loginUserInfoVO.getUserId());
return gridService.emergenciesRevoke(eventRevokeDTO);
}
@@ -62,14 +66,14 @@
/**
* 删除
- * @param eventDeleteDTO 删除事件传递对象
+ * @param commonEventDeleteDTO 删除事件传递对象
* @return 删除结果
*/
@DeleteMapping()
@ApiOperation(value = "删除事件", response = R.class)
- R delete(@Validated @RequestBody EventDeleteDTO eventDeleteDTO){
- ClazzUtils.setIfStringIsEmpty(eventDeleteDTO);
- return gridService.delete(eventDeleteDTO);
+ R delete(@Validated @RequestBody CommonEventDeleteDTO commonEventDeleteDTO){
+ ClazzUtils.setIfStringIsEmpty(commonEventDeleteDTO);
+ return gridService.delete(commonEventDeleteDTO);
}
/**
* 重新发布事件
@@ -111,4 +115,25 @@
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);
+ }
+
+ @ApiOperation(value = "查询社区特殊人群列表", response = EventSpecialPopulationVO.class)
+ @PostMapping("/special/population/list")
+ public R specialPopulationList(@RequestBody PageEventSpecialPopulationDTO specialPopulationDTO){
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ specialPopulationDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+ return gridService.specialPopulationList(specialPopulationDTO);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.7.1