From b3a71b956769b72b46976516dbbda69e30fa0bbf Mon Sep 17 00:00:00 2001
From: hhhyyq <hhhyyq@163.com>
Date: 星期四, 18 三月 2021 02:12:02 +0800
Subject: [PATCH] 房屋租售
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index ebd48ac..54fc5ab 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
@@ -47,6 +48,8 @@
private CommunityService communityService;
@Resource
private PartyBuildingService partyBuildingService;
+ @Resource
+ private CheckService checkService;
@ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
@GetMapping("info")
@@ -56,6 +59,7 @@
Long userId = loginUserInfo.getUserId();
Long areaId = loginUserInfo.getAreaId();
R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
+ String phone = loginUserInfo.getPhone();
if (R.isOk(r)) {
Object data = r.getData();
if (!ObjectUtils.isEmpty(data)) {
@@ -214,7 +218,8 @@
comActActivityVOS=collect;
}
if (!ObjectUtils.isEmpty(comActActivityVOS)) {
-// comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
+ List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
+ return R.ok(collect);
}
return R.ok(comActActivityVOS);
}
@@ -277,6 +282,11 @@
@ApiOperation(value = "意见反馈" )
@PostMapping("feedback")
public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
+ // 微信内容审核
+ String msg = sysUserFeedbackDTO.getContent();
+ if (!checkService.checkMessage(msg)) {
+ return R.fail("内容违规");
+ }
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
--
Gitblit v1.7.1