From 0eca5db85472e491da9ffac6ccac1c01c7ab3acb Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Wed, 28 May 2025 09:08:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E5=A2=9E=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=92=8C=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysToolController.java | 36 +++++++++++++++---- .../handler/CustomTenantHandler.java | 12 ++++--- .../mcwl/system/domain/dto/AddToolRes.java | 11 ++++++ .../mcwl/system/domain/dto/EditToolRes.java | 6 ++++ .../com/mcwl/system/domain/vo/ToolVo.java | 13 +++++++ 5 files changed, 68 insertions(+), 10 deletions(-) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysToolController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysToolController.java index 95349c9..3db2cae 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysToolController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysToolController.java @@ -17,11 +17,14 @@ import com.mcwl.system.service.ISysEmailService; import com.mcwl.system.service.ISysToolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -42,12 +45,25 @@ public class SysToolController { */ @GetMapping("listTool") @ApiOperation(value = "查询工具列表") - public R> listTool() { + public R> listTool(@ApiParam(value = "工具类型") @RequestParam(required = false) Integer type) { List sysToolList = sysToolService.list(new LambdaQueryWrapper() + .eq(type != null, SysTool::getType, type) .orderByDesc(SysTool::getStatus) .orderByDesc(SysTool::getCreateTime)); + List toolVoList = new ArrayList<>(); + for (SysTool sysTool : sysToolList) { + ToolVo toolVo = BeanUtil.toBean(sysTool, ToolVo.class); + if (sysTool.getType() == 0) { + toolVo.setTypeName("文本"); + } else if (sysTool.getType() == 1) { + toolVo.setTypeName("图片"); + } else if (sysTool.getType() == 2) { + toolVo.setTypeName("视频"); + } + toolVoList.add(toolVo); + } - return R.ok(BeanUtil.copyToList(sysToolList, ToolVo.class)); + return R.ok(toolVoList); } /** @@ -57,7 +73,15 @@ public class SysToolController { @ApiOperation(value = "按id查询工具") public R getTool(@Valid @NotNull(message = "工具id不能为空") Long toolId) { SysTool sysTool = sysToolService.getById(toolId); - return R.ok(BeanUtil.toBean(sysTool, ToolVo.class)); + ToolVo toolVo = BeanUtil.toBean(sysTool, ToolVo.class); + if (sysTool.getType() == 0) { + toolVo.setTypeName("文本"); + } else if (sysTool.getType() == 1) { + toolVo.setTypeName("图片"); + } else if (sysTool.getType() == 2) { + toolVo.setTypeName("视频"); + } + return R.ok(toolVo); } @PostMapping("addTool") @@ -65,7 +89,7 @@ public class SysToolController { public R addTool(@Valid @RequestBody AddToolRes addToolRes) { SysTool sysTool = BeanUtil.toBean(addToolRes, SysTool.class); - return sysToolService.save(sysTool) ? R.ok(null,"添加成功") : R.fail(null,"添加失败"); + return sysToolService.save(sysTool) ? R.ok(null, "添加成功") : R.fail(null, "添加失败"); } /** @@ -75,7 +99,7 @@ public class SysToolController { @ApiOperation(value = "编辑工具") public R editTool(@Valid @RequestBody EditToolRes editToolRes) { SysTool sysTool = BeanUtil.toBean(editToolRes, SysTool.class); - return sysToolService.updateById(sysTool) ? R.ok(null,"编辑成功") : R.fail(null,"编辑失败"); + return sysToolService.updateById(sysTool) ? R.ok(null, "编辑成功") : R.fail(null, "编辑失败"); } /** @@ -84,7 +108,7 @@ public class SysToolController { @GetMapping("delTool") @ApiOperation(value = "删除工具") public R delTool(@Valid @NotNull(message = "工具id不能为空") Long toolId) { - return sysToolService.removeById(toolId) ? R.ok(null,"删除成功") : R.fail(null,"删除失败"); + return sysToolService.removeById(toolId) ? R.ok(null, "删除成功") : R.fail(null, "删除失败"); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/handler/CustomTenantHandler.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/handler/CustomTenantHandler.java index b1c41ae..faf8595 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/handler/CustomTenantHandler.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/handler/CustomTenantHandler.java @@ -23,10 +23,6 @@ public class CustomTenantHandler implements TenantLineHandler { static { // 通知表 tables.add("cc_advice"); - // 发布评论表 - tables.add("cc_comment"); - // 评论点赞表 - tables.add("cc_comment_like"); // 社区表 tables.add("cc_community"); // 社区文件表 @@ -43,12 +39,20 @@ public class CustomTenantHandler implements TenantLineHandler { tables.add("cc_publish"); // 收藏表 tables.add("cc_publish_collect"); + // 发布评论表 + tables.add("cc_publish_comment"); + // 评论点赞表 + tables.add("cc_publish_comment_like"); + // 发布标签 + tables.add("cc_publish_label"); // 发布点赞表 tables.add("cc_publish_like"); // 提问表 tables.add("cc_question"); // 提问评论表 tables.add("cc_question_comment"); + // 发布举报 + tables.add("cc_report"); diff --git a/mcwl-system/src/main/java/com/mcwl/system/domain/dto/AddToolRes.java b/mcwl-system/src/main/java/com/mcwl/system/domain/dto/AddToolRes.java index 2dafea1..8a63279 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/domain/dto/AddToolRes.java +++ b/mcwl-system/src/main/java/com/mcwl/system/domain/dto/AddToolRes.java @@ -46,4 +46,15 @@ public class AddToolRes { @NotNull(message = "类型不能为空") private Integer type; + /** + * 状态 0不可用 1可用 + */ + @ApiModelProperty(value = "状态 0不可用 1可用") + private Integer status = 1; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; } diff --git a/mcwl-system/src/main/java/com/mcwl/system/domain/dto/EditToolRes.java b/mcwl-system/src/main/java/com/mcwl/system/domain/dto/EditToolRes.java index 3ddcb27..fbc7b2f 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/domain/dto/EditToolRes.java +++ b/mcwl-system/src/main/java/com/mcwl/system/domain/dto/EditToolRes.java @@ -60,4 +60,10 @@ public class EditToolRes { @NotNull(message = "状态不能为空") private Integer status; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + } diff --git a/mcwl-system/src/main/java/com/mcwl/system/domain/vo/ToolVo.java b/mcwl-system/src/main/java/com/mcwl/system/domain/vo/ToolVo.java index 7b7b306..61f1bfd 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/domain/vo/ToolVo.java +++ b/mcwl-system/src/main/java/com/mcwl/system/domain/vo/ToolVo.java @@ -48,6 +48,12 @@ public class ToolVo { @ApiModelProperty(value = "类型 0文本 1图片 2视频") private Integer type; + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String typeName; + /** * 状态 0不可用 1可用 */ @@ -61,4 +67,11 @@ public class ToolVo { @ApiModelProperty(value = "创建时间") private Date createTime; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + }