diff --git a/blob b/blob index 5369411..3f4216b 100644 Binary files a/blob and b/blob differ diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityController.java index b6d86ed..7a59516 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityController.java @@ -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 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 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 addCommunity(@RequestBody @Valid CommunityRes communityRes) { - communityService.addCommunity(communityRes); - return R.ok(); + @PostMapping("addCommunity") + public R addCommunity(@RequestBody @Valid AddCommunityRes addCommunityRes) { + communityService.addCommunity(addCommunityRes); + return R.ok("社区添加成功"); } /** diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityFileController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityFileController.java index 52856bc..e0fc15e 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityFileController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityFileController.java @@ -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 upload(@RequestBody @Valid CommunityUploadFileRes communityUploadFileRes) { - communityFileService.upload(communityUploadFileRes); - return R.ok(); - } - /** * 社区文件列表 */ @@ -47,5 +39,23 @@ public class CommunityFileController { } + /** + * 社区文件上传 + */ + @ApiOperation(value = "社区文件上传") + @PostMapping("/upload") + public R upload(@RequestBody @Valid CommunityUploadFileRes communityUploadFileRes) { + return communityFileService.upload(communityUploadFileRes); + } + + /** + * 社区文件下载 + */ + @ApiOperation(value = "社区文件下载") + @PostMapping("/download") + public R download(@RequestBody @Valid CommunityDownloadFileRes communityDownloadFileRes) { + return communityFileService.download(communityDownloadFileRes); + } + } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityUserController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityUserController.java index c88871d..481649d 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityUserController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityUserController.java @@ -50,5 +50,25 @@ public class CommunityUserController { return communityUserService.black(blackListRes); } + /** + * 取消拉黑 + */ + @ApiOperation(value = "取消拉黑") + @PostMapping("unBlack") + public R unBlack(@RequestBody @Valid UnBlackListRes unBlackListRes) { + + return communityUserService.unBlack(unBlackListRes); + } + + /** + * 管理/取消管理 + */ + @ApiOperation(value = "管理/取消管理") + @PostMapping("manage") + public R manage(@RequestBody @Valid CommunityUserManageRes communityUserManageRes) { + + return communityUserService.manage(communityUserManageRes); + } + } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PersonHomeController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PersonHomeController.java index 7e7cc56..9819708 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PersonHomeController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PersonHomeController.java @@ -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); } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishCommentController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishCommentController.java index 74830e5..9837609 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishCommentController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishCommentController.java @@ -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 getComment(@RequestBody @Valid CommentDetailRes commentDetailRes) { + public R> getComment(@RequestBody @Valid CommentDetailRes commentDetailRes) { return publishCommentService.getComment(commentDetailRes); } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java index eaf37e0..4f82a37 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java @@ -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(); diff --git a/mcwl-common/src/main/java/com/mcwl/common/utils/obs/ObsUtils.java b/mcwl-common/src/main/java/com/mcwl/common/utils/obs/ObsUtils.java index 91f766d..be8bf80 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/utils/obs/ObsUtils.java +++ b/mcwl-common/src/main/java/com/mcwl/common/utils/obs/ObsUtils.java @@ -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); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityFile.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityFile.java index 96dd8f9..33d7f45 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityFile.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityFile.java @@ -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 diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityUser.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityUser.java index 8efc873..d9c8eb4 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityUser.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/CommunityUser.java @@ -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; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java index f09ea23..e973dac 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java @@ -46,10 +46,15 @@ public class Publish extends BaseEntity { private String imageUrl; /** - * 发布文件 + * 文件url */ private String fileUrl; + /** + * 文件名 + */ + private String fileName; + /** * 发布人 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishComment.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishComment.java index b1f2ced..eeded62 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishComment.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishComment.java @@ -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 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishCommentLike.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishCommentLike.java index a1f8be2..615ca72 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishCommentLike.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/PublishCommentLike.java @@ -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 { /** diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Question.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Question.java index 432eb2e..d44090e 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Question.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Question.java @@ -53,18 +53,6 @@ public class Question extends BaseEntity { */ private String questionUrl; -// /** -// * 回复内容 -// */ -// @ApiModelProperty(value = "答复内容") -// private String reply; -// -// /** -// * 回复时间 -// */ -// @ApiModelProperty(value = "答复时间") -// private Date replyTime; - /** * 是否匿名 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/AddCommunityRes.java similarity index 90% rename from mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityRes.java rename to mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/AddCommunityRes.java index 8a8dfed..a503218 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/AddCommunityRes.java @@ -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; + } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDetailRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDetailRes.java new file mode 100644 index 0000000..48621de --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDetailRes.java @@ -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; + + +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDownloadFileRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDownloadFileRes.java new file mode 100644 index 0000000..e18e230 --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityDownloadFileRes.java @@ -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; + + + +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityFilePageListRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityFilePageListRes.java index 3a0c1c5..f36d7c9 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityFilePageListRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityFilePageListRes.java @@ -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 { diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUploadFileRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUploadFileRes.java index 1dcc50e..d6a0803 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUploadFileRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUploadFileRes.java @@ -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; diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserListPageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserListPageRes.java index a074dde..8cfeea9 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserListPageRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserListPageRes.java @@ -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 diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserManageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserManageRes.java new file mode 100644 index 0000000..ae528a0 --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityUserManageRes.java @@ -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; +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/EditCommunityRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/EditCommunityRes.java new file mode 100644 index 0000000..ef9a952 --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/EditCommunityRes.java @@ -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; + + + +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoListPageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoListPageRes.java index e08faa9..7f2b6bd 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoListPageRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoListPageRes.java @@ -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; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoRes.java index cd6bd3c..9bf4286 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/IncomeInfoRes.java @@ -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; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/JoinCommunityListPageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/JoinCommunityListPageRes.java index 4f6fdff..f8d3241 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/JoinCommunityListPageRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/JoinCommunityListPageRes.java @@ -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; + /** * 搜索内容 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/MyPublishPageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/MyPublishPageRes.java index 9674d56..65d1494 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/MyPublishPageRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/MyPublishPageRes.java @@ -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; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PersonHomePageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PersonHomePageRes.java new file mode 100644 index 0000000..f77c27b --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PersonHomePageRes.java @@ -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; + +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishCollectRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishCollectRes.java index 326cb14..3e260f0 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishCollectRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishCollectRes.java @@ -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 { /** diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishDetailRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishDetailRes.java index de9d936..eccebb8 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishDetailRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishDetailRes.java @@ -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; diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishPageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishPageRes.java index cb87f18..b407162 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishPageRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishPageRes.java @@ -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; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishRes.java index 651f987..107c93d 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishRes.java @@ -39,11 +39,17 @@ public class PublishRes { private String imageUrl; /** - * 发布文件 + * 文件url */ - @ApiModelProperty(value = "发布文件") + @ApiModelProperty(value = "文件url") private String fileUrl; + /** + * 文件名 + */ + @ApiModelProperty(value = "文件名") + private String fileName; + /** * 发布时间 - 定时发布 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/UnBlackListRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/UnBlackListRes.java new file mode 100644 index 0000000..be0e31f --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/UnBlackListRes.java @@ -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; +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommentVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommentVo.java index 6e2b2c8..8fbad90 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommentVo.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommentVo.java @@ -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; + /** * 评论内容 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java index 03c12dc..3844372 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java @@ -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; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityFileVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityFileVo.java index 1d9ecad..6f08a55 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityFileVo.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityFileVo.java @@ -34,12 +34,6 @@ public class CommunityFileVo { @ApiModelProperty(value = "社区id") private Long communityId; - /** - * 文件路径 - */ - @ApiModelProperty(value = "文件路径") - private String fileUrl; - /** * 文件名称 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityUserVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityUserVo.java index bb680c5..abf336c 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityUserVo.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityUserVo.java @@ -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; - /** * 到期时间 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java index 3160bcc..6a9d520 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java @@ -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; + /** * 社区图片 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PersonHomeVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PersonHomeVo.java new file mode 100644 index 0000000..7c3b988 --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PersonHomeVo.java @@ -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 commentList; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + + +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java index 0091d99..d55dbd5 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PublishVo.java @@ -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,16 @@ 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; /** * 点赞数 @@ -98,6 +99,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; + } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileLogMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileLogMapper.java index b6f7493..52a89e8 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileLogMapper.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileLogMapper.java @@ -24,4 +24,7 @@ public interface CommunityFileLogMapper extends BaseMapper { Integer getDownloadCount(@Param("tenantId") Long tenantId, @Param("communityId") Long communityId, @Param("communityFileId") Long communityFileId); + + @InterceptorIgnore(tenantLine = "true") + void saveCommunityFileLog(@Param("communityFileLog") CommunityFileLog communityFileLog); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileMapper.java index 5d0b6bb..8563626 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileMapper.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityFileMapper.java @@ -20,4 +20,9 @@ public interface CommunityFileMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "true") List getCommunityFileList(Page page, @Param("communityFilePageListRes") CommunityFilePageListRes communityFilePageListRes); + + @InterceptorIgnore(tenantLine = "true") + CommunityFile selectCommunityFile(@Param("tenantId") Long tenantId, + @Param("communityId") Long communityId, + @Param("fileId") Long fileId); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java index c82ad01..b871dec 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java @@ -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 { Page page, @Param("userId") Long userId, - @Param("searchContent") - String searchContent); + @Param("joinCommunityListPageRes") + JoinCommunityListPageRes joinCommunityListPageRes); @InterceptorIgnore(tenantLine = "true") void quitCommunity(@Param("tenantId") Long tenantId, diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityUserMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityUserMapper.java index 825e6a4..6cebd9e 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityUserMapper.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityUserMapper.java @@ -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 { @Param("userId") Long userId); @InterceptorIgnore(tenantLine = "true") - void updateCommunityUser(@Param("blackCommunityUser") CommunityUser blackCommunityUser); + void updateBlackCommunityUser(@Param("blackCommunityUser") CommunityUser blackCommunityUser); @InterceptorIgnore(tenantLine = "true") List getAllCommunityUser(); + + void updateManageCommunityUser(@Param("manageCommunityUser") CommunityUser manageCommunityUser); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishCollectMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishCollectMapper.java index ba81667..6a67572 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishCollectMapper.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishCollectMapper.java @@ -27,7 +27,7 @@ public interface PublishCollectMapper extends BaseMapper { 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") diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishMapper.java index c1c1c89..8d3fcb4 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishMapper.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishMapper.java @@ -52,4 +52,7 @@ public interface PublishMapper extends BaseMapper { List myPublishList(Page page, @Param("myPublishPageRes") MyPublishPageRes myPublishPageRes, @Param("userId") Long userId); + + @InterceptorIgnore(tenantLine = "true") + void insertPublish(@Param("publish") Publish publish); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileLogService.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileLogService.java index b6b5c21..e77aec5 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileLogService.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileLogService.java @@ -11,4 +11,6 @@ public interface CommunityFileLogService extends IService { List getUserAvatarList(Long tenantId, Long communityId, Long communityFileId); Integer getDownloadCount(Long tenantId, Long communityId, Long communityFileId); + + void saveCommunityFileLog(CommunityFileLog communityFileLog); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileService.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileService.java index 70fd7ed..5fa58f6 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileService.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityFileService.java @@ -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 { - void upload(CommunityUploadFileRes communityUploadFileRes); + R upload(CommunityUploadFileRes communityUploadFileRes); TableDataInfo getCommunityFileList(CommunityFilePageListRes communityFilePageListRes); + + R download(@Valid CommunityDownloadFileRes communityDownloadFileRes); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityService.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityService.java index 5cbc643..8a87f77 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityService.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityService.java @@ -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 { 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 { * 判断是否加入社区 */ R isJoinCommunity(JoinCommunityRes joinCommunityRes); + + CommunityDetailVo getCommunityDetail(Long communityId); + + void editCommunity(@Valid EditCommunityRes editCommunityRes); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityUserService.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityUserService.java index a061abc..b774420 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityUserService.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/CommunityUserService.java @@ -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 { List getAllCommunityUser(); - void updateCommunityUser(CommunityUser communityUser); + void updateBlankCommunityUser(CommunityUser communityUser); + + R unBlack(@Valid UnBlackListRes unBlackListRes); + + R manage(@Valid CommunityUserManageRes communityUserManageRes); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishCommentService.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishCommentService.java index 9ba82f8..c9e2a14 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishCommentService.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishCommentService.java @@ -28,7 +28,7 @@ public interface PublishCommentService extends IService { * @param commentDetailRes 评论详情参数 * @return 评论详情 */ - R getComment(CommentDetailRes commentDetailRes); + R> getComment(CommentDetailRes commentDetailRes); R addComment(CommentRes commentRes); diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishService.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishService.java index b43ddd6..4fc49d6 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishService.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishService.java @@ -37,4 +37,6 @@ public interface PublishService extends IService { TableDataInfo myPublishList(MyPublishPageRes myPublishPageRes); void collectPublish(@Valid PublishCollectRes publishCollectRes); + + TableDataInfo getPersonHomeList(@Valid PersonHomePageRes personHomePageRes); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityFileLogServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityFileLogServiceImpl.java index 66b8d91..eb58603 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityFileLogServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityFileLogServiceImpl.java @@ -28,4 +28,9 @@ public class CommunityFileLogServiceImpl extends ServiceImpl upload(CommunityUploadFileRes communityUploadFileRes) { Long tenantId = communityUploadFileRes.getTenantId(); Long communityId = communityUploadFileRes.getCommunityId(); - MultipartFile file = communityUploadFileRes.getFile(); - Map 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 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 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 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()); + } } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java index d9cd0ff..296f3b2 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java @@ -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 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 communityList = baseMapper.getMyJoinCommunity(page, SecurityUtils.getUserId(), searchContent); + List communityList = baseMapper.getMyJoinCommunity(page, SecurityUtils.getUserId(), joinCommunityListPageRes); return this.getCommunityVoTableDataInfo(communityList, page.getTotal()); @@ -223,6 +218,18 @@ public class CommunityServiceImpl extends ServiceImpl communityList, Long total) { @@ -261,8 +268,7 @@ public class CommunityServiceImpl extends ServiceImpl page = new Page<>(communityUserListPageRes.getPageNum(), communityUserListPageRes.getPageSize()); - page.addOrder(new OrderItem("create_time", false)); +// page.addOrder(new OrderItem("cu.create_time", false)); List communityUserList = baseMapper.getCommunityUserList(page, communityUserListPageRes); @@ -82,7 +71,7 @@ public class CommunityUserServiceImpl extends ServiceImpl 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 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("设置成功"); } } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/IncomeInfoServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/IncomeInfoServiceImpl.java index 68844a3..80299c6 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/IncomeInfoServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/IncomeInfoServiceImpl.java @@ -63,6 +63,7 @@ public class IncomeInfoServiceImpl extends ServiceImpl page = this.initPage(incomeInfoListPageRes); + page.addOrder(new OrderItem("ii.create_time", false)); List incomeInfoList = baseMapper.incomeList(page, incomeInfoListPageRes); @@ -76,9 +77,7 @@ public class IncomeInfoServiceImpl extends ServiceImpl initPage(PageDomain pageDomain) { - Page page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize()); - page.addOrder(new OrderItem("create_time", false)); - return page; + return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize()); } } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java index 7dcd60a..7a2bd95 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java @@ -120,7 +120,7 @@ public class InviteServiceImpl extends ServiceImpl 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 diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCollectServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCollectServiceImpl.java index f52fb31..756306e 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCollectServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCollectServiceImpl.java @@ -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 implements PublishCollectService { + private final PublishCommentService publishCommentService; + @Override public TableDataInfo myCollectList(MyPublishCollectPageRes myPublishCollectPageRes) { Page page = initPage(myPublishCollectPageRes); + page.addOrder(new OrderItem("p.create_time", false)); List publishVoList = baseMapper.myCollectList(page, myPublishCollectPageRes, SecurityUtils.getUserId()); + List 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 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 initPage(PageDomain pageDomain) { - Page page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize()); - page.addOrder(new OrderItem("create_time", false)); - return page; + return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize()); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java index 5ba9063..dbabea0 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java @@ -57,7 +57,7 @@ public class PublishCommentServiceImpl extends ServiceImpl getComment(CommentDetailRes commentDetailRes) { + public R> getComment(CommentDetailRes commentDetailRes) { Long tenantId = commentDetailRes.getTenantId(); Long communityId = commentDetailRes.getCommunityId(); Long operatorId = commentDetailRes.getOperatorId(); @@ -90,7 +90,7 @@ public class PublishCommentServiceImpl extends ServiceImpl impl private final PublishCollectService publishCollectService; + private final PublishCommentService publishCommentService; + private final PublishMapper publishMapper; 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 +100,7 @@ public class PublishServiceImpl extends ServiceImpl 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 +110,7 @@ public class PublishServiceImpl extends ServiceImpl impl if (Objects.isNull(publish.getPublishTime())) { publish.setPublishTime(new Date()); } - baseMapper.insert(publish); + baseMapper.insertPublish(publish); return R.ok(); } @@ -108,6 +118,7 @@ public class PublishServiceImpl extends ServiceImpl impl public TableDataInfo getPublishList(PublishPageRes publishPageRes) { Page page = this.initPage(publishPageRes); + page.addOrder(new OrderItem("create_time", false)); // 根据租户id和社区id查询分页数据 baseMapper.selectByTenantIdAndCommunityIdPage(page, publishPageRes.getTenantId(), publishPageRes.getCommunityId()); @@ -139,6 +150,7 @@ public class PublishServiceImpl extends ServiceImpl impl public TableDataInfo publishImage(PublishPageRes publishPageRes) { Page page = this.initPage(publishPageRes); + page.addOrder(new OrderItem("create_time", false)); // 根据租户id和社区id和fileUrl不为空查询分页数据 baseMapper.selectByTenantIdAndCommunityIdAndNotNullFilePage(page, publishPageRes.getTenantId(), publishPageRes.getCommunityId()); @@ -168,6 +180,7 @@ public class PublishServiceImpl extends ServiceImpl impl @Override public TableDataInfo publishFile(PublishPageRes publishPageRes) { Page page = this.initPage(publishPageRes); + page.addOrder(new OrderItem("create_time", false)); // 根据租户id和社区id和imageUrl不为空查询分页数据 baseMapper.selectByTenantIdAndCommunityIdAndNotNullFilePage(page, publishPageRes.getTenantId(), publishPageRes.getCommunityId()); @@ -202,11 +215,30 @@ public class PublishServiceImpl extends ServiceImpl impl @Override public TableDataInfo publishList(PublishPageRes publishPageRes) { Page page = this.initPage(publishPageRes); + page.addOrder(new OrderItem("create_time", false)); + List publishList = baseMapper.publishList(page, publishPageRes); + List publishVoList = BeanUtil.copyToList(publishList, PublishVo.class); + for (PublishVo publishVo : publishVoList) { + SysUser sysUser = sysUserService.selectUserById(publishVo.getUserId()); + publishVo.setUserName(sysUser.getNickName()); + publishVo.setAvatar(sysUser.getAvatar()); + + 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 +248,28 @@ public class PublishServiceImpl extends ServiceImpl impl @Override public TableDataInfo myPublishList(MyPublishPageRes myPublishPageRes) { Page page = this.initPage(myPublishPageRes); + page.addOrder(new OrderItem("p.create_time", false)); + List publishVoList = baseMapper.myPublishList(page, myPublishPageRes, SecurityUtils.getUserId()); + List 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 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 +328,20 @@ public class PublishServiceImpl extends ServiceImpl impl communityAdviceMapper.insert(communityAdvice); } - private Page initPage(PageDomain pageDomain) { - Page 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 initPage(PageDomain pageDomain) { + return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize()); } } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java index e817d12..f4e1b97 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java @@ -59,7 +59,7 @@ public class QuestionCommentServiceImpl extends ServiceImpl 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; diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java index e5c47f5..323b740 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java @@ -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 i private final CommunityUserMapper communityUserMapper; + private final QuestionCommentService questionCommentService; + /** * 添加问题 * @@ -70,18 +73,14 @@ public class QuestionServiceImpl extends ServiceImpl 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())) { - return R.fail(HttpStatus.SHOW_ERROR_MSG,"您已被拉黑"); + if ("1".equals(communityUser.getIsBlack())) { + return R.fail(HttpStatus.SHOW_ERROR_MSG, "您已被拉黑"); } Question question = new Question(); @@ -239,13 +238,38 @@ public class QuestionServiceImpl extends ServiceImpl i public TableDataInfo myQuestionList(QuestionPageRes questionPageRes) { Page page = initPage(questionPageRes); List questionList = baseMapper.myQuestionList(page, questionPageRes, SecurityUtils.getUserId()); + List personHomeVoList = new ArrayList<>(); + for (Question question : questionList) { + PersonHomeVo personHomeVo = BeanUtil.toBean(question, PersonHomeVo.class); + personHomeVo.setImageUrl(question.getQuestionUrl()); + + List 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 questionCommentList = (List) 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; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/task/CommunityUserTask.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/task/CommunityUserTask.java index 6effb5c..fc1b26a 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/task/CommunityUserTask.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/task/CommunityUserTask.java @@ -23,12 +23,12 @@ public class CommunityUserTask { List 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); } } diff --git a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityFileLogMapper.xml b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityFileLogMapper.xml index 737917b..0925816 100644 --- a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityFileLogMapper.xml +++ b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityFileLogMapper.xml @@ -3,6 +3,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + 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}) + + \ No newline at end of file diff --git a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml index 2962773..fb55a9a 100644 --- a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml +++ b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml @@ -109,9 +109,15 @@ where cu.user_id = #{userId} and c.del_flag = '0' and cu.del_flag = '0' - - and (c.community_name like concat('%', #{searchContent}, '%') - or c.description like concat('%', #{searchContent}, '%')) + + and c.tenant_id = #{userId} + + + and c.tenant_id != #{userId} + + + and (c.community_name like concat('%', #{joinCommunityListPageRes.searchContent}, '%') + or c.description like concat('%', #{joinCommunityListPageRes.searchContent}, '%')) \ No newline at end of file diff --git a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml index 4a89bb1..7ea994f 100644 --- a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml +++ b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml @@ -3,27 +3,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + 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') >= start_time + AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') <= end_time) or (start_time is null and end_time is null)) + and del_flag = '0'; + + + 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() >= black_end_time) + and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') >= start_time + AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') <= end_time) or (start_time is null and end_time is null)) and del_flag = '0'; \ No newline at end of file diff --git a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCollectMapper.xml b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCollectMapper.xml index a0c6a54..118c2b6 100644 --- a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCollectMapper.xml +++ b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCollectMapper.xml @@ -5,7 +5,7 @@ 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}) update cc_publish_collect @@ -23,8 +23,8 @@ and p.tenant_id = pc.tenant_id and p.community_id = pc.community_id - 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' diff --git a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCommentLikeMapper.xml b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCommentLikeMapper.xml index ba57070..a49e05d 100644 --- a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCommentLikeMapper.xml +++ b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCommentLikeMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - 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 @@ diff --git a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishMapper.xml b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishMapper.xml index e41fc0b..75fbcff 100644 --- a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishMapper.xml +++ b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishMapper.xml @@ -3,6 +3,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + 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}) + update cc_publish set is_elite = !is_elite @@ -65,9 +71,9 @@ create_time from cc_publish where tenant_id = #{tenantId} - and community_id = #{communityId} - and del_flag = '0' - and image_url is not null + and community_id = #{communityId} + and del_flag = '0' + and image_url is not null diff --git a/mcwl-framework/src/main/java/com/mcwl/framework/security/handle/AuthenticationEntryPointImpl.java b/mcwl-framework/src/main/java/com/mcwl/framework/security/handle/AuthenticationEntryPointImpl.java index c53273c..9ac3a00 100644 --- a/mcwl-framework/src/main/java/com/mcwl/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/mcwl-framework/src/main/java/com/mcwl/framework/security/handle/AuthenticationEntryPointImpl.java @@ -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());