From 6a59c4df10328201dcc97c1488471b40c098899c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 10:57:29 +0800
Subject: [PATCH] Merge branch 'local_20221115' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 383 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 282 insertions(+), 101 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 050c5d4..b5b0b4e 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,21 +1,29 @@
package com.panzhihua.applets.api;
+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.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
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;
@@ -45,96 +53,197 @@
private UserService userService;
@Resource
private CheckService checkService;
+ @Resource
+ private ComActEasyPhotoEvaluateFeign easyPhotoEvaluateFeign;
- @ApiOperation(value = "分页展示社区随手拍",response = ComActEasyPhotoVO.class)
+ @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class)
@PostMapping("pageeasyphoto")
- public R pageEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
+ public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
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("上传随手拍")
@PostMapping("easyphoto")
- public R addEasyPhoto (@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO){
- // 微信内容审核
- String msg = comActEasyPhotoVO.getDetail();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ public R addEasyPhoto(@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO) {
+ // 微信内容审核
+ 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();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("用户未绑定社区");
}
Long userId = loginUserInfo.getUserId();
- comActEasyPhotoVO.setCommunityId(communityId);
+ if (null==comActEasyPhotoVO.getCommunityId()){
+ comActEasyPhotoVO.setCommunityId(communityId);
+ }
comActEasyPhotoVO.setSponsorId(userId);
comActEasyPhotoVO.setStatus(1);
return communityService.addEasyPhoto(comActEasyPhotoVO);
}
- @ApiOperation(value = "查询随手拍是否有活动",response = ComActEasyPhotoActivityVO.class)
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @ApiOperation(value = "查询处理列表", response = ComActEasyPhotoHandlerVo.class)
+ @PostMapping("/handleList")
+ public R handleList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
+ comActEasyPhotoHandler.setUserId(this.getUserId());
+ return this.communityService.queryEasyPhotoHandler(comActEasyPhotoHandler);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @ApiOperation(value = "提交反馈")
+ @PostMapping("/editEasyPhotoHandler")
+ public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
+ return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
+ }
+
+ @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class)
+ @ApiImplicitParam(name = "id", value = "处理id", required = true)
+ @GetMapping("/easyPhotoHandler")
+ public R detailEasyPhotoHandler(@RequestParam("id") Long id) {
+ return this.communityService.detailEasyPhotoHandler(id);
+ }
+
+ @ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
@PostMapping("getEasyPhotoActivity")
- public R getEasyPhotoActivity (@RequestBody CommonDTO commonDTO){
+ public R getEasyPhotoActivity(@RequestBody CommonDTO commonDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
Long communityId = commonDTO.getCommunityId();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
communityId = loginUserInfo.getCommunityId();
}
return communityService.getEasyPhotoActivity(communityId);
}
- @ApiOperation(value = "随手拍详情",response =ComActEasyPhotoVO.class )
+ @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class)
@GetMapping("detaileasyphoto")
- @ApiImplicitParam(name = "id",value = "随手拍主键")
- public R detailEasyPhoto (@RequestParam("id") Long id){
+ @ApiImplicitParam(name = "id", value = "随手拍主键")
+ public R detailEasyPhoto(@RequestParam("id") Long id) {
Long userId = 0L;
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
- return communityService.detailEasyPhoto(id,userId);
+ return communityService.detailEasyPhoto(id, userId);
}
-
- @ApiOperation(value = "随手拍--评论--分页查询",response = ComActEasyPhotoCommentVO.class )
- @PostMapping("pagecomacteasyphotocomment")
- public R pageComActEasyPhotoComment (@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO){
+ @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){
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailEasyPhotoDesensitize(id, userId);
+ }
+
+ @ApiOperation(value = "随手拍--评论--分页查询", response = ComActEasyPhotoCommentVO.class)
+ @PostMapping("pagecomacteasyphotocomment")
+ public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
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 = "随手拍--评论--新增评论")
@PostMapping("comacteasyphotocomment")
- public R addComActEasyPhotoComment (@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO){
+ 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);
}
- @ApiOperation(value = "随手拍--评论--点赞/取消点赞" )
+ @ApiOperation(value = "随手拍--评论--点赞/取消点赞")
@PostMapping("commentsign")
- public R commentSign (@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO){
+ public R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO) {
comActEasyPhotoCommentUserDTO.setUserId(this.getUserId());
return communityService.commentSign(comActEasyPhotoCommentUserDTO);
}
@ApiOperation("点赞/取消点赞随手拍")
@PutMapping("easyphoto")
- public R putEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
+ public R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
Long id = comActEasyPhotoVO.getId();
- if (null==id||id==0) {
+ if (null == id || id == 0) {
return R.fail("随手拍主键不能为空");
}
Integer haveGiveThumbsUp = comActEasyPhotoVO.getHaveGiveThumbsUp();
- if (null==haveGiveThumbsUp) {
+ if (null == haveGiveThumbsUp) {
return R.fail("操作类型不能为空");
}
Long userId = this.getUserId();
@@ -142,38 +251,53 @@
return communityService.putEasyPhoto(comActEasyPhotoVO);
}
-
- @ApiOperation(value = "分页展示社区微心愿",response = ComActMicroWishVO.class)
+ @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){
+ if (loginUserInfo != null) {
comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
- comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());//责任人暂时放登录用户id
+ comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
}
comActMicroWishVO.setIsApplets(1);
comActMicroWishVO.setIsPageMyWish(null);
- return communityService.pageMicroWish(comActMicroWishVO);
+ 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){
- // 微信内容审核
+ 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();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("用户未绑定社区");
}
Long userId = loginUserInfo.getUserId();
String phone = loginUserInfo.getPhone();
if (ObjectUtils.isEmpty(phone)) {
-// return R.fail("用户绑定手机号后才能发布微心愿");
- phone="18228784579";
+ // return R.fail("用户绑定手机号后才能发布微心愿");
+ phone = "18228784579";
}
comActMicroWishVO.setSponsorPhone(phone);
comActMicroWishVO.setCommunityId(communityId);
@@ -181,39 +305,51 @@
return communityService.addMicroWish(comActMicroWishVO);
}
- @ApiOperation(value = "心愿详情",response = ComActMicroWishVO.class)
+ @ApiOperation(value = "心愿详情", response = ComActMicroWishVO.class)
@GetMapping("microwish")
- @ApiImplicitParam(name = "id",value = "微心愿主键")
- public R detailMicroWish (@RequestParam("id")Long id){
+ @ApiImplicitParam(name = "id", value = "微心愿主键")
+ public R detailMicroWish(@RequestParam("id") Long id) {
Long userId = 0L;
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
- return communityService.detailMicroWish(id,userId);
+ 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){
+ public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
Long id = comActMicroWishVO.getId();
- if (null==id||id==0) {
+ if (null == id || id == 0) {
return R.fail("微心愿主键不能为空");
}
Long userId = this.getUserId();
- comActMicroWishVO.setSponsorId(userId);//发起人字段暂时存放userId
+ comActMicroWishVO.setSponsorId(userId);// 发起人字段暂时存放userId
return communityService.putMicroWish(comActMicroWishVO);
}
- @ApiOperation(value = "首页广告banner",response = ComOpsAdvVO.class)
+ @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)
+ @ApiOperation(value = "分页通知列表", response = SysUserNoticeVO.class)
@PostMapping("pagenotice")
- public R pageNotice (@RequestBody @Validated(PageGroup.class) PageDTO pageDTO){
+ public R pageNotice(@RequestBody @Validated(PageGroup.class) PageDTO pageDTO) {
Long userId = this.getUserId();
pageDTO.setUserId(userId);
return userService.pageNotice(pageDTO);
@@ -221,43 +357,45 @@
@ApiOperation(value = "通知已读")
@PutMapping("notice")
- public R putNotice (@RequestBody NoticeReadDTO noticeReadDTO){
+ public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO) {
Long userId = this.getUserId();
noticeReadDTO.setUserId(userId);
return userService.putNotice(noticeReadDTO);
}
- @ApiOperation(value = "未读消息汇总",response = NoticeUnReadVO.class)
+ @ApiOperation(value = "未读消息汇总", response = NoticeUnReadVO.class)
@GetMapping("noticeunreadnum")
- public R noticeUnreadNum (){
+ public R noticeUnreadNum() {
Long userId = this.getUserId();
return userService.noticeUnreadNum(userId);
}
- @ApiOperation(value = "获取各种协议",response = SysUserAgreementVO.class)
+ @ApiOperation(value = "获取各种协议", response = SysUserAgreementVO.class)
@GetMapping("agreement")
- @ApiImplicitParam(name = "type",value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
- public R agreement (@RequestParam("type")Integer type){
- return userService.agreement(type);
+ @ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
+ public R agreement(@RequestParam("type") Integer type) {
+ return userService.agreement(type, this.getAppId());
}
-
-
+
@ApiOperation("发布留言")
@PostMapping("addmessage")
- public R addMessage(@RequestBody @Validated(AddGroup.class) ComActMessageVO comActMessageVO){
- // 微信内容审核
+ 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();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("用户未绑定社区");
}
Integer type = loginUserInfo.getType();
- if(null==type||(type!=1&&type!=2)) {
- return R.fail("留言对象类型错误！");
+ if (null == type || (type != 1 && type != 2)) {
+ return R.fail("留言对象类型错误！");
}
Long userId = loginUserInfo.getUserId();
comActMessageVO.setCommunityId(communityId);
@@ -268,23 +406,26 @@
comActMessageVO.setStatus(1);
return communityService.addMessage(comActMessageVO);
}
-
+
@ApiOperation("发布留言回复")
@PostMapping("addmessageback")
- public R addMessageBack(@RequestBody @Validated(AddGroup.class) ComActMessageBackVO comActMessageBackVO){
- // 微信内容审核
+ 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();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("用户未绑定社区");
}
Integer type = loginUserInfo.getType();
- if(null==type||(type!=1&&type!=2)) {
- return R.fail("留言对象类型错误！");
+ if (null == type || (type != 1 && type != 2)) {
+ return R.fail("留言对象类型错误！");
}
Long userId = loginUserInfo.getUserId();
comActMessageBackVO.setCommunityId(communityId);
@@ -295,26 +436,26 @@
comActMessageBackVO.setStatus(1);
return communityService.addMessageBack(comActMessageBackVO);
}
-
- @ApiOperation(value = "分页显示我的留言",response = ComActMessageVO.class)
+
+ @ApiOperation(value = "分页显示我的留言", response = ComActMessageVO.class)
@PostMapping("pagemymessage")
- public R pageMyMessage (@RequestBody ComActMessageVO comActMessageVO){
+ public R pageMyMessage(@RequestBody ComActMessageVO comActMessageVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("用户未绑定社区");
}
comActMessageVO.setCommunityId(communityId);
comActMessageVO.setUserId(loginUserInfo.getUserId());
return communityService.pageMyMessageApplets(comActMessageVO);
}
-
- @ApiOperation(value = "分页显示居民给我的留言",response = ComActMessageVO.class)
+
+ @ApiOperation(value = "分页显示居民给我的留言", response = ComActMessageVO.class)
@PostMapping("pagesendtomemessage")
- public R pageSendToMessage (@RequestBody ComActMessageVO comActMessageVO){
+ public R pageSendToMessage(@RequestBody ComActMessageVO comActMessageVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("用户未绑定社区");
}
comActMessageVO.setCommunityId(communityId);
@@ -322,40 +463,80 @@
comActMessageVO.setPhone(loginUserInfo.getPhone());
return communityService.pageSendToMessageApplets(comActMessageVO);
}
- @ApiOperation(value = "分页显示指定用户的留言",response =ComActMessageVO.class )
+
+ @ApiOperation(value = "分页显示指定用户的留言", response = ComActMessageVO.class)
@PostMapping("pagemessagebyuser")
- public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
+ public R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO) {
return communityService.pageMessageByUser(comActMessageVO);
}
-
- @ApiOperation(value = "留言详情",response =ComActMessageVO.class )
+
+ @ApiOperation(value = "留言详情", response = ComActMessageVO.class)
@GetMapping("detailmessage")
- @ApiImplicitParam(name = "id",value = "随手拍主键")
- public R detailMessage(@RequestParam("id") Long id){
+ @ApiImplicitParam(name = "id", value = "随手拍主键")
+ public R detailMessage(@RequestParam("id") Long id) {
return communityService.detailMessage(id);
}
@ApiOperation(value = "首页商城开关接口")
@GetMapping("isShop")
- public R isShop(){
+ public R isShop() {
return R.ok(Constants.IS_SHOP_OPEN);
}
- @ApiOperation(value = "获取最新活动和用户最新收益",response =ComActEasyPhotoRewardVO.class )
+ @ApiOperation(value = "获取最新活动和用户最新收益", response = BannerVO.class)
@GetMapping("getUserReward")
- public R getUserReward(@RequestParam("communityId") Long communityId){
+ public R getUserReward(@RequestParam("communityId") Long communityId) {
Long userId = 0L;
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ if (loginUserInfo.getCommunityId() != null) {
+ communityId = loginUserInfo.getCommunityId();
+ }
+ }
+ return communityService.getUserReward(userId, communityId);
+ }
+
+ @ApiOperation(value = "获取首页弹窗接口", response = ComActEasyPhotoRewardVO.class)
+ @GetMapping("getUserRewards")
+ public R getUserRewards(@RequestParam("communityId") Long communityId) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
communityId = loginUserInfo.getCommunityId();
}
- return communityService.getUserReward(userId,communityId);
+ 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(){
- return communityService.readUserReward(this.getUserId(),this.getCommunityId());
+ public R readUserReward() {
+ return communityService.readUserReward(this.getUserId(), this.getCommunityId());
+ }
+
+ @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class)
+ @GetMapping("easyphoto/classify/list")
+ public R easyPhotoClassifyList() {
+ return communityService.listPhotoClassify(this.getAreaCode());
+ }
+
+ @ApiOperation(value = "随手拍评价")
+ @PostMapping("easyphoto/whistle/evaluate")
+ public R evaluateEasyPhotoWhistle(@RequestBody EvaluateEasyDto whistleDto) {
+ whistleDto.setUserId(this.getUserId());
+ return easyPhotoEvaluateFeign.evaluateEasyApplets(whistleDto);
}
}
--
Gitblit v1.7.1