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/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java | 74 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 32 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 8194c38..4729f3d 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
@@ -1,23 +1,21 @@
package com.panzhihua.grid_app.api;
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.ClazzUtils;
-import com.panzhihua.common.utlis.IdCardUtil;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
/**
*
@@ -25,7 +23,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Slf4j
@RestController
@RequestMapping("/event/common")
@@ -35,24 +33,27 @@
@Resource
private GridService gridService;
- private boolean isCommonType(Integer eventType){
- if(eventType==null){
+ private boolean isCommonType(Integer eventType) {
+ if (eventType == null) {
return false;
}
- boolean inType = eventType==1 | eventType==2 |eventType==3| eventType==4| eventType==5| eventType==6;
+ boolean inType =
+ eventType == 1 | eventType == 2 | eventType == 3 | eventType == 4 | eventType == 5 | eventType == 6;
return inType;
}
/**
* 事件列表
- * @param pageEventDTO 查找事件
+ *
+ * @param pageEventDTO
+ * 查找事件
* @return 查找结果
*/
@GetMapping("/usersList")
- @ApiOperation(value = "事件列表", response= EventVO.class)
- R usersList(@Validated @ModelAttribute PageEventDTO pageEventDTO){
+ @ApiOperation(value = "事件列表", response = EventVO.class)
+ R usersList(@Validated @ModelAttribute PageEventDTO pageEventDTO) {
ClazzUtils.setIfStringIsEmpty(pageEventDTO);
- if(!isCommonType(pageEventDTO.getEventType())){
+ if (!isCommonType(pageEventDTO.getEventType())) {
return R.fail(400, "事件类型错误");
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
@@ -63,14 +64,16 @@
/**
* 新增并发布事件事件
- * @param commonEventAddDTO 添加事件传递对象
+ *
+ * @param commonEventAddDTO
+ * 添加事件传递对象
* @return 新增结果
*/
@PostMapping("/release")
@ApiOperation(value = "新增并发布事件", response = R.class)
- R add(@Validated @RequestBody CommonEventAddDTO commonEventAddDTO){
+ R add(@Validated @RequestBody CommonEventAddDTO commonEventAddDTO) {
ClazzUtils.setIfStringIsEmpty(commonEventAddDTO);
- if(!isCommonType(commonEventAddDTO.getEventType())){
+ if (!isCommonType(commonEventAddDTO.getEventType())) {
return R.fail(400, "事件类型错误");
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
@@ -82,15 +85,17 @@
/**
* 保存草稿
- * @param commonEventEditDTO 保存草稿传递对象
+ *
+ * @param commonEventEditDTO
+ * 保存草稿传递对象
* @return 新增结果
*/
@PostMapping("/draft")
@ApiOperation(value = "保存草稿", response = R.class)
- R saveDraft(@Validated @RequestBody CommonEventEditDTO commonEventEditDTO){
+ R saveDraft(@Validated @RequestBody CommonEventEditDTO commonEventEditDTO) {
ClazzUtils.setIfStringIsEmpty(commonEventEditDTO);
ClazzUtils.setIfStringIsEmpty(commonEventEditDTO);
- if(!isCommonType(commonEventEditDTO.getEventType())){
+ if (!isCommonType(commonEventEditDTO.getEventType())) {
return R.fail(400, "事件类型错误");
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
@@ -102,12 +107,14 @@
/**
* 上报社区
- * @param commonEventReportDTO 上报社区传递对象
+ *
+ * @param commonEventReportDTO
+ * 上报社区传递对象
* @return 上报结果
*/
@PutMapping("/report")
@ApiOperation(value = "上报社区", response = R.class)
- R report(@Validated @RequestBody CommonEventReportDTO commonEventReportDTO){
+ R report(@Validated @RequestBody CommonEventReportDTO commonEventReportDTO) {
LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
ClazzUtils.setIfStringIsEmpty(commonEventReportDTO);
commonEventReportDTO.setUserId(loginUserInfoVO.getUserId());
@@ -118,12 +125,14 @@
/**
* 处理事件
- * @param commonEventDealDTO 修改事件传递对象
+ *
+ * @param commonEventDealDTO
+ * 修改事件传递对象
* @return 处理结果
*/
@PutMapping("/deal")
@ApiOperation(value = "处理事件", response = R.class)
- R deal(@Validated @RequestBody CommonEventDealDTO commonEventDealDTO){
+ R deal(@Validated @RequestBody CommonEventDealDTO commonEventDealDTO) {
ClazzUtils.setIfStringIsEmpty(commonEventDealDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
@@ -136,12 +145,14 @@
/**
* 验证事件
- * @param commonEventVerifyDTO 验证事件传递对象
+ *
+ * @param commonEventVerifyDTO
+ * 验证事件传递对象
* @return 验证结果
*/
@PutMapping("/verify")
@ApiOperation(value = "验证事件", response = R.class)
- R verify(@Validated @RequestBody CommonEventVerifyDTO commonEventVerifyDTO){
+ R verify(@Validated @RequestBody CommonEventVerifyDTO commonEventVerifyDTO) {
ClazzUtils.setIfStringIsEmpty(commonEventVerifyDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventVerifyDTO.setUserId(loginUserInfoVO.getUserId());
@@ -149,15 +160,16 @@
return gridService.verifyEvent(commonEventVerifyDTO);
}
-
/**
* 直接上报社区
- * @param commonEventDirectReportDTO 上报社区传递对象
+ *
+ * @param commonEventDirectReportDTO
+ * 上报社区传递对象
* @return 上报结果
*/
@PostMapping("/reportDirect")
@ApiOperation(value = "直接上报社区", response = R.class)
- R reportDirect(@Validated @RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO){
+ R reportDirect(@Validated @RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO) {
LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
ClazzUtils.setIfStringIsEmpty(commonEventDirectReportDTO);
commonEventDirectReportDTO.setUserId(loginUserInfoVO.getUserId());
@@ -165,7 +177,5 @@
commonEventDirectReportDTO.setCommunityId(loginUserInfoVO.getCommunityId());
return gridService.reportDirect(commonEventDirectReportDTO);
}
-
-
}
\ No newline at end of file
--
Gitblit v1.7.1