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/CommonEventApi.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
index d646f8f..8194c38 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
@@ -39,7 +39,7 @@
if(eventType==null){
return false;
}
- boolean inType = eventType==1 | eventType==2 |eventType==3| eventType==4| eventType==5;
+ boolean inType = eventType==1 | eventType==2 |eventType==3| eventType==4| eventType==5| eventType==6;
return inType;
}
@@ -57,6 +57,7 @@
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
pageEventDTO.setUserId(loginUserInfoVO.getUserId());
+ pageEventDTO.setRevokeType(1);
return gridService.query(pageEventDTO);
}
@@ -149,6 +150,22 @@
}
+ /**
+ * 直接上报社区
+ * @param commonEventDirectReportDTO 上报社区传递对象
+ * @return 上报结果
+ */
+ @PostMapping("/reportDirect")
+ @ApiOperation(value = "直接上报社区", response = R.class)
+ R reportDirect(@Validated @RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO){
+ LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
+ ClazzUtils.setIfStringIsEmpty(commonEventDirectReportDTO);
+ commonEventDirectReportDTO.setUserId(loginUserInfoVO.getUserId());
+ commonEventDirectReportDTO.setUserName(loginUserInfoVO.getNickName());
+ commonEventDirectReportDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+ return gridService.reportDirect(commonEventDirectReportDTO);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.7.1