From d42fb2fc02075bf3e49118675777a62098743784 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 08 九月 2021 11:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 251 +++++++++++++++++++++++++++++---------------------
1 files changed, 145 insertions(+), 106 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 65b5fed..ef4a697 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,17 +1,25 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
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.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.community.*;
+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;
@@ -19,14 +27,10 @@
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
@@ -45,30 +49,28 @@
@Resource
private CheckService checkService;
- @ApiOperation(value = "分页展示社区随手拍",response = ComActEasyPhotoVO.class)
+ @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class)
@PostMapping("pageeasyphoto")
- public R pageEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- Long communityId = loginUserInfo.getCommunityId();
- if (null==communityId||0==communityId) {
- return R.fail("用户未绑定社区");
+ public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
}
- comActEasyPhotoVO.setCommunityId(communityId);
- comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
return communityService.pageEasyPhotoApplets(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 msg = comActEasyPhotoVO.getDetail();
+ if (!checkService.checkMessage(msg)) {
+ return R.fail("内容违规");
+ }
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();
@@ -78,51 +80,64 @@
return communityService.addEasyPhoto(comActEasyPhotoVO);
}
- @ApiOperation(value = "查询随手拍是否有活动",response = ComActEasyPhotoActivityVO.class)
+ @ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
@PostMapping("getEasyPhotoActivity")
- public R getEasyPhotoActivity (){
- Long communityId = this.getCommunityId();
+ public R getEasyPhotoActivity(@RequestBody CommonDTO commonDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long communityId = commonDTO.getCommunityId();
+ 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){
- Long userId = this.getUserId();
- return communityService.detailEasyPhoto(id,userId);
+ @ApiImplicitParam(name = "id", value = "随手拍主键")
+ public R detailEasyPhoto(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailEasyPhoto(id, userId);
}
- @ApiOperation(value = "随手拍--评论--分页查询",response = ComActEasyPhotoCommentVO.class )
+ @ApiOperation(value = "随手拍--评论--分页查询", response = ComActEasyPhotoCommentVO.class)
@PostMapping("pagecomacteasyphotocomment")
- public R pageComActEasyPhotoComment (@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO){
- pageComActEasyPhotoCommentDTO.setUserId(this.getUserId());
+ 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 = "随手拍--评论--新增评论")
@PostMapping("comacteasyphotocomment")
- public R addComActEasyPhotoComment (@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO){
+ public R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO) {
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();
@@ -130,41 +145,37 @@
return communityService.putEasyPhoto(comActEasyPhotoVO);
}
-
- @ApiOperation(value = "分页展示社区微心愿",response = ComActMicroWishVO.class)
+ @ApiOperation(value = "分页展示社区微心愿", response = ComActMicroWishVO.class)
@PostMapping("pagemicrowish")
- public R pageMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- Long communityId = loginUserInfo.getCommunityId();
- if (null==communityId||0==communityId) {
- return R.fail("用户未绑定社区");
+ public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
}
- Long userId = loginUserInfo.getUserId();
- comActMicroWishVO.setCommunityId(communityId);
comActMicroWishVO.setIsApplets(1);
- comActMicroWishVO.setResponsibleId(userId);//责任人暂时放登录用户id
comActMicroWishVO.setIsPageMyWish(null);
return communityService.pageMicroWish(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("内容违规");
}
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);
@@ -172,35 +183,39 @@
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){
- Long userId = this.getUserId();
- return communityService.detailMicroWish(id,userId);
+ @ApiImplicitParam(name = "id", value = "微心愿主键")
+ public R detailMicroWish(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailMicroWish(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)
- @GetMapping("listadvertisement")
- public R listAdvertisement (){
+ @ApiOperation(value = "首页广告banner", response = ComOpsAdvVO.class)
+ @GetMapping("listadvertisement/noToken")
+ public R listAdvertisement() {
return communityService.listAdvertisement();
}
- @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);
@@ -208,43 +223,42 @@
@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){
+ @ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
+ public R agreement(@RequestParam("type") Integer type) {
return userService.agreement(type);
}
-
-
+
@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("内容违规");
}
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);
@@ -255,23 +269,23 @@
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("内容违规");
}
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);
@@ -282,26 +296,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);
@@ -309,34 +323,59 @@
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 )
- @PostMapping("getUserReward")
- public R getUserReward(){
- return communityService.getUserReward(this.getUserId(),this.getCommunityId());
+ @ApiOperation(value = "获取最新活动和用户最新收益", response = ComActEasyPhotoRewardVO.class)
+ @GetMapping("getUserReward")
+ public R getUserReward(@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);
+ }
+
+ @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.getUserRewards(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();
}
}
--
Gitblit v1.7.1