From ed9e98f6b71bf662c045fd8e24d6ac254f624051 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 15 七月 2024 13:28:58 +0800
Subject: [PATCH] 花城 【小程序】后台添加了组织社区共建内容，但小程序端没有显示内容
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 139 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 127 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index 9194887..22304f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -26,6 +26,7 @@
import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.Api;
@@ -61,11 +62,23 @@
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
- comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+// comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
}
return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
+ }
+
+ @ApiOperation(value = "分页展示社区随手拍-脱敏", response = ComActEasyPhotoVO.class)
+ @PostMapping("pageEasyPhotoDesensitize")
+ public R pageEasyPhotoDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
+ comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
+ }
+ return communityService.pageEasyPhotoAppletsDesensitize(comActEasyPhotoVO);
}
@ApiOperation("上传随手拍")
@@ -79,7 +92,7 @@
if (StrUtil.isNotBlank(detail)) {
String result = checkService.checkMessageBy(detail, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
}
}
@@ -87,7 +100,7 @@
String photoPathList = comActEasyPhotoVO.getPhotoPathList();
if (StrUtil.isNotBlank(photoPathList)) {
if (!checkService.checkImageBy(photoPathList, appId)) {
- return R.fail("上传图片存在违规信息");
+ return R.fail(501, "上传图片存在违规信息");
}
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -161,6 +174,36 @@
return communityService.detailEasyPhoto(id, userId);
}
+
+ /**
+ * 随手拍删除
+ *
+ * @param id
+ * 随手拍主键
+ * 登录用户id
+ * @return 详情内容
+ */
+ @ApiOperation(value = "删除随手拍", response = ComActEasyPhotoVO.class)
+ @DeleteMapping("easyphoto/{id}")
+ public R deleteEasyPhoto(@PathVariable("id") Long id) {
+ Long userId = this.getUserId();
+ return communityService.deleteEasyPhoto(id, userId);
+ }
+
+
+
+ @ApiOperation(value = "随手拍详情-脱敏", response = ComActEasyPhotoVO.class)
+ @GetMapping("detailEasyPhotoDesensitize")
+ @ApiImplicitParam(name = "id", value = "随手拍主键")
+ public R detailEasyPhotoDesensitize(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailEasyPhotoDesensitize(id, userId);
+ }
+
@ApiOperation(value = "随手拍--评论--分页查询", response = ComActEasyPhotoCommentVO.class)
@PostMapping("pagecomacteasyphotocomment")
public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
@@ -171,6 +214,18 @@
}
pageComActEasyPhotoCommentDTO.setUserId(userId);
return communityService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO);
+ }
+
+ @ApiOperation(value = "随手拍--评论--分页查询-脱敏", response = ComActEasyPhotoCommentVO.class)
+ @PostMapping("pageComActEasyPhotoCommentDesensitize")
+ public R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ pageComActEasyPhotoCommentDTO.setUserId(userId);
+ return communityService.pageComActEasyPhotoCommentDesensitize(pageComActEasyPhotoCommentDTO);
}
@ApiOperation(value = "随手拍--评论--新增评论")
@@ -184,7 +239,7 @@
if (StrUtil.isNotBlank(comment)) {
String result = checkService.checkMessageBy(comment, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
}
}
comActEasyPhotoCommentDTO.setUserId(this.getUserId());
@@ -216,7 +271,26 @@
@ApiOperation(value = "分页展示社区微心愿", response = ComActMicroWishVO.class)
@PostMapping("pagemicrowish")
- public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO)
+ {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
+ }
+
+ if(!StringUtils.isEmpty(comActMicroWishVO.getHandleId()))
+ {
+ comActMicroWishVO.setCommunityId(null);
+ }
+ comActMicroWishVO.setIsApplets(1);
+ comActMicroWishVO.setIsPageMyWish(null);
+ return communityService.pageMicroWishApplets(comActMicroWishVO);
+ }
+
+ @ApiOperation(value = "分页展示社区微心愿-脱敏", response = ComActMicroWishVO.class)
+ @PostMapping("pageMicroWishDesensitize")
+ public R pageMicroWishDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
@@ -224,7 +298,7 @@
}
comActMicroWishVO.setIsApplets(1);
comActMicroWishVO.setIsPageMyWish(null);
- return communityService.pageMicroWishApplets(comActMicroWishVO);
+ return communityService.pageMicroWishAppletsDesensitize(comActMicroWishVO);
}
@ApiOperation("发布微心愿")
@@ -232,8 +306,11 @@
public R addMicroWish(@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO) {
// 微信内容审核
String msg = comActMicroWishVO.getDetail();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
@@ -262,6 +339,26 @@
userId = loginUserInfo.getUserId();
}
return communityService.detailMicroWish(id, userId);
+ }
+
+
+ @ApiOperation(value = "删除心愿")
+ @PostMapping("deletemicrowish")
+ public R deleteMicrowish(@RequestParam("id") Long id) {
+ return communityService.deletemicrowish(id);
+ }
+
+
+ @ApiOperation(value = "心愿详情-脱敏", response = ComActMicroWishVO.class)
+ @GetMapping("microwishDesensitize")
+ @ApiImplicitParam(name = "id", value = "微心愿主键")
+ public R detailMicroWishDesensitize(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailMicroWishDesensitize(id, userId);
}
@ApiOperation("点赞/取消点赞微心愿")
@@ -317,8 +414,11 @@
public R addMessage(@RequestBody @Validated(AddGroup.class) ComActMessageVO comActMessageVO) {
// 微信内容审核
String msg = comActMessageVO.getMsgContent();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
@@ -344,8 +444,11 @@
public R addMessageBack(@RequestBody @Validated(AddGroup.class) ComActMessageBackVO comActMessageBackVO) {
// 微信内容审核
String msg = comActMessageBackVO.getMsgContent();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
@@ -438,6 +541,18 @@
return communityService.getUserRewards(userId, communityId);
}
+ @ApiOperation(value = "获取普达首页弹窗接口", response = ComActEasyPhotoRewardVO.class)
+ @GetMapping("getUserRewardsNew")
+ public R getUserRewardsNew(@RequestParam("communityId") Long communityId) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.getUserRewardsNew(userId, communityId);
+ }
+
@ApiOperation(value = "读取用户随手拍奖励")
@PostMapping("readUserReward")
public R readUserReward() {
--
Gitblit v1.7.1