From 95a2379f12592e560cc5858ef6aea8877dae7198 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 13 十一月 2023 13:32:42 +0800
Subject: [PATCH] 新增党员参加项目模块
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 163 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 135 insertions(+), 28 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 c067166..3f45bf0 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
@@ -1,23 +1,14 @@
package com.panzhihua.applets.api;
-import javax.annotation.Resource;
-
-import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
-import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
-import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
-import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
-import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
-import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
-import com.panzhihua.common.service.community.ComActEasyPhotoHandlerFeign;
-import org.springframework.util.ObjectUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
+import cn.hutool.core.util.StrUtil;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.CommonDTO;
import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
+import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
@@ -25,19 +16,26 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+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.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
-
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -70,13 +68,39 @@
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("上传随手拍")
@PostMapping("easyphoto")
public R addEasyPhoto(@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO) {
// 微信内容审核
- String msg = comActEasyPhotoVO.getDetail();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String detail = comActEasyPhotoVO.getDetail();
+ if (StrUtil.isNotBlank(detail)) {
+ String result = checkService.checkMessageBy(detail, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+
+ //微信图片审核
+ String photoPathList = comActEasyPhotoVO.getPhotoPathList();
+ if (StrUtil.isNotBlank(photoPathList)) {
+ if (!checkService.checkImageBy(photoPathList, appId)) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
@@ -98,12 +122,13 @@
* @author lyq
* @date 2022-03-01 13:45:10
*/
- @ApiOperation(value = "查询处理列表",response = ComActEasyPhotoHandlerVo.class)
+ @ApiOperation(value = "查询处理列表", response = ComActEasyPhotoHandlerVo.class)
@PostMapping("/handleList")
public R handleList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
comActEasyPhotoHandler.setUserId(this.getUserId());
return this.communityService.queryEasyPhotoHandler(comActEasyPhotoHandler);
}
+
/**
* description edit 编辑数据
*
@@ -147,6 +172,17 @@
}
return communityService.detailEasyPhoto(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")
@@ -160,9 +196,32 @@
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 = "随手拍--评论--新增评论")
@PostMapping("comacteasyphotocomment")
public R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO) {
+ // 微信内容审核
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String comment = comActEasyPhotoCommentDTO.getComment();
+ if (StrUtil.isNotBlank(comment)) {
+ String result = checkService.checkMessageBy(comment, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
comActEasyPhotoCommentDTO.setUserId(this.getUserId());
return communityService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO);
}
@@ -203,13 +262,29 @@
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());
+ comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
+ }
+ comActMicroWishVO.setIsApplets(1);
+ comActMicroWishVO.setIsPageMyWish(null);
+ return communityService.pageMicroWishAppletsDesensitize(comActMicroWishVO);
+ }
+
@ApiOperation("发布微心愿")
@PostMapping("microwish")
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();
@@ -240,6 +315,18 @@
return communityService.detailMicroWish(id, userId);
}
+ @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("点赞/取消点赞微心愿")
@PutMapping("microwish")
public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
@@ -254,8 +341,8 @@
@ApiOperation(value = "首页广告banner", response = ComOpsAdvVO.class)
@GetMapping("listadvertisement/noToken")
- public R listAdvertisement() {
- return communityService.listAdvertisement();
+ public R listAdvertisement(@RequestParam(value = "type",required = false,defaultValue = "1") Integer type) {
+ return communityService.listAdvertisement(type);
}
@ApiOperation(value = "分页通知列表", response = SysUserNoticeVO.class)
@@ -285,7 +372,7 @@
@GetMapping("agreement")
@ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
public R agreement(@RequestParam("type") Integer type) {
- return userService.agreement(type,this.getAppId());
+ return userService.agreement(type, this.getAppId());
}
@ApiOperation("发布留言")
@@ -293,8 +380,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();
@@ -320,8 +410,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();
@@ -395,7 +488,9 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
- communityId = loginUserInfo.getCommunityId();
+ if (loginUserInfo.getCommunityId() != null) {
+ communityId = loginUserInfo.getCommunityId();
+ }
}
return communityService.getUserReward(userId, communityId);
}
@@ -412,6 +507,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