From f09fa3541ad18c00f30707f592f16d18a0537f77 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 17 八月 2021 21:54:51 +0800
Subject: [PATCH] [新增]添加监控依赖包
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 ea1482c..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);
}
@@ -74,7 +75,7 @@
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventAddDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventAddDTO.setUserName(loginUserInfoVO.getName());
+ commonEventAddDTO.setUserName(loginUserInfoVO.getNickName());
commonEventAddDTO.setPhone(loginUserInfoVO.getPhone());
return gridService.addCommon(commonEventAddDTO);
}
@@ -94,7 +95,7 @@
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventEditDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventEditDTO.setUserName(loginUserInfoVO.getName());
+ commonEventEditDTO.setUserName(loginUserInfoVO.getNickName());
commonEventEditDTO.setPhone(loginUserInfoVO.getPhone());
return gridService.saveDraft(commonEventEditDTO);
}
@@ -110,7 +111,8 @@
LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
ClazzUtils.setIfStringIsEmpty(commonEventReportDTO);
commonEventReportDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventReportDTO.setUserName(loginUserInfoVO.getName());
+ commonEventReportDTO.setUserName(loginUserInfoVO.getNickName());
+ commonEventReportDTO.setCommunityId(loginUserInfoVO.getCommunityId());
return gridService.report(commonEventReportDTO);
}
@@ -123,9 +125,12 @@
@ApiOperation(value = "处理事件", response = R.class)
R deal(@Validated @RequestBody CommonEventDealDTO commonEventDealDTO){
ClazzUtils.setIfStringIsEmpty(commonEventDealDTO);
- LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventDealDTO.setUserName(loginUserInfoVO.getName());
+ commonEventDealDTO.setUserName(loginUserInfoVO.getNickName());
+ commonEventDealDTO.setOperateType(0);
+ commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+ commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName());
return gridService.dealEvent(commonEventDealDTO);
}
@@ -140,11 +145,27 @@
ClazzUtils.setIfStringIsEmpty(commonEventVerifyDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventVerifyDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventVerifyDTO.setUserName(loginUserInfoVO.getName());
+ commonEventVerifyDTO.setUserName(loginUserInfoVO.getNickName());
return gridService.verifyEvent(commonEventVerifyDTO);
}
+ /**
+ * 直接上报社区
+ * @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