CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(communityCenter): 增加是否点赞

master
yang 2025-04-21 15:35:55 +08:00
parent 906a56c431
commit 9c7e6ea4a1
74 changed files with 1111 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
blob
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 MiB

After

Width:  |  Height:  |  Size: 1008 KiB

40
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityController.java
View File

@ -1,15 +1,13 @@
package com.mcwl.web.controller.communityCenter;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.communityCenter.domain.Community;
import com.mcwl.communityCenter.domain.dto.*;
import com.mcwl.communityCenter.domain.vo.CommunityDetailVo;
import com.mcwl.communityCenter.service.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
@ -17,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.Objects;
/**
* 社区
@ -42,6 +39,28 @@ public class CommunityController {
return communityService.listByPage(communityListPageRes);
}
@ApiOperation(value = "社区详情")
@GetMapping("detail")
public R<CommunityDetailVo> getCommunityDetail(@Valid
@ApiParam(value = "社区id", required = true)
@NotNull(message = "社区id不能为空")
Long communityId) {
CommunityDetailVo communityDetailVo = communityService.getCommunityDetail(communityId);
return R.ok(communityDetailVo);
}
/**
* 编辑社区
*/
@ApiOperation(value = "编辑社区")
@PostMapping("edit")
public R<Object> editCommunity(@RequestBody @Valid EditCommunityRes editCommunityRes) {
communityService.editCommunity(editCommunityRes);
return R.ok("编辑成功");
}
/**
* 我加入的社区
@ -56,15 +75,12 @@ public class CommunityController {
/**
* 添加社区
*
* @param communityRes 社区参数
* @return 添加结果
*/
@ApiOperation(value = "添加社区")
@PostMapping("add")
public R<Object> addCommunity(@RequestBody @Valid CommunityRes communityRes) {
communityService.addCommunity(communityRes);
return R.ok();
@PostMapping("addCommunity")
public R<Object> addCommunity(@RequestBody @Valid AddCommunityRes addCommunityRes) {
communityService.addCommunity(addCommunityRes);
return R.ok("社区添加成功");
}
/**

30
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityFileController.java
View File

@ -11,8 +11,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
/**
* 社区文件
@ -27,16 +29,6 @@ public class CommunityFileController {
private final CommunityFileLogService communityFileLogService;
/**
* 社区文件上传
*/
@ApiOperation(value = "社区文件上传")
@PostMapping("/upload")
public R<Object> upload(@RequestBody @Valid CommunityUploadFileRes communityUploadFileRes) {
communityFileService.upload(communityUploadFileRes);
return R.ok();
}
/**
* 社区文件列表
*/
@ -47,5 +39,23 @@ public class CommunityFileController {
}
/**
* 社区文件上传
*/
@ApiOperation(value = "社区文件上传")
@PostMapping("/upload")
public R<String> upload(@RequestBody @Valid CommunityUploadFileRes communityUploadFileRes) {
return communityFileService.upload(communityUploadFileRes);
}
/**
* 社区文件下载
*/
@ApiOperation(value = "社区文件下载")
@PostMapping("/download")
public R<String> download(@RequestBody @Valid CommunityDownloadFileRes communityDownloadFileRes) {
return communityFileService.download(communityDownloadFileRes);
}
}

20
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityUserController.java
View File

@ -50,5 +50,25 @@ public class CommunityUserController {
return communityUserService.black(blackListRes);
}
/**
* 取消拉黑
*/
@ApiOperation(value = "取消拉黑")
@PostMapping("unBlack")
public R<Object> unBlack(@RequestBody @Valid UnBlackListRes unBlackListRes) {
return communityUserService.unBlack(unBlackListRes);
}
/**
* 管理/取消管理
*/
@ApiOperation(value = "管理/取消管理")
@PostMapping("manage")
public R<Object> manage(@RequestBody @Valid CommunityUserManageRes communityUserManageRes) {
return communityUserService.manage(communityUserManageRes);
}
}

36
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PersonHomeController.java
View File

@ -4,6 +4,7 @@ import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.communityCenter.domain.dto.MyPublishCollectPageRes;
import com.mcwl.communityCenter.domain.dto.MyPublishPageRes;
import com.mcwl.communityCenter.domain.dto.PersonHomePageRes;
import com.mcwl.communityCenter.domain.dto.QuestionPageRes;
import com.mcwl.communityCenter.service.PublishCollectService;
import com.mcwl.communityCenter.service.PublishService;
@ -31,39 +32,14 @@ public class PersonHomeController {
private final PublishService publishService;
private final QuestionService questionService;
private final PublishCollectService publishCollectService;
/**
* 发布的文章列表
* 个人主页列表
*/
@PostMapping("myPublishList")
@ApiOperation(value = "我发布的文章列表")
public TableDataInfo myPublishList(@RequestBody @Valid MyPublishPageRes myPublishPageRes) {
@PostMapping("getPersonHomeList")
@ApiOperation(value = "个人主页列表")
public TableDataInfo getPersonHomeList(@RequestBody @Valid PersonHomePageRes personHomePageRes) {
return publishService.myPublishList(myPublishPageRes);
}
/**
* 我的问答列表
*/
@PostMapping("myQuestionList")
@ApiOperation(value = "我的问答列表")
public TableDataInfo myQuestionList(@RequestBody @Valid QuestionPageRes questionPageRes) {
return questionService.myQuestionList(questionPageRes);
}
/**
* 我的收藏
*/
@PostMapping("myCollectList")
@ApiOperation(value = "我的收藏")
public TableDataInfo myCollectList(@RequestBody @Valid MyPublishCollectPageRes myPublishCollectPageRes) {
return publishCollectService.myCollectList(myPublishCollectPageRes);
return publishService.getPersonHomeList(personHomePageRes);
}

4
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishCommentController.java
View File

@ -6,6 +6,7 @@ import com.mcwl.common.core.domain.R;
import com.mcwl.communityCenter.domain.dto.CommentDelRes;
import com.mcwl.communityCenter.domain.dto.CommentDetailRes;
import com.mcwl.communityCenter.domain.dto.CommentRes;
import com.mcwl.communityCenter.domain.vo.CommentVo;
import com.mcwl.communityCenter.service.PublishCommentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.util.List;
/**
* 社群评论
@ -52,7 +54,7 @@ public class PublishCommentController extends BaseController {
*/
@ApiOperation(value = "获取评论详情")
@PostMapping("/detail")
public R<Object> getComment(@RequestBody @Valid CommentDetailRes commentDetailRes) {
public R<List<CommentVo>> getComment(@RequestBody @Valid CommentDetailRes commentDetailRes) {
return publishCommentService.getComment(commentDetailRes);
}

6
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java
View File

@ -57,6 +57,12 @@ public class QuestionController {
// 付费类型为1时，判断钱包余额是否充足
if (Objects.equals(type, 1)) {
if (amount < 10) {
return R.fail(HttpStatus.SHOW_ERROR_MSG,"付费金额不能小于10");
}
if (amount > 1000) {
return R.fail(HttpStatus.SHOW_ERROR_MSG,"付费金额不能大于1000");
}
Long userId = SecurityUtils.getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
Double wallet = sysUser.getWallet();

1
mcwl-common/src/main/java/com/mcwl/common/utils/obs/ObsUtils.java
View File

@ -51,6 +51,7 @@ public class ObsUtils {
map.put("path",putObjectResult.getObjectUrl());
map.put("objectKey",putObjectResult.getObjectKey());
map.put("size",multipartFile.getSize()+"");
map.put("fileName",multipartFile.getOriginalFilename());
} catch (IOException e) {
throw new RuntimeException(e);
}

7
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityFile.java
View File

@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.mcwl.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.*;
/**
* 社区文件表
@ -17,7 +15,8 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("cc_community_file")
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class CommunityFile extends BaseEntity {
@TableId

4
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityUser.java
View File

@ -70,7 +70,7 @@ public class CommunityUser extends BaseEntity {
/**
* 是否拉黑 0否 1是
*/
private String isBlank;
private String isBlack;
/**
* 拉黑原因
@ -80,6 +80,6 @@ public class CommunityUser extends BaseEntity {
/**
* 拉黑结束时间
*/
private Date blankEndTime;
private Date blackEndTime;
}

7
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java
View File

@ -46,10 +46,15 @@ public class Publish extends BaseEntity {
private String imageUrl;
/**
* 发布文件
* 文件url
*/
private String fileUrl;
/**
* 文件名
*/
private String fileName;
/**
* 发布人
*/

8
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishComment.java
View File

@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
@ApiModel(description = "评论区评论")
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("cc_comment")
@TableName("cc_publish_comment")
public class PublishComment extends BaseEntity {
/**
* id
@ -32,10 +32,10 @@ public class PublishComment extends BaseEntity {
@ApiModelProperty(value = "社区id")
private Long communityId;
/**
* 运营id
* 发布id
*/
@ApiModelProperty(value = "运营id")
private Long operatorId;
@ApiModelProperty(value = "发布id")
private Long publishId;
/**
* 用户id
*/

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishCommentLike.java
View File

@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
@ApiModel(description = "评论点赞")
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("cc_comment_like")
@TableName("cc_publish_comment_like")
public class PublishCommentLike extends BaseEntity {
/**

12
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Question.java
View File

@ -53,18 +53,6 @@ public class Question extends BaseEntity {
*/
private String questionUrl;
// /**
// * 回复内容
// */
// @ApiModelProperty(value = "答复内容")
// private String reply;
//
// /**
// * 回复时间
// */
// @ApiModelProperty(value = "答复时间")
// private Date replyTime;
/**
* 是否匿名
*/

9
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityRes.java → mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/AddCommunityRes.java
View File

@ -1,6 +1,5 @@
package com.mcwl.communityCenter.domain.dto;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -13,7 +12,7 @@ import javax.validation.constraints.NotNull;
*/
@Data
@ApiModel(value = "社区请求参数")
public class CommunityRes {
public class AddCommunityRes {
/**
@ -57,6 +56,12 @@ public class CommunityRes {
@NotNull(message = "有效期天数")
private Integer validityDay;
/**
* 描述
*/
@ApiModelProperty(value = "描述")
private String description;
}

33
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDetailRes.java 100644
View File

@ -0,0 +1,33 @@
package com.mcwl.communityCenter.domain.dto;
import com.mcwl.common.core.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 社区详情请求参数
*/
@Data
@ApiModel(value = "社区详情请求参数")
public class CommunityDetailRes {
/**
* 租户id
*/
@ApiModelProperty(value = "租户id", required = true)
@NotNull(message = "租户id不能为空")
private Long tenantId;
/**
* 社区id
*/
@ApiModelProperty(value = "社区id", required = true)
@NotNull(message = "社区id不能为空")
private Long communityId;
}

41
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDownloadFileRes.java 100644
View File

@ -0,0 +1,41 @@
package com.mcwl.communityCenter.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 社区文件下载请求参数
*/
@Data
@ApiModel(value = "社区文件下载请求参数")
public class CommunityDownloadFileRes {
/**
* 租户id
*/
@ApiModelProperty(value = "租户id", required = true)
@NotNull(message = "租户id不能为空")
private Long tenantId;
/**
* 社区id
*/
@ApiModelProperty(value = "社区id", required = true)
@NotNull(message = "社区id不能为空")
private Long communityId;
/**
* 文件id
*/
@ApiModelProperty(value = "文件id", required = true)
@NotNull(message = "文件id不能为空")
private Long fileId;
}

4
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityFilePageListRes.java
View File

@ -10,10 +10,10 @@ import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotNull;
/**
* 社区请求参数
* 社区文件列表请求参数
*/
@Data
@ApiModel(value = "社区请求参数")
@ApiModel(value = "社区文件列表请求参数")
@EqualsAndHashCode(callSuper = true)
public class CommunityFilePageListRes extends PageDomain {

30
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUploadFileRes.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
@ -29,11 +30,32 @@ public class CommunityUploadFileRes {
private Long communityId;
/**
* 文件
* 文件url
*/
@ApiModelProperty(value = "文件", required = true)
@NotNull(message = "文件不能为空")
private MultipartFile file;
@ApiModelProperty(value = "文件url", required = true)
@NotBlank(message = "文件url不能为空")
private String fileUrl;
/**
* 文件对象key
*/
@ApiModelProperty(value = "文件对象key", required = true)
@NotBlank(message = "文件对象key不能为空")
private String objectKey;
/**
* 文件名
*/
@ApiModelProperty(value = "文件名", required = true)
@NotBlank(message = "文件名不能为空")
private String fileName;
/**
* 文件大小
*/
@ApiModelProperty(value = "文件大小", required = true)
@NotNull(message = "文件大小不能为空")
private Long fileSize;

6
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserListPageRes.java
View File

@ -15,6 +15,12 @@ import javax.validation.constraints.NotNull;
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "社区用户列表分页请求参数")
public class CommunityUserListPageRes extends PageDomain {
/**
* 租户id
*/
@ApiModelProperty(value = "租户id", required = true)
@NotNull(message = "租户id不能为空")
private Long tenantId;
/**
* 社区id

35
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserManageRes.java 100644
View File

@ -0,0 +1,35 @@
package com.mcwl.communityCenter.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* 管理/取消管理请求参数
*/
@Data
@ApiModel(value = "管理/取消管理请求参数")
public class CommunityUserManageRes {
/**
* 租户id
*/
@ApiModelProperty(value = "租户id", required = true)
@NotNull(message = "租户id不能为空")
private Long tenantId;
/**
* 社区id
*/
@ApiModelProperty(value = "社区id", required = true)
@NotNull(message = "社区id不能为空")
private Long communityId;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", required = true)
@NotNull(message = "用户id不能为空")
private Long userId;
}

74
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/EditCommunityRes.java 100644
View File

@ -0,0 +1,74 @@
package com.mcwl.communityCenter.domain.dto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.mcwl.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 编辑社区参数
*/
@Data
@ApiModel(value = "编辑社区参数")
public class EditCommunityRes {
@ApiModelProperty(value = "社区id", required = true)
@NotNull(message = "社区id不能为空")
private Long id;
/**
* 社区图片
*/
@ApiModelProperty(value = "社区图片")
private String imageUrl;
/**
* 社区名称
*/
@ApiModelProperty(value = "社区名称", required = true)
@NotBlank(message = "社区名称不能为空")
private String communityName;
/**
* 描述
*/
@ApiModelProperty(value = "描述")
private String description;
/**
* 社区标签id
*/
@ApiModelProperty(value = "社区标签", required = true)
@NotNull(message = "社区标签不能为空")
private Integer communityTag;
/**
* 社区类型 0免费 1付费
*/
@ApiModelProperty(value = "社区类型", required = true)
@NotNull(message = "社区类型不能为空")
private Integer type;
/**
* 价格
*/
@ApiModelProperty(value = "价格", required = true)
@NotNull(message = "价格不能为空")
private Double price;
/**
* 有效期天数
*/
@ApiModelProperty(value = "有效期天数", required = true)
@NotNull(message = "有效期天数")
private Integer validityDay;
}

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoListPageRes.java
View File

@ -2,6 +2,7 @@ package com.mcwl.communityCenter.domain.dto;
import com.mcwl.common.core.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -17,11 +18,11 @@ import javax.validation.constraints.NotNull;
public class IncomeInfoListPageRes extends PageDomain {
@NotNull(message = "社区id不能为空")
@ApiParam(value = "社区id", required = true)
@ApiModelProperty(value = "社区id", required = true)
private Long communityId;
@NotNull(message = "租户id不能为空")
@ApiParam(value = "租户id", required = true)
@ApiModelProperty(value = "租户id", required = true)
private Long tenantId;
}

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoRes.java
View File

@ -2,6 +2,7 @@ package com.mcwl.communityCenter.domain.dto;
import com.mcwl.common.core.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -16,11 +17,11 @@ import javax.validation.constraints.NotNull;
public class IncomeInfoRes {
@NotNull(message = "社区id不能为空")
@ApiParam(value = "社区id", required = true)
@ApiModelProperty(value = "社区id", required = true)
private Long communityId;
@NotNull(message = "租户id不能为空")
@ApiParam(value = "租户id", required = true)
@ApiModelProperty(value = "租户id", required = true)
private Long tenantId;
}

6
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/JoinCommunityListPageRes.java
View File

@ -14,6 +14,12 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "社区列表分页请求参数")
public class JoinCommunityListPageRes extends PageDomain {
/**
* 是否包含我创建的社区 0否 1是
*/
@ApiModelProperty(value = "是否包含我创建的社区 0否 1是 默认0")
private Integer isMyCreate = 0;
/**
* 搜索内容
*/

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/MyPublishPageRes.java
View File

@ -2,6 +2,7 @@ package com.mcwl.communityCenter.domain.dto;
import com.mcwl.common.core.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -17,11 +18,11 @@ import javax.validation.constraints.NotNull;
public class MyPublishPageRes extends PageDomain {
@NotNull(message = "社区id不能为空")
@ApiParam(value = "社区id", required = true)
@ApiModelProperty(value = "社区id", required = true)
private Long communityId;
@NotNull(message = "租户id不能为空")
@ApiParam(value = "租户id", required = true)
@ApiModelProperty(value = "租户id", required = true)
private Long tenantId;
}

41
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PersonHomePageRes.java 100644
View File

@ -0,0 +1,41 @@
package com.mcwl.communityCenter.domain.dto;
import com.mcwl.common.core.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 个人主页分页请求参数
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "个人主页分页请求参数")
public class PersonHomePageRes extends PageDomain {
/**
* 租户id
*/
@NotNull(message = "租户id不能为空")
@ApiModelProperty(value = "租户id", required = true)
private Long tenantId;
/**
* 社区id
*/
@NotNull(message = "社区id不能为空")
@ApiModelProperty(value = "社区id", required = true)
private Long communityId;
/**
* 类型 0 我的发布 1 我的问答 2 我的收藏
*/
@NotNull(message = "类型不能为空")
@ApiModelProperty(value = "类型 0 我的发布 1 我的问答 2 我的收藏", required = true)
private Integer type;
}

4
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishCollectRes.java
View File

@ -2,7 +2,9 @@ package com.mcwl.communityCenter.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
@ -11,6 +13,8 @@ import javax.validation.constraints.NotNull;
*/
@Data
@ApiModel(value = "收藏/取消收藏请求参数")
@NoArgsConstructor
@AllArgsConstructor
public class PublishCollectRes {
/**

9
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishDetailRes.java
View File

@ -2,6 +2,7 @@ package com.mcwl.communityCenter.domain.dto;
import com.mcwl.common.core.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -15,15 +16,15 @@ import javax.validation.constraints.NotNull;
@ApiModel(value = "发布详情请求参数")
public class PublishDetailRes {
@ApiParam(value = "发布id", required = true)
@ApiModelProperty(value = "发布id", required = true)
@NotNull(message = "发布id不能为空")
private Long id;
private Long publishId;
@ApiParam(value = "租户id", required = true)
@ApiModelProperty(value = "租户id", required = true)
@NotNull(message = "租户id不能为空")
private Long tenantId;
@ApiParam(value = "社区id", required = true)
@ApiModelProperty(value = "社区id", required = true)
@NotNull(message = "社区id不能为空")
private Long communityId;

4
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishLikeRes.java
View File

@ -2,7 +2,9 @@ package com.mcwl.communityCenter.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
@ -11,6 +13,8 @@ import javax.validation.constraints.NotNull;
*/
@Data
@ApiModel(value = "点赞/取消点赞请求参数")
@NoArgsConstructor
@AllArgsConstructor
public class PublishLikeRes {
/**

7
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishPageRes.java
View File

@ -15,15 +15,14 @@ import javax.validation.constraints.NotNull;
public class PublishPageRes extends PageDomain {
@NotNull(message = "社区id不能为空")
@ApiParam(value = "社区id", required = true)
@ApiModelProperty(value = "社区id", required = true)
private Long communityId;
@NotNull(message = "租户id不能为空")
@ApiParam(value = "租户id", required = true)
@ApiModelProperty(value = "租户id", required = true)
private Long tenantId;
@NotNull(message = "类型不能为空")
@ApiParam(value = "类型 0只看星主 1精选 2问答", required = true)
@ApiModelProperty(value = "类型 0只看星主 1精选", required = true)
private Integer type;
}

10
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishRes.java
View File

@ -39,11 +39,17 @@ public class PublishRes {
private String imageUrl;
/**
* 发布文件
* 文件url
*/
@ApiModelProperty(value = "发布文件")
@ApiModelProperty(value = "文件url")
private String fileUrl;
/**
* 文件名
*/
@ApiModelProperty(value = "文件名")
private String fileName;
/**
* 发布时间 - 定时发布
*/

36
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/UnBlackListRes.java 100644
View File

@ -0,0 +1,36 @@
package com.mcwl.communityCenter.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 取消拉黑请求参数
*/
@Data
@ApiModel(value = "取消拉黑请求参数")
public class UnBlackListRes {
/**
* 租户id
*/
@ApiModelProperty(value = "租户id", required = true)
@NotNull(message = "租户id不能为空")
private Long tenantId;
/**
* 社区id
*/
@ApiModelProperty(value = "社区id", required = true)
@NotNull(message = "社区id不能为空")
private Long communityId;
/**
* 拉黑用户id
*/
@ApiModelProperty(value = "拉黑用户id", required = true)
@NotNull(message = "拉黑用户id不能为空")
private Long userId;
}

18
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommentVo.java
View File

@ -27,6 +27,18 @@ public class CommentVo {
@ApiModelProperty(value = "评论id")
private Long id;
/**
* 租户id
*/
@ApiModelProperty(value = "租户id")
private Long tenantId;
/**
* 社区id
*/
@ApiModelProperty(value = "社区id")
private Long communityId;
/**
* 用户id
*/
@ -45,6 +57,12 @@ public class CommentVo {
@ApiModelProperty(value = "用户头像")
private String userAvatar;
/**
* 父评论id
*/
@ApiModelProperty(value = "父评论id")
private Long parentId;
/**
* 评论内容
*/

52
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java
View File

@ -5,13 +5,65 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 社区返回数据
*/
@Data
@ApiModel(value = "社区详情返回数据")
public class CommunityDetailVo {
/**
* 社区id
*/
@ApiModelProperty(value = "社区id")
private Long id;
/**
* 社区图片
*/
@ApiModelProperty(value = "社区图片")
private String imageUrl;
/**
* 社区名称
*/
@ApiModelProperty(value = "社区名称")
private String communityName;
/**
* 社区标签id
*/
@ApiModelProperty(value = "社区标签")
@NotNull(message = "社区标签不能为空")
private Integer communityTag;
/**
* 社区类型
*/
@ApiModelProperty(value = "社区类型 0免费 1付费")
@NotNull(message = "社区类型不能为空")
private Integer type;
/**
* 价格
*/
@ApiModelProperty(value = "价格")
@NotNull(message = "价格不能为空")
private Double price;
/**
* 有效期天数
*/
@ApiModelProperty(value = "有效期天数")
@NotNull(message = "有效期天数")
private Integer validityDay;
/**
* 描述
*/
@ApiModelProperty(value = "描述")
private String description;
}

6
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityFileVo.java
View File

@ -34,12 +34,6 @@ public class CommunityFileVo {
@ApiModelProperty(value = "社区id")
private Long communityId;
/**
* 文件路径
*/
@ApiModelProperty(value = "文件路径")
private String fileUrl;
/**
* 文件名称
*/

19
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityUserVo.java
View File

@ -39,6 +39,12 @@ public class CommunityUserVo {
@ApiModelProperty(value = "用户id")
private Long userId;
/**
* 用户类型 0成员 1管理员 2群主
*/
@ApiModelProperty(value = "用户类型 0成员 1管理员 2群主")
private Integer userType;
/**
* 用户头像
*/
@ -51,6 +57,12 @@ public class CommunityUserVo {
@ApiModelProperty(value = "用户昵称")
private String nickName;
/**
* 是否拉黑
*/
@ApiModelProperty(value = "是否拉黑")
private String isBlack;
/**
* 加入类型
@ -65,13 +77,6 @@ public class CommunityUserVo {
@ApiModelProperty(value = "首次加入时间")
private Date startTime;
/**
* 最后活动时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value = "最后活动时间")
private Date loginDate;
/**
* 到期时间
*/

12
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java
View File

@ -21,6 +21,18 @@ public class CommunityVo {
@ApiModelProperty(value = "社区id")
private Long id;
/**
* 租户id
*/
@ApiModelProperty(value = "租户id")
private Long tenantId;
/**
* 用户类型
*/
@ApiModelProperty(value = "用户类型")
private Integer userType;
/**
* 社区图片
*/

92
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PersonHomeVo.java 100644
View File

@ -0,0 +1,92 @@
package com.mcwl.communityCenter.domain.vo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.mcwl.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* 个人中心vo
*/
@Data
@ApiModel(description = "个人中心vo")
public class PersonHomeVo {
@ApiModelProperty(value = "id")
private Long id;
/**
* 租户id
*/
@ApiModelProperty(value = "租户id")
private Long tenantId;
/**
* 社区id
*/
@ApiModelProperty(value = "社区id")
private Long communityId;
/**
* 内容
*/
@ApiModelProperty(value = "内容")
private String content;
/**
* 文件url
*/
@ApiModelProperty(value = "文件url")
private String fileUrl;
/**
* 文件名
*/
@ApiModelProperty(value = "文件名")
private String fileName;
/**
* 图片url
*/
@ApiModelProperty(value = "图片url")
private String imageUrl;
/**
* 点赞数
*/
@ApiModelProperty(value = "点赞数")
private Integer likeNum;
/**
* 是否收藏
*/
@ApiModelProperty(value = "是否收藏")
private Integer isCollect;
/**
* 评论
*/
@ApiModelProperty(value = "评论")
private List<CommentVo> commentList;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
}

21
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java
View File

@ -1,5 +1,6 @@
package com.mcwl.communityCenter.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -63,16 +64,22 @@ public class PublishVo {
private String imageUrl;
/**
* 发布文件
* 文件url
*/
@ApiModelProperty(value = "发布文件")
@ApiModelProperty(value = "文件url")
private String fileUrl;
/**
* 发布时间 - 定时发布
* 文件名
*/
@ApiModelProperty(value = "发布时间 - 定时发布")
private Date publishTime;
@ApiModelProperty(value = "文件名")
private String fileName;
/**
* 是否点赞
*/
@ApiModelProperty(value = "是否点赞")
private Integer isLike;
/**
* 点赞数
@ -98,6 +105,10 @@ public class PublishVo {
@ApiModelProperty(value = "收藏")
private Integer isCollect;
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
}

3
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileLogMapper.java
View File

@ -24,4 +24,7 @@ public interface CommunityFileLogMapper extends BaseMapper<CommunityFileLog> {
Integer getDownloadCount(@Param("tenantId") Long tenantId,
@Param("communityId") Long communityId,
@Param("communityFileId") Long communityFileId);
@InterceptorIgnore(tenantLine = "true")
void saveCommunityFileLog(@Param("communityFileLog") CommunityFileLog communityFileLog);
}

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileMapper.java
View File

@ -20,4 +20,9 @@ public interface CommunityFileMapper extends BaseMapper<CommunityFile> {
@InterceptorIgnore(tenantLine = "true")
List<CommunityFileVo> getCommunityFileList(Page<CommunityFile> page, @Param("communityFilePageListRes") CommunityFilePageListRes communityFilePageListRes);
@InterceptorIgnore(tenantLine = "true")
CommunityFile selectCommunityFile(@Param("tenantId") Long tenantId,
@Param("communityId") Long communityId,
@Param("fileId") Long fileId);
}

6
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java
View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mcwl.communityCenter.domain.Community;
import com.mcwl.communityCenter.domain.dto.EditCommunityRes;
import com.mcwl.communityCenter.domain.dto.JoinCommunityListPageRes;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -53,8 +55,8 @@ public interface CommunityMapper extends BaseMapper<Community> {
Page<Community> page,
@Param("userId")
Long userId,
@Param("searchContent")
String searchContent);
@Param("joinCommunityListPageRes")
JoinCommunityListPageRes joinCommunityListPageRes);
@InterceptorIgnore(tenantLine = "true")
void quitCommunity(@Param("tenantId") Long tenantId,

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityUserMapper.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mcwl.communityCenter.domain.Community;
import com.mcwl.communityCenter.domain.CommunityUser;
import com.mcwl.communityCenter.domain.dto.CommunityUserListPageRes;
import com.mcwl.communityCenter.domain.dto.UnBlackListRes;
import com.mcwl.communityCenter.domain.vo.CommunityUserVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -44,8 +45,10 @@ public interface CommunityUserMapper extends BaseMapper<CommunityUser> {
@Param("userId") Long userId);
@InterceptorIgnore(tenantLine = "true")
void updateCommunityUser(@Param("blackCommunityUser") CommunityUser blackCommunityUser);
void updateBlackCommunityUser(@Param("blackCommunityUser") CommunityUser blackCommunityUser);
@InterceptorIgnore(tenantLine = "true")
List<CommunityUser> getAllCommunityUser();
void updateManageCommunityUser(@Param("manageCommunityUser") CommunityUser manageCommunityUser);
}

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishCollectMapper.java
View File

@ -27,7 +27,7 @@ public interface PublishCollectMapper extends BaseMapper<PublishCollect> {
void savePublishCollect(@Param("publishCollect") PublishCollect publishCollect);
@InterceptorIgnore(tenantLine = "true")
PublishCollect getPublishCollect(@Param("publishCollect") PublishCollectRes publishCollectRes,
PublishCollect getPublishCollect(@Param("publishCollectRes") PublishCollectRes publishCollectRes,
@Param("userId") Long userId);
@InterceptorIgnore(tenantLine = "true")

3
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishMapper.java
View File

@ -52,4 +52,7 @@ public interface PublishMapper extends BaseMapper<Publish> {
List<PublishVo> myPublishList(Page<Publish> page,
@Param("myPublishPageRes") MyPublishPageRes myPublishPageRes,
@Param("userId") Long userId);
@InterceptorIgnore(tenantLine = "true")
void insertPublish(@Param("publish") Publish publish);
}

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileLogService.java
View File

@ -11,4 +11,6 @@ public interface CommunityFileLogService extends IService<CommunityFileLog> {
List<String> getUserAvatarList(Long tenantId, Long communityId, Long communityFileId);
Integer getDownloadCount(Long tenantId, Long communityId, Long communityFileId);
void saveCommunityFileLog(CommunityFileLog communityFileLog);
}

8
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileService.java
View File

@ -1,14 +1,20 @@
package com.mcwl.communityCenter.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.communityCenter.domain.CommunityFile;
import com.mcwl.communityCenter.domain.dto.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
public interface CommunityFileService extends IService<CommunityFile> {
void upload(CommunityUploadFileRes communityUploadFileRes);
R<String> upload(CommunityUploadFileRes communityUploadFileRes);
TableDataInfo getCommunityFileList(CommunityFilePageListRes communityFilePageListRes);
R<String> download(@Valid CommunityDownloadFileRes communityDownloadFileRes);
}

16
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityService.java
View File

@ -2,25 +2,21 @@ package com.mcwl.communityCenter.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.communityCenter.domain.Community;
import com.mcwl.communityCenter.domain.dto.CommunityListPageRes;
import com.mcwl.communityCenter.domain.dto.CommunityRes;
import com.mcwl.communityCenter.domain.dto.JoinCommunityListPageRes;
import com.mcwl.communityCenter.domain.dto.JoinCommunityRes;
import com.mcwl.communityCenter.domain.dto.*;
import com.mcwl.communityCenter.domain.vo.CommunityDetailVo;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
public interface CommunityService extends IService<Community> {
TableDataInfo listByPage(CommunityListPageRes communityListPageRes);
/**
* 添加社区
* @param communityRes 社区信息
* @param addCommunityRes 社区信息
*/
void addCommunity(CommunityRes communityRes);
void addCommunity(AddCommunityRes addCommunityRes);
/**
* 加入社区
@ -44,4 +40,8 @@ public interface CommunityService extends IService<Community> {
* 判断是否加入社区
*/
R<Object> isJoinCommunity(JoinCommunityRes joinCommunityRes);
CommunityDetailVo getCommunityDetail(Long communityId);
void editCommunity(@Valid EditCommunityRes editCommunityRes);
}

11
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityUserService.java
View File

@ -3,12 +3,11 @@ package com.mcwl.communityCenter.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.communityCenter.domain.Community;
import com.mcwl.communityCenter.domain.CommunityUser;
import com.mcwl.communityCenter.domain.dto.BlackListRes;
import com.mcwl.communityCenter.domain.dto.CommunityListPageRes;
import com.mcwl.communityCenter.domain.dto.CommunityRes;
import com.mcwl.communityCenter.domain.dto.CommunityUserListPageRes;
import com.mcwl.communityCenter.domain.dto.CommunityUserManageRes;
import com.mcwl.communityCenter.domain.dto.UnBlackListRes;
import javax.validation.Valid;
import java.util.List;
@ -27,5 +26,9 @@ public interface CommunityUserService extends IService<CommunityUser> {
List<CommunityUser> getAllCommunityUser();
void updateCommunityUser(CommunityUser communityUser);
void updateBlankCommunityUser(CommunityUser communityUser);
R<Object> unBlack(@Valid UnBlackListRes unBlackListRes);
R<Object> manage(@Valid CommunityUserManageRes communityUserManageRes);
}

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishCommentService.java
View File

@ -28,7 +28,7 @@ public interface PublishCommentService extends IService<PublishComment> {
* @param commentDetailRes 评论详情参数
* @return 评论详情
*/
R<Object> getComment(CommentDetailRes commentDetailRes);
R<List<CommentVo>> getComment(CommentDetailRes commentDetailRes);
R<Object> addComment(CommentRes commentRes);

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishService.java
View File

@ -37,4 +37,6 @@ public interface PublishService extends IService<Publish> {
TableDataInfo myPublishList(MyPublishPageRes myPublishPageRes);
void collectPublish(@Valid PublishCollectRes publishCollectRes);
TableDataInfo getPersonHomeList(@Valid PersonHomePageRes personHomePageRes);
}

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityFileLogServiceImpl.java
View File

@ -28,4 +28,9 @@ public class CommunityFileLogServiceImpl extends ServiceImpl<CommunityFileLogMap
return baseMapper.getDownloadCount(tenantId, communityId, communityFileId);
}
@Override
public void saveCommunityFileLog(CommunityFileLog communityFileLog) {
baseMapper.saveCommunityFileLog(communityFileLog);
}
}

89
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityFileServiceImpl.java
View File

@ -1,21 +1,29 @@
package com.mcwl.communityCenter.service.impl;
import cn.hutool.Hutool;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.io.file.FileNameUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.common.utils.obs.ObsUtils;
import com.mcwl.communityCenter.domain.CommunityFile;
import com.mcwl.communityCenter.domain.CommunityFileLog;
import com.mcwl.communityCenter.domain.CommunityUser;
import com.mcwl.communityCenter.domain.dto.*;
import com.mcwl.communityCenter.domain.vo.CommunityFileVo;
import com.mcwl.communityCenter.domain.vo.DownloadFileUserVo;
import com.mcwl.communityCenter.mapper.CommunityFileMapper;
import com.mcwl.communityCenter.mapper.CommunityUserMapper;
import com.mcwl.communityCenter.service.CommunityFileLogService;
import com.mcwl.communityCenter.service.CommunityFileService;
import com.mcwl.communityCenter.service.CommunityUserService;
import com.mcwl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@ -33,26 +41,35 @@ public class CommunityFileServiceImpl extends ServiceImpl<CommunityFileMapper, C
private final CommunityFileLogService communityFileLogService;
private final CommunityUserMapper communityUserMapper;
private static final String[] UN_UPLOAD_FILE_TYPE = new String[]{
"bmp", "dib",
"jpg", "jpeg", "jpe", "jfif",
"gif",
"tif", "tiff",
"png",
"heic",
"webp"
};
@Override
public void upload(CommunityUploadFileRes communityUploadFileRes) {
public R<String> upload(CommunityUploadFileRes communityUploadFileRes) {
Long tenantId = communityUploadFileRes.getTenantId();
Long communityId = communityUploadFileRes.getCommunityId();
MultipartFile file = communityUploadFileRes.getFile();
Map<String, String> map = obsUtils.uploadFile(file);
String filename = file.getOriginalFilename();
long fileSize = file.getSize();
Long currentUserId = SecurityUtils.getUserId();
CommunityUser communityUser = communityUserMapper.selectCommunityUser(tenantId, communityId, currentUserId);
if (Objects.isNull(communityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区成员");
}
CommunityFile communityFile = BeanUtil.toBean(communityUploadFileRes, CommunityFile.class);
communityFile.setUserId(currentUserId);
CommunityFile communityFile = CommunityFile.builder()
.tenantId(tenantId)
.communityId(communityId)
.userId(SecurityUtils.getUserId())
.fileUrl(map.get("path"))
.objectKey(map.get("objectKey"))
.fileName(filename)
.fileSize(fileSize)
.build();
baseMapper.insert(communityFile);
return R.ok();
}
@Override
@ -62,17 +79,14 @@ public class CommunityFileServiceImpl extends ServiceImpl<CommunityFileMapper, C
for (CommunityFileVo communityFileVo : communityFileList) {
DownloadFileUserVo downloadFileUserVo = new DownloadFileUserVo();
List<String> avatarList = communityFileLogService.getUserAvatarList(communityFileVo.getTenantId(),
communityFileVo.getCommunityId(),
communityFileVo.getId());
Integer count = communityFileLogService.getDownloadCount(communityFileVo.getTenantId(),
communityFileVo.getCommunityId(),
communityFileVo.getId());
Long tenantId = communityFileVo.getTenantId();
Long communityId = communityFileVo.getCommunityId();
Long fileId = communityFileVo.getId();
List<String> avatarList = communityFileLogService.getUserAvatarList(tenantId, communityId, fileId);
Integer count = communityFileLogService.getDownloadCount(tenantId, communityId, fileId);
downloadFileUserVo.setAvatarList(avatarList);
downloadFileUserVo.setCount(count);
communityFileVo.setDownloadFileUser(downloadFileUserVo);
}
// 封装返回
@ -83,4 +97,35 @@ public class CommunityFileServiceImpl extends ServiceImpl<CommunityFileMapper, C
tableDataInfo.setMsg("查询成功");
return tableDataInfo;
}
@Override
public R<String> download(CommunityDownloadFileRes communityDownloadFileRes) {
Long tenantId = communityDownloadFileRes.getTenantId();
Long communityId = communityDownloadFileRes.getCommunityId();
Long fileId = communityDownloadFileRes.getFileId();
Long currentUserId = SecurityUtils.getUserId();
CommunityUser communityUser = communityUserMapper.selectCommunityUser(tenantId, communityId, currentUserId);
if (Objects.isNull(communityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区成员");
}
CommunityFile communityFile = baseMapper.selectCommunityFile(tenantId, communityId, fileId);
if (Objects.isNull(communityFile)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "文件不存在");
}
CommunityFileLog communityFileLog = new CommunityFileLog();
communityFileLog.setTenantId(tenantId);
communityFileLog.setCommunityId(communityId);
communityFileLog.setCommunityFileId(fileId);
communityFileLog.setDownloadUserId(currentUserId);
communityFileLogService.saveCommunityFileLog(communityFileLog);
return R.ok(communityFile.getFileUrl());
}
}

40
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.core.redis.RedisCache;
import com.mcwl.common.exception.ServiceException;
@ -18,10 +17,8 @@ import com.mcwl.communityCenter.constant.AdviceConstant;
import com.mcwl.communityCenter.domain.Community;
import com.mcwl.communityCenter.domain.CommunityAdvice;
import com.mcwl.communityCenter.domain.CommunityUser;
import com.mcwl.communityCenter.domain.dto.CommunityListPageRes;
import com.mcwl.communityCenter.domain.dto.CommunityRes;
import com.mcwl.communityCenter.domain.dto.JoinCommunityListPageRes;
import com.mcwl.communityCenter.domain.dto.JoinCommunityRes;
import com.mcwl.communityCenter.domain.dto.*;
import com.mcwl.communityCenter.domain.vo.CommunityDetailVo;
import com.mcwl.communityCenter.domain.vo.CommunityVo;
import com.mcwl.communityCenter.mapper.CommunityAdviceMapper;
import com.mcwl.communityCenter.mapper.CommunityMapper;
@ -74,11 +71,11 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
@Override
@Transactional(rollbackFor = Exception.class)
public void addCommunity(CommunityRes communityRes) {
public void addCommunity(AddCommunityRes addCommunityRes) {
try {
Community community = new Community();
BeanUtil.copyProperties(communityRes, community);
if (Objects.equals(communityRes.getType(), 0)) {
BeanUtil.copyProperties(addCommunityRes, community);
if (Objects.equals(addCommunityRes.getType(), 0)) {
community.setPrice(0.0);
}
baseMapper.insert(community);
@ -135,7 +132,7 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
Calendar now = Calendar.getInstance();
Date startTime = now.getTime();
now.add(Calendar.DAY_OF_YEAR, community.getValidityDay());
now.add(Calendar.YEAR, community.getValidityDay());
Date endTime = now.getTime();
CommunityUser cu = CommunityUser.builder()
@ -170,11 +167,9 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
@Override
public TableDataInfo getMyJoinCommunity(JoinCommunityListPageRes joinCommunityListPageRes) {
Page<Community> page = new Page<>(joinCommunityListPageRes.getPageNum(), joinCommunityListPageRes.getPageSize());
OrderItem orderItem = new OrderItem("create_time", false);
page.addOrder(orderItem);
page.addOrder(new OrderItem("create_time", false));
String searchContent = joinCommunityListPageRes.getSearchContent();
List<Community> communityList = baseMapper.getMyJoinCommunity(page, SecurityUtils.getUserId(), searchContent);
List<Community> communityList = baseMapper.getMyJoinCommunity(page, SecurityUtils.getUserId(), joinCommunityListPageRes);
return this.getCommunityVoTableDataInfo(communityList, page.getTotal());
@ -223,6 +218,18 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
return R.ok(isJoinCommunity);
}
@Override
public CommunityDetailVo getCommunityDetail(Long communityId) {
Community community = baseMapper.selectById(communityId);
return BeanUtil.toBean(community, CommunityDetailVo.class);
}
@Override
public void editCommunity(EditCommunityRes editCommunityRes) {
Community community = BeanUtil.toBean(editCommunityRes, Community.class);
baseMapper.updateById(community);
}
private TableDataInfo getCommunityVoTableDataInfo(List<Community> communityList, Long total) {
@ -261,8 +268,7 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
LocalDate currentLocalDate = LocalDate.now(ZoneId.systemDefault());
for (Community community : communityList) {
CommunityVo communityVo = new CommunityVo();
BeanUtil.copyProperties(community, communityVo);
CommunityVo communityVo = BeanUtil.toBean(community, CommunityVo.class);
// 当前时间和创建时间差
Date createTime = community.getCreateTime();
LocalDate createLocalDate = createTime.toInstant()
@ -270,6 +276,10 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
.toLocalDate();
long daysBetween = ChronoUnit.DAYS.between(createLocalDate, currentLocalDate);
SysUser sysUser = sysUserService.selectUserById(community.getTenantId());
CommunityUser communityUser = communityUserMapper.selectCommunityUser(community.getTenantId(), community.getId(), SecurityUtils.getUserId());
if (Objects.nonNull(communityUser)) {
communityVo.setUserType(communityUser.getUserType());
}
communityVo.setUserId(community.getTenantId());
communityVo.setAvatar(sysUser.getAvatar());
communityVo.setNickName(sysUser.getNickName());

98
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityUserServiceImpl.java
View File

@ -1,35 +1,24 @@
package com.mcwl.communityCenter.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.communityCenter.domain.Community;
import com.mcwl.communityCenter.domain.CommunityUser;
import com.mcwl.communityCenter.domain.dto.BlackListRes;
import com.mcwl.communityCenter.domain.dto.CommunityListPageRes;
import com.mcwl.communityCenter.domain.dto.CommunityRes;
import com.mcwl.communityCenter.domain.dto.CommunityUserListPageRes;
import com.mcwl.communityCenter.domain.dto.CommunityUserManageRes;
import com.mcwl.communityCenter.domain.dto.UnBlackListRes;
import com.mcwl.communityCenter.domain.vo.CommunityUserVo;
import com.mcwl.communityCenter.domain.vo.CommunityVo;
import com.mcwl.communityCenter.mapper.CommunityMapper;
import com.mcwl.communityCenter.mapper.CommunityUserMapper;
import com.mcwl.communityCenter.service.CommunityService;
import com.mcwl.communityCenter.service.CommunityUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.*;
@Service
@ -43,7 +32,7 @@ public class CommunityUserServiceImpl extends ServiceImpl<CommunityUserMapper, C
@Override
public TableDataInfo getCommunityUserList(CommunityUserListPageRes communityUserListPageRes) {
Page<CommunityUser> page = new Page<>(communityUserListPageRes.getPageNum(), communityUserListPageRes.getPageSize());
page.addOrder(new OrderItem("create_time", false));
// page.addOrder(new OrderItem("cu.create_time", false));
List<CommunityUserVo> communityUserList = baseMapper.getCommunityUserList(page, communityUserListPageRes);
@ -82,7 +71,7 @@ public class CommunityUserServiceImpl extends ServiceImpl<CommunityUserMapper, C
return R.fail(HttpStatus.SHOW_ERROR_MSG, "该用户不在该社区中");
}
if ("1".equals(blackCommunityUser.getIsBlank())) {
if ("1".equals(blackCommunityUser.getIsBlack())) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "该用户已拉黑");
}
@ -93,11 +82,11 @@ public class CommunityUserServiceImpl extends ServiceImpl<CommunityUserMapper, C
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, blackDay);
blackCommunityUser.setIsBlank("1");
blackCommunityUser.setBlankEndTime(calendar.getTime());
blackCommunityUser.setIsBlack("1");
blackCommunityUser.setBlackEndTime(calendar.getTime());
blackCommunityUser.setBlackReason(blackReason);
baseMapper.updateCommunityUser(blackCommunityUser);
baseMapper.updateBlackCommunityUser(blackCommunityUser);
return R.ok();
@ -109,7 +98,76 @@ public class CommunityUserServiceImpl extends ServiceImpl<CommunityUserMapper, C
}
@Override
public void updateCommunityUser(CommunityUser communityUser) {
baseMapper.updateCommunityUser(communityUser);
public void updateBlankCommunityUser(CommunityUser communityUser) {
baseMapper.updateBlackCommunityUser(communityUser);
}
@Override
public R<Object> unBlack(UnBlackListRes unBlackListRes) {
Long tenantId = unBlackListRes.getTenantId();
Long communityId = unBlackListRes.getCommunityId();
Long unBlankUserId = unBlackListRes.getUserId();
Long currentUserId = SecurityUtils.getUserId();
// 当前用户
CommunityUser currentCommunityUser = baseMapper.selectCommunityUser(tenantId, communityId, currentUserId);
if (Objects.isNull(currentCommunityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区用户");
}
if (Objects.equals(currentCommunityUser.getUserType(), 0)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是群主/管理员，无法取消拉黑");
}
// 被取消拉黑的用户
CommunityUser unBlackCommunityUser = baseMapper.selectCommunityUser(tenantId, communityId, unBlankUserId);
if (Objects.isNull(unBlackCommunityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "该用户不在该社区中");
}
CommunityUser communityUser = BeanUtil.toBean(unBlackCommunityUser, CommunityUser.class);
communityUser.setIsBlack("0");
communityUser.setBlackReason(null);
communityUser.setBlackEndTime(null);
baseMapper.updateBlackCommunityUser(communityUser);
return R.ok("取消成功");
}
@Override
public R<Object> manage(CommunityUserManageRes communityUserManageRes) {
Long tenantId = communityUserManageRes.getTenantId();
Long communityId = communityUserManageRes.getCommunityId();
Long manageUserId = communityUserManageRes.getUserId();
Long currentUserId = SecurityUtils.getUserId();
// 当前用户
CommunityUser currentCommunityUser = baseMapper.selectCommunityUser(tenantId, communityId, currentUserId);
if (Objects.isNull(currentCommunityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区用户");
}
if (!Objects.equals(currentCommunityUser.getUserType(), 2)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是群主，无法设置管理");
}
// 设置管理的用户
CommunityUser manageCommunityUser = baseMapper.selectCommunityUser(tenantId, communityId, manageUserId);
if (Objects.isNull(manageCommunityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "该用户不在该社区中");
}
if (Objects.equals(manageCommunityUser.getUserType(), 2)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "该用户已经是群主");
}
if (Objects.equals(manageCommunityUser.getUserType(), 1)) {
manageCommunityUser.setUserType(0);
} else {
manageCommunityUser.setUserType(1);
}
baseMapper.updateManageCommunityUser(manageCommunityUser);
return R.ok("设置成功");
}
}

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/IncomeInfoServiceImpl.java
View File

@ -63,6 +63,7 @@ public class IncomeInfoServiceImpl extends ServiceImpl<IncomeInfoMapper, IncomeI
@Override
public TableDataInfo incomeList(IncomeInfoListPageRes incomeInfoListPageRes) {
Page<IncomeInfo> page = this.initPage(incomeInfoListPageRes);
page.addOrder(new OrderItem("ii.create_time", false));
List<IncomeInfoListVo> incomeInfoList = baseMapper.incomeList(page, incomeInfoListPageRes);
@ -76,9 +77,7 @@ public class IncomeInfoServiceImpl extends ServiceImpl<IncomeInfoMapper, IncomeI
}
private Page<IncomeInfo> initPage(PageDomain pageDomain) {
Page<IncomeInfo> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
page.addOrder(new OrderItem("create_time", false));
return page;
return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
}
}

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java
View File

@ -120,7 +120,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteMapper, Invite> impleme
Calendar now = Calendar.getInstance();
Date startTime = now.getTime();
now.add(Calendar.DAY_OF_YEAR, community.getValidityDay());
now.add(Calendar.YEAR, community.getValidityDay());
Date endTime = now.getTime();
communityUserMapper.insert(CommunityUser

26
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCollectServiceImpl.java
View File

@ -15,12 +15,15 @@ import com.mcwl.communityCenter.domain.Publish;
import com.mcwl.communityCenter.domain.PublishCollect;
import com.mcwl.communityCenter.domain.Question;
import com.mcwl.communityCenter.domain.dto.*;
import com.mcwl.communityCenter.domain.vo.CommentVo;
import com.mcwl.communityCenter.domain.vo.PersonHomeVo;
import com.mcwl.communityCenter.domain.vo.PublishVo;
import com.mcwl.communityCenter.mapper.CommunityMapper;
import com.mcwl.communityCenter.mapper.InviteMapper;
import com.mcwl.communityCenter.mapper.PublishCollectMapper;
import com.mcwl.communityCenter.mapper.PublishMapper;
import com.mcwl.communityCenter.service.PublishCollectService;
import com.mcwl.communityCenter.service.PublishCommentService;
import com.mcwl.communityCenter.service.PublishService;
import com.mcwl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
@ -32,18 +35,35 @@ import java.util.*;
@RequiredArgsConstructor
public class PublishCollectServiceImpl extends ServiceImpl<PublishCollectMapper, PublishCollect> implements PublishCollectService {
private final PublishCommentService publishCommentService;
@Override
public TableDataInfo myCollectList(MyPublishCollectPageRes myPublishCollectPageRes) {
Page<PublishCollect> page = initPage(myPublishCollectPageRes);
page.addOrder(new OrderItem("p.create_time", false));
List<PublishVo> publishVoList = baseMapper.myCollectList(page, myPublishCollectPageRes, SecurityUtils.getUserId());
List<PersonHomeVo> personHomeVoList = new ArrayList<>();
for (PublishVo publishVo : publishVoList) {
PersonHomeVo personHomeVo = BeanUtil.toBean(publishVo, PersonHomeVo.class);
CommentDetailRes commentDetailRes = new CommentDetailRes();
commentDetailRes.setTenantId(myPublishCollectPageRes.getTenantId());
commentDetailRes.setCommunityId(myPublishCollectPageRes.getCommunityId());
commentDetailRes.setOperatorId(publishVo.getId());
List<CommentVo> commentVoList = publishCommentService.getComment(commentDetailRes).getData();
personHomeVo.setCommentList(commentVoList);
personHomeVoList.add(personHomeVo);
}
// 封装分页信息
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
rspData.setRows(publishVoList);
rspData.setRows(personHomeVoList);
rspData.setTotal(page.getTotal());
return rspData;
}
@ -64,9 +84,7 @@ public class PublishCollectServiceImpl extends ServiceImpl<PublishCollectMapper,
}
private Page<PublishCollect> initPage(PageDomain pageDomain) {
Page<PublishCollect> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
page.addOrder(new OrderItem("create_time", false));
return page;
return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
}

6
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java
View File

@ -57,7 +57,7 @@ public class PublishCommentServiceImpl extends ServiceImpl<PublishCommentMapper,
private final CommunityUserMapper communityUserMapper;
@Override
public R<Object> getComment(CommentDetailRes commentDetailRes) {
public R<List<CommentVo>> getComment(CommentDetailRes commentDetailRes) {
Long tenantId = commentDetailRes.getTenantId();
Long communityId = commentDetailRes.getCommunityId();
Long operatorId = commentDetailRes.getOperatorId();
@ -90,7 +90,7 @@ public class PublishCommentServiceImpl extends ServiceImpl<PublishCommentMapper,
return R.fail(HttpStatus.SHOW_ERROR_MSG,"评论失败，您不是该社区成员");
}
if ("1".equals(communityUser.getIsBlank())) {
if ("1".equals(communityUser.getIsBlack())) {
return R.fail(HttpStatus.SHOW_ERROR_MSG,"评论失败，您已被拉黑");
}
@ -101,7 +101,7 @@ public class PublishCommentServiceImpl extends ServiceImpl<PublishCommentMapper,
PublishComment publishComment = new PublishComment();
BeanUtil.copyProperties(commentRes, publishComment);
publishComment.setOperatorId(operatorId);
publishComment.setPublishId(operatorId);
publishComment.setUserId(SecurityUtils.getUserId());
publishComment.setType(0);

2
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishLikeServiceImpl.java
View File

@ -51,7 +51,7 @@ public class PublishLikeServiceImpl extends ServiceImpl<PublishLikeMapper, Publi
throw new ServiceException("点赞失败，您不是该社区成员", HttpStatus.SHOW_ERROR_MSG);
}
if ("1".equals(communityUser.getIsBlank())) {
if ("1".equals(communityUser.getIsBlack())) {
throw new ServiceException("点赞失败，您已被拉黑", HttpStatus.SHOW_ERROR_MSG);
}

90
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishServiceImpl.java
View File

@ -19,16 +19,18 @@ import com.mcwl.common.utils.StringUtils;
import com.mcwl.communityCenter.constant.AdviceConstant;
import com.mcwl.communityCenter.domain.*;
import com.mcwl.communityCenter.domain.dto.*;
import com.mcwl.communityCenter.domain.vo.CommentVo;
import com.mcwl.communityCenter.domain.vo.PersonHomeVo;
import com.mcwl.communityCenter.domain.vo.PublishVo;
import com.mcwl.communityCenter.mapper.*;
import com.mcwl.communityCenter.service.PublishCollectService;
import com.mcwl.communityCenter.service.PublishService;
import com.mcwl.communityCenter.service.*;
import com.mcwl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import nonapi.io.github.classgraph.concurrency.AutoCloseableExecutorService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.temporal.ValueRange;
import java.util.*;
import java.util.concurrent.ThreadPoolExecutor;
@ -46,19 +48,26 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
private final PublishCollectService publishCollectService;
private final PublishCommentService publishCommentService;
private final PublishMapper publishMapper;
private final PublishLikeMapper publishLikeMapper;
private final CommunityAdviceMapper communityAdviceMapper;
private final QuestionService questionService;
@Override
public PublishVo getDetail(PublishDetailRes publishDetailRes) {
Long id = publishDetailRes.getId();
Long publishId = publishDetailRes.getPublishId();
Long tenantId = publishDetailRes.getTenantId();
Long communityId = publishDetailRes.getCommunityId();
// 根据id和租户id和社区id查询发布信息
Publish publish = baseMapper.selectByIdAndTenantIdAndCommunityId(id, tenantId, communityId);
Publish publish = baseMapper.selectByIdAndTenantIdAndCommunityId(publishId, tenantId, communityId);
if (Objects.isNull(publish)) {
return null;
@ -90,7 +99,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区成员");
}
if ("1".equals(communityUser.getIsBlank())) {
if ("1".equals(communityUser.getIsBlack())) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您已被拉黑");
}
@ -100,7 +109,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
if (Objects.isNull(publish.getPublishTime())) {
publish.setPublishTime(new Date());
}
baseMapper.insert(publish);
baseMapper.insertPublish(publish);
return R.ok();
}
@ -108,6 +117,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
public TableDataInfo getPublishList(PublishPageRes publishPageRes) {
Page<Publish> page = this.initPage(publishPageRes);
page.addOrder(new OrderItem("create_time", false));
// 根据租户id和社区id查询分页数据
baseMapper.selectByTenantIdAndCommunityIdPage(page, publishPageRes.getTenantId(), publishPageRes.getCommunityId());
@ -139,6 +149,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
public TableDataInfo publishImage(PublishPageRes publishPageRes) {
Page<Publish> page = this.initPage(publishPageRes);
page.addOrder(new OrderItem("create_time", false));
// 根据租户id和社区id和fileUrl不为空查询分页数据
baseMapper.selectByTenantIdAndCommunityIdAndNotNullFilePage(page, publishPageRes.getTenantId(), publishPageRes.getCommunityId());
@ -168,6 +179,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
@Override
public TableDataInfo publishFile(PublishPageRes publishPageRes) {
Page<Publish> page = this.initPage(publishPageRes);
page.addOrder(new OrderItem("create_time", false));
// 根据租户id和社区id和imageUrl不为空查询分页数据
baseMapper.selectByTenantIdAndCommunityIdAndNotNullFilePage(page, publishPageRes.getTenantId(), publishPageRes.getCommunityId());
@ -202,11 +214,38 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
@Override
public TableDataInfo publishList(PublishPageRes publishPageRes) {
Page<Publish> page = this.initPage(publishPageRes);
page.addOrder(new OrderItem("create_time", false));
List<Publish> publishList = baseMapper.publishList(page, publishPageRes);
List<PublishVo> publishVoList = BeanUtil.copyToList(publishList, PublishVo.class);
for (PublishVo publishVo : publishVoList) {
SysUser sysUser = sysUserService.selectUserById(publishVo.getUserId());
publishVo.setUserName(sysUser.getNickName());
publishVo.setAvatar(sysUser.getAvatar());
PublishLikeRes publishLikeRes = new PublishLikeRes(publishVo.getTenantId(), publishVo.getCommunityId(), publishVo.getId());
PublishLike publishLike = publishLikeMapper.selectPublishLike(publishLikeRes, SecurityUtils.getUserId());
if (Objects.nonNull(publishLike)) {
publishVo.setIsLike(1);
} else {
publishVo.setIsLike(0);
}
PublishCollectRes publishCollectRes = new PublishCollectRes(publishVo.getTenantId(), publishVo.getCommunityId(), publishVo.getId());
PublishCollect publishCollect = publishCollectService.getPublishCollect(publishCollectRes, SecurityUtils.getUserId());
if (Objects.nonNull(publishCollect)) {
publishVo.setIsCollect(1);
} else {
publishVo.setIsCollect(0);
}
}
// 封装返回
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setRows(publishList);
tableDataInfo.setRows(publishVoList);
tableDataInfo.setTotal(page.getTotal());
tableDataInfo.setCode(HttpStatus.SUCCESS);
tableDataInfo.setMsg("查询成功");
@ -216,11 +255,28 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
@Override
public TableDataInfo myPublishList(MyPublishPageRes myPublishPageRes) {
Page<Publish> page = this.initPage(myPublishPageRes);
page.addOrder(new OrderItem("p.create_time", false));
List<PublishVo> publishVoList = baseMapper.myPublishList(page, myPublishPageRes, SecurityUtils.getUserId());
List<PersonHomeVo> personHomeVoList = new ArrayList<>();
for (PublishVo publishVo : publishVoList) {
PersonHomeVo personHomeVo = BeanUtil.toBean(publishVo, PersonHomeVo.class);
CommentDetailRes commentDetailRes = new CommentDetailRes();
commentDetailRes.setTenantId(myPublishPageRes.getTenantId());
commentDetailRes.setCommunityId(myPublishPageRes.getCommunityId());
commentDetailRes.setOperatorId(publishVo.getId());
List<CommentVo> commentVoList = publishCommentService.getComment(commentDetailRes).getData();
personHomeVo.setCommentList(commentVoList);
personHomeVoList.add(personHomeVo);
}
// 封装返回
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setRows(publishVoList);
tableDataInfo.setRows(personHomeVoList);
tableDataInfo.setTotal(page.getTotal());
tableDataInfo.setCode(HttpStatus.SUCCESS);
tableDataInfo.setMsg("查询成功");
@ -279,10 +335,20 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
communityAdviceMapper.insert(communityAdvice);
}
private Page<Publish> initPage(PageDomain pageDomain) {
Page<Publish> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
page.addOrder(new OrderItem("create_time", false));
@Override
public TableDataInfo getPersonHomeList(PersonHomePageRes personHomePageRes) {
Integer type = personHomePageRes.getType();
switch (type) {
case 1:
return questionService.myQuestionList(BeanUtil.toBean(personHomePageRes, QuestionPageRes.class));
case 2:
return publishCollectService.myCollectList(BeanUtil.toBean(personHomePageRes, MyPublishCollectPageRes.class));
default:
return this.myPublishList(BeanUtil.toBean(personHomePageRes, MyPublishPageRes.class));
}
}
return page;
private Page<Publish> initPage(PageDomain pageDomain) {
return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
}
}

8
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java
View File

@ -59,7 +59,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
if (Objects.isNull(communityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区成员，不能评论");
}
if ("1".equals(communityUser.getIsBlank())) {
if ("1".equals(communityUser.getIsBlack())) {
return R.fail(HttpStatus.SHOW_ERROR_MSG,"您已被拉黑");
}
@ -169,11 +169,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
Page<QuestionComment> page = new Page<>(questionCommentPageRes.getPageNum(), questionCommentPageRes.getPageSize());
if (StringUtils.isBlank(questionCommentPageRes.getOrderByColumn())) {
questionCommentPageRes.setOrderByColumn("create_time");
}
OrderItem orderItem = OrderItem.desc(questionCommentPageRes.getOrderByColumn());
page.addOrder(orderItem);
page.addOrder(new OrderItem("create_time", false));
return page;

44
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java
View File

@ -15,13 +15,14 @@ import com.mcwl.common.utils.StringUtils;
import com.mcwl.communityCenter.constant.AdviceConstant;
import com.mcwl.communityCenter.constant.StatusConstant;
import com.mcwl.communityCenter.domain.*;
import com.mcwl.communityCenter.domain.dto.QuestionDetailRes;
import com.mcwl.communityCenter.domain.dto.QuestionPageRes;
import com.mcwl.communityCenter.domain.dto.QuestionReplyRes;
import com.mcwl.communityCenter.domain.dto.QuestionRes;
import com.mcwl.communityCenter.domain.dto.*;
import com.mcwl.communityCenter.domain.vo.CommentVo;
import com.mcwl.communityCenter.domain.vo.PersonHomeVo;
import com.mcwl.communityCenter.domain.vo.QuestionCommentVo;
import com.mcwl.communityCenter.domain.vo.QuestionVo;
import com.mcwl.communityCenter.mapper.*;
import com.mcwl.communityCenter.service.CommunityService;
import com.mcwl.communityCenter.service.QuestionCommentService;
import com.mcwl.communityCenter.service.QuestionService;
import com.mcwl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
@ -49,6 +50,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
private final CommunityUserMapper communityUserMapper;
private final QuestionCommentService questionCommentService;
/**
* 添加问题
*
@ -70,17 +73,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
return R.fail(HttpStatus.SHOW_ERROR_MSG, "租户或社区不存在");
}
if (Objects.equals(questionUserId, userId)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不能提问自己的问题");
}
//提问人（userId）是否在社区中
CommunityUser communityUser = communityUserMapper.selectCommunityUser(tenantId, communityId, userId);
if (Objects.isNull(communityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区成员，不能提问");
}
if ("1".equals(communityUser.getIsBlank())) {
if ("1".equals(communityUser.getIsBlack())) {
return R.fail(HttpStatus.SHOW_ERROR_MSG, "您已被拉黑");
}
@ -239,13 +238,38 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
public TableDataInfo myQuestionList(QuestionPageRes questionPageRes) {
Page<Question> page = initPage(questionPageRes);
List<Question> questionList = baseMapper.myQuestionList(page, questionPageRes, SecurityUtils.getUserId());
List<PersonHomeVo> personHomeVoList = new ArrayList<>();
for (Question question : questionList) {
PersonHomeVo personHomeVo = BeanUtil.toBean(question, PersonHomeVo.class);
personHomeVo.setImageUrl(question.getQuestionUrl());
List<CommentVo> commentList = new ArrayList<>();
QuestionCommentPageRes questionCommentPageRes = new QuestionCommentPageRes();
questionCommentPageRes.setTenantId(questionPageRes.getTenantId());
questionCommentPageRes.setCommunityId(questionPageRes.getCommunityId());
questionCommentPageRes.setQuestionId(question.getId());
questionCommentPageRes.setPageNum(1);
questionCommentPageRes.setPageSize(10);
TableDataInfo tableDataInfo = questionCommentService.listByPage(questionCommentPageRes);
List<QuestionCommentVo> questionCommentList = (List<QuestionCommentVo>) tableDataInfo.getRows();
for (QuestionCommentVo questionCommentVo : questionCommentList) {
CommentVo commentVo = BeanUtil.toBean(questionCommentVo, CommentVo.class);
SysUser sysUser = sysUserService.selectUserById(questionCommentVo.getUserId());
commentVo.setUserName(sysUser.getNickName());
commentVo.setUserAvatar(sysUser.getAvatar());
commentList.add(commentVo);
}
personHomeVo.setCommentList(commentList);
personHomeVoList.add(personHomeVo);
}
// 封装分页信息
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
rspData.setRows(questionList);
rspData.setRows(personHomeVoList);
rspData.setTotal(page.getTotal());
return rspData;
}

10
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/task/CommunityUserTask.java
View File

@ -23,12 +23,12 @@ public class CommunityUserTask {
List<CommunityUser> communityUserList = communityUserService.getAllCommunityUser();
for (CommunityUser communityUser : communityUserList) {
String isBlank = communityUser.getIsBlank();
if ("1".equals(isBlank) && communityUser.getBlankEndTime().getTime() < System.currentTimeMillis()) {
communityUser.setIsBlank("0");
communityUser.setBlankEndTime(null);
String isBlank = communityUser.getIsBlack();
if ("1".equals(isBlank) && communityUser.getBlackEndTime().getTime() < System.currentTimeMillis()) {
communityUser.setIsBlack("0");
communityUser.setBlackEndTime(null);
communityUser.setBlackReason(null);
communityUserService.updateCommunityUser(communityUser);
communityUserService.updateBlankCommunityUser(communityUser);
}
}

6
mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityFileLogMapper.xml
View File

@ -3,6 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.communityCenter.mapper.CommunityFileLogMapper">
<insert id="saveCommunityFileLog">
insert into cc_community_file_log
(tenant_id, community_id, community_file_id, download_user_id)
values (#{communityFileLog.tenantId}, #{communityFileLog.communityId}, #{communityFileLog.communityFileId},
#{communityFileLog.downloadUserId})
</insert>
<select id="getUserAvatarList" resultType="java.lang.String">
select su.avatar

8
mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityFileMapper.xml
View File

@ -17,4 +17,12 @@
</if>
order by cf.create_time desc
</select>
<select id="selectCommunityFile" resultType="com.mcwl.communityCenter.domain.CommunityFile">
select *
from cc_community_file
where tenant_id = #{tenantId}
and community_id = #{communityId}
and id = #{fileId}
and del_flag = '0'
</select>
</mapper>

12
mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml
View File

@ -109,9 +109,15 @@
where cu.user_id = #{userId}
and c.del_flag = '0'
and cu.del_flag = '0'
<if test="searchContent != null and searchContent != ''">
and (c.community_name like concat('%', #{searchContent}, '%')
or c.description like concat('%', #{searchContent}, '%'))
<if test="joinCommunityListPageRes.isMyCreate == 1">
and c.tenant_id = #{userId}
</if>
<if test="joinCommunityListPageRes.isMyCreate == 0">
and c.tenant_id != #{userId}
</if>
<if test="joinCommunityListPageRes.searchContent != null and joinCommunityListPageRes.searchContent != ''">
and (c.community_name like concat('%', #{joinCommunityListPageRes.searchContent}, '%')
or c.description like concat('%', #{joinCommunityListPageRes.searchContent}, '%'))
</if>
</select>
</mapper>

56
mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml
View File

@ -3,27 +3,40 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.communityCenter.mapper.CommunityUserMapper">
<update id="updateCommunityUser">
<update id="updateBlackCommunityUser">
update cc_community_user
set is_blank = #{blackCommunityUser.isBlank},
start_time = #{blackCommunityUser.startTime},
end_time = #{blackCommunityUser.endTime}
set is_black = #{blackCommunityUser.isBlack},
black_reason = #{blackCommunityUser.blackReason},
black_end_time = #{blackCommunityUser.blackEndTime}
where tenant_id = #{blackCommunityUser.tenantId}
and community_id = #{blackCommunityUser.communityId}
and user_id = #{blackCommunityUser.userId}
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and del_flag = '0';
</update>
<update id="updateManageCommunityUser">
update cc_community_user
set user_type = #{manageCommunityUser.userType}
where tenant_id = #{manageCommunityUser.tenantId}
and community_id = #{manageCommunityUser.communityId}
and user_id = #{manageCommunityUser.userId}
and (black_end_time is null or NOW() &gt;= black_end_time)
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and del_flag = '0';
</update>
<select id="selectByTenantIdAndCommunityIdAndUserId"
resultType="com.mcwl.communityCenter.domain.CommunityUser">
select id,
tenant_id,
community_id,
user_id
select *
from cc_community_user
where tenant_id = #{tenantId}
and community_id = #{communityId}
and user_id = #{userId}
and (black_end_time is null or NOW() &gt;= black_end_time)
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and del_flag = '0';
</select>
<select id="getJoinNum" resultType="java.lang.Integer">
@ -31,6 +44,8 @@
from cc_community_user
where tenant_id = #{tenantId}
and community_id = #{communityId}
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and del_flag = '0';
</select>
<select id="isJoinCommunity" resultType="java.lang.Integer">
@ -39,6 +54,8 @@
where tenant_id = #{tenantId}
and community_id = #{communityId}
and user_id = #{userId}
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and del_flag = '0';
</select>
<select id="getCommunityUserList" resultType="com.mcwl.communityCenter.domain.vo.CommunityUserVo">
@ -46,22 +63,26 @@
cu.tenant_id,
cu.community_id,
cu.user_id,
cu.user_type,
cu.is_black,
u.avatar,
u.nick_name,
IF(cu.community_price != 0, '收费', '免费') AS join_type,
cu.start_time,
u.login_date,
cu.end_time
from cc_community_user cu
left join sys_user u on cu.user_id = u.user_id
<where>
cu.community_id = #{communityUserListPageRes.communityId}
and cu.tenant_id = #{communityUserListPageRes.tenantId}
and cu.del_flag = '0'
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= cu.start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00')&lt;= cu.end_time) or (start_time is null and end_time is null))
<if test="communityUserListPageRes.searchContent != null and communityUserListPageRes.searchContent != ''">
and u.nick_name like concat('%', #{communityUserListPageRes.searchContent}, '%')
</if>
and (cu.blank_end_time is null or NOW() &gt;= cu.blank_end_time)
and cu.del_flag = '0'
</where>
order by cu.user_type desc, cu.is_black, cu.create_time
</select>
<select id="selectCommunityUser" resultType="com.mcwl.communityCenter.domain.CommunityUser">
select id,
@ -73,13 +94,16 @@
community_price,
start_time,
end_time,
is_blank,
is_black,
black_reason,
blank_end_time
black_end_time
from cc_community_user
where tenant_id = #{tenantId}
and community_id = #{communityId}
and user_id = #{userId}
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and (black_end_time is null or NOW() &gt;= black_end_time)
</select>
<select id="getAllCommunityUser" resultType="com.mcwl.communityCenter.domain.CommunityUser">
select id,
@ -91,10 +115,12 @@
community_price,
start_time,
end_time,
is_blank,
is_black,
black_reason,
blank_end_time
black_end_time
from cc_community_user
where del_flag = '0'
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
</select>
</mapper>

6
mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCollectMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="com.mcwl.communityCenter.mapper.PublishCollectMapper">
<insert id="savePublishCollect">
insert into cc_publish_collect(tenant_id, community_id, publish_id, user_id)
values (#{publishCollect.tenantId}, #{publishCollect.communityId}, #{publishCollect.publishId}, #{userId})
values (#{publishCollect.tenantId}, #{publishCollect.communityId}, #{publishCollect.publishId}, #{publishCollect.userId})
</insert>
<update id="updatePublishCollect">
update cc_publish_collect
@ -23,8 +23,8 @@
and p.tenant_id = pc.tenant_id
and p.community_id = pc.community_id
<where>
and pc.tenant_id = #{myPublishPageRes.tenantId}
and pc.community_id = #{myPublishPageRes.communityId}
and pc.tenant_id = #{myPublishCollectPageRes.tenantId}
and pc.community_id = #{myPublishCollectPageRes.communityId}
and pc.user_id = #{userId}
and pc.del_flag = '0'
</where>

6
mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCommentLikeMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.communityCenter.mapper.PublishCommentLikeMapper">
<update id="updateDelFlagById">
update cc_comment_like
update cc_publish_comment_like
set del_flag = #{publishCommentLike.delFlag}
where tenant_id = #{publishCommentLike.tenantId}
and community_id = #{publishCommentLike.communityId}
@ -13,13 +13,13 @@
<select id="selectByTenantIdAndCommunityIdAndCommentId"
resultType="com.mcwl.communityCenter.domain.PublishCommentLike">
select * from cc_comment_like
select * from cc_publish_comment_like
where tenant_id = #{tenantId}
and community_id = #{communityId}
and comment_id = #{commentId}
</select>
<select id="selectLike" resultType="com.mcwl.communityCenter.domain.PublishCommentLike">
select * from cc_comment_like
select * from cc_publish_comment_like
where tenant_id = #{publishCommentLikeRes.tenantId}
and community_id = #{publishCommentLikeRes.communityId}
and publish_id = #{publishCommentLikeRes.publishId}

16
mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCommentMapper.xml
View File

@ -4,10 +4,10 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.communityCenter.mapper.PublishCommentMapper">
<update id="deleteByIdAndTenantIdAndCommunityIdAndOperatorId">
update cc_comment set del_flag = '2'
update cc_publish_comment set del_flag = '2'
where tenant_id = #{tenantId}
and community_id = #{communityId}
and operator_id = #{operatorId}
and publish_id = #{operatorId}
and type = 0
</update>
@ -16,17 +16,17 @@
select id,
tenant_id,
community_id,
operator_id,
publish_id,
user_id,
content,
parent_id,
type,
like_num,
create_time
from cc_comment
from cc_publish_comment
where tenant_id = #{tenantId}
and community_id = #{communityId}
and operator_id = #{operatorId}
and publish_id = #{operatorId}
and type = 0
and del_flag = '0'
order by create_time
@ -36,17 +36,17 @@
select id,
tenant_id,
community_id,
operator_id,
publish_id,
user_id,
content,
parent_id,
type,
like_num,
create_time
from cc_comment
from cc_publish_comment
where tenant_id = #{tenantId}
and community_id = #{communityId}
and operator_id = #{operatorId}
and publish_id = #{operatorId}
and type = 0
and del_flag = '0'
</select>

8
mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishMapper.xml
View File

@ -3,6 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.communityCenter.mapper.PublishMapper">
<insert id="insertPublish">
insert into cc_publish
(tenant_id, community_id, user_id, content, image_url, file_url, file_name, publish_time)
values (#{publish.tenantId}, #{publish.communityId}, #{publish.userId}, #{publish.content}, #{publish.imageUrl},
#{publish.fileUrl}, #{publish.fileName}, #{publish.publishTime})
</insert>
<update id="elitePublish">
update cc_publish
set is_elite = !is_elite
@ -97,12 +103,14 @@
and tenant_id = #{publishPageRes.tenantId}
and community_id = #{publishPageRes.communityId}
and del_flag = '0'
<if test="publishPageRes.type != null">
<if test="publishPageRes.type == 0">
and user_id = #{publishPageRes.tenantId}
</if>
<if test="publishPageRes.type == 1">
and is_elite = 1
</if>
</if>
</where>
</select>
<select id="myPublishList" resultType="com.mcwl.communityCenter.domain.vo.PublishVo">

9
mcwl-framework/src/main/java/com/mcwl/framework/security/handle/AuthenticationEntryPointImpl.java
View File

@ -21,18 +21,17 @@ import com.mcwl.common.utils.StringUtils;
* @author mcwl
*/
@Component
public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable
{
public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable {
private static final long serialVersionUID = -8970718410437077606L;
@Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
throws IOException
{
throws IOException {
int code = HttpStatus.UNAUTHORIZED;
System.out.println("e = " + e);
if (e.getCause() != null) {
if (e.getCause() instanceof RedisCommandTimeoutException) {
ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.warn("网络超时，请检查网络稍后重试")));
ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SHOW_ERROR_MSG, "网络超时，请检查网络稍后重试")));
}
}
String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());