From 6707696cf957f4fda34e0151c26a6190d16541a3 Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sun, 19 Mar 2023 22:32:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E9=87=8D=E6=9E=84=20=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA"?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BC=96=E7=A0=81"=E5=B7=B2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WfCategoryController.java | 33 ++++++------- .../workflow/WfModelController.java | 4 +- .../com/ruoyi/workflow/domain/WfCategory.java | 4 ++ .../workflow/domain/bo/WfCategoryBo.java | 48 ------------------- .../workflow/service/IWfCategoryService.java | 18 +++---- .../service/impl/WfCategoryServiceImpl.java | 30 ++++++------ .../src/views/workflow/category/index.vue | 8 +--- 7 files changed, 47 insertions(+), 98 deletions(-) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCategoryBo.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java index 2641df89..8ab6af56 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java @@ -8,12 +8,9 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.workflow.domain.bo.WfCategoryBo; +import com.ruoyi.workflow.domain.WfCategory; import com.ruoyi.workflow.domain.vo.WfCategoryVo; import com.ruoyi.workflow.service.IWfCategoryService; import lombok.RequiredArgsConstructor; @@ -45,8 +42,8 @@ public class WfCategoryController extends BaseController { */ @SaCheckPermission("workflow:category:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) WfCategoryBo bo, PageQuery pageQuery) { - return categoryService.queryPageList(bo, pageQuery); + public TableDataInfo list(WfCategory category, PageQuery pageQuery) { + return categoryService.queryPageList(category, pageQuery); } /** @@ -54,8 +51,8 @@ public class WfCategoryController extends BaseController { */ @SaCheckLogin @GetMapping("/listAll") - public R> listAll(@Validated(QueryGroup.class) WfCategoryBo bo) { - return R.ok(categoryService.queryList(bo)); + public R> listAll(WfCategory category) { + return R.ok(categoryService.queryList(category)); } /** @@ -64,8 +61,8 @@ public class WfCategoryController extends BaseController { @SaCheckPermission("workflow:category:export") @Log(title = "流程分类", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(@Validated WfCategoryBo bo, HttpServletResponse response) { - List list = categoryService.queryList(bo); + public void export(@Validated WfCategory category, HttpServletResponse response) { + List list = categoryService.queryList(category); ExcelUtil.exportExcel(list, "流程分类", WfCategoryVo.class, response); } @@ -86,11 +83,11 @@ public class WfCategoryController extends BaseController { @Log(title = "流程分类", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WfCategoryBo categoryBo) { - if (!categoryService.checkCategoryCodeUnique(categoryBo.getCode())) { - return R.fail("新增流程分类'" + categoryBo.getCategoryName() + "'失败，流程编码已存在"); + public R add(@Validated @RequestBody WfCategory category) { + if (!categoryService.checkCategoryCodeUnique(category)) { + return R.fail("新增流程分类'" + category.getCategoryName() + "'失败，流程编码已存在"); } - return toAjax(categoryService.insertCategory(categoryBo)); + return toAjax(categoryService.insertCategory(category)); } /** @@ -100,11 +97,11 @@ public class WfCategoryController extends BaseController { @Log(title = "流程分类", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody WfCategoryBo categoryBo) { - if (!categoryService.checkCategoryCodeUnique(categoryBo.getCode())) { - return R.fail("修改流程分类'" + categoryBo.getCategoryName() + "'失败，流程编码已存在"); + public R edit(@Validated @RequestBody WfCategory category) { + if (!categoryService.checkCategoryCodeUnique(category)) { + return R.fail("修改流程分类'" + category.getCategoryName() + "'失败，流程编码已存在"); } - return toAjax(categoryService.updateCategory(categoryBo)); + return toAjax(categoryService.updateCategory(category)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfModelController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfModelController.java index 53dbe2fc..a48074fc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfModelController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfModelController.java @@ -12,7 +12,7 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.workflow.domain.bo.WfCategoryBo; +import com.ruoyi.workflow.domain.WfCategory; import com.ruoyi.workflow.domain.bo.WfModelBo; import com.ruoyi.workflow.domain.vo.WfCategoryVo; import com.ruoyi.workflow.domain.vo.WfModelExportVo; @@ -176,7 +176,7 @@ public class WfModelController extends BaseController { public void export(WfModelBo modelBo, HttpServletResponse response) { List list = modelService.list(modelBo); List listVo = BeanUtil.copyToList(list, WfModelExportVo.class); - List categoryVos = categoryService.queryList(new WfCategoryBo()); + List categoryVos = categoryService.queryList(new WfCategory()); Map categoryMap = categoryVos.stream() .collect(Collectors.toMap(WfCategoryVo::getCode, WfCategoryVo::getCategoryName)); for (WfModelExportVo exportVo : listVo) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfCategory.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfCategory.java index f432db93..0ecb7046 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfCategory.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfCategory.java @@ -7,6 +7,8 @@ import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; + /** * 流程分类对象 wf_category * @@ -28,10 +30,12 @@ public class WfCategory extends BaseEntity { /** * 分类名称 */ + @NotBlank(message = "分类名称不能为空") private String categoryName; /** * 分类编码 */ + @NotBlank(message = "分类编码不能为空") private String code; /** * 备注 diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCategoryBo.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCategoryBo.java deleted file mode 100644 index b6fb860a..00000000 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCategoryBo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.workflow.domain.bo; - -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * 流程分类业务对象 - * - * @author KonBAI - * @date 2022-01-15 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class WfCategoryBo extends BaseEntity { - - /** - * 分类ID - */ - @NotNull(message = "分类ID不能为空", groups = { EditGroup.class }) - private Long categoryId; - - /** - * 分类名称 - */ - @NotBlank(message = "分类名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String categoryName; - - /** - * 分类编码 - */ - @NotBlank(message = "分类编码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String code; - - /** - * 备注 - */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) - private String remark; - - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfCategoryService.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfCategoryService.java index f94f88d9..c803ef91 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfCategoryService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfCategoryService.java @@ -2,7 +2,7 @@ package com.ruoyi.workflow.service; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.workflow.domain.bo.WfCategoryBo; +import com.ruoyi.workflow.domain.WfCategory; import com.ruoyi.workflow.domain.vo.WfCategoryVo; import java.util.Collection; @@ -24,27 +24,27 @@ public interface IWfCategoryService { /** * 查询列表 */ - TableDataInfo queryPageList(WfCategoryBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(WfCategory category, PageQuery pageQuery); /** * 查询列表 */ - List queryList(WfCategoryBo categoryBo); + List queryList(WfCategory category); /** * 新增流程分类 * - * @param categoryBo 流程分类信息 + * @param category 流程分类信息 * @return 结果 */ - int insertCategory(WfCategoryBo categoryBo); + int insertCategory(WfCategory category); /** * 编辑流程分类 - * @param categoryBo 流程分类信息 + * @param category 流程分类信息 * @return 结果 */ - int updateCategory(WfCategoryBo categoryBo); + int updateCategory(WfCategory category); /** * 校验并删除数据 @@ -57,8 +57,8 @@ public interface IWfCategoryService { /** * 校验分类编码是否唯一 * - * @param code 分类编码 + * @param category 流程分类 * @return 结果 */ - boolean checkCategoryCodeUnique(String code); + boolean checkCategoryCodeUnique(WfCategory category); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCategoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCategoryServiceImpl.java index 1f519130..6e78a7fd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCategoryServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCategoryServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,7 +9,6 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.workflow.domain.WfCategory; -import com.ruoyi.workflow.domain.bo.WfCategoryBo; import com.ruoyi.workflow.domain.vo.WfCategoryVo; import com.ruoyi.workflow.mapper.WfCategoryMapper; import com.ruoyi.workflow.service.IWfCategoryService; @@ -37,34 +37,34 @@ public class WfCategoryServiceImpl implements IWfCategoryService { } @Override - public TableDataInfo queryPageList(WfCategoryBo categoryBo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(categoryBo); + public TableDataInfo queryPageList(WfCategory category, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(category); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @Override - public List queryList(WfCategoryBo categoryBo) { - LambdaQueryWrapper lqw = buildQueryWrapper(categoryBo); + public List queryList(WfCategory category) { + LambdaQueryWrapper lqw = buildQueryWrapper(category); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(WfCategoryBo categoryBo) { - Map params = categoryBo.getParams(); + private LambdaQueryWrapper buildQueryWrapper(WfCategory category) { + Map params = category.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(categoryBo.getCategoryName()), WfCategory::getCategoryName, categoryBo.getCategoryName()); - lqw.eq(StringUtils.isNotBlank(categoryBo.getCode()), WfCategory::getCode, categoryBo.getCode()); + lqw.like(StringUtils.isNotBlank(category.getCategoryName()), WfCategory::getCategoryName, category.getCategoryName()); + lqw.eq(StringUtils.isNotBlank(category.getCode()), WfCategory::getCode, category.getCode()); return lqw; } @Override - public int insertCategory(WfCategoryBo categoryBo) { + public int insertCategory(WfCategory categoryBo) { WfCategory add = BeanUtil.toBean(categoryBo, WfCategory.class); return baseMapper.insert(add); } @Override - public int updateCategory(WfCategoryBo categoryBo) { + public int updateCategory(WfCategory categoryBo) { WfCategory update = BeanUtil.toBean(categoryBo, WfCategory.class); return baseMapper.updateById(update); } @@ -80,12 +80,14 @@ public class WfCategoryServiceImpl implements IWfCategoryService { /** * 校验分类编码是否唯一 * - * @param code 分类编码 + * @param category 流程分类 * @return 结果 */ @Override - public boolean checkCategoryCodeUnique(String code) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper().eq(WfCategory::getCode, code)); + public boolean checkCategoryCodeUnique(WfCategory category) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(WfCategory::getCode, category.getCode()) + .ne(ObjectUtil.isNotNull(category.getCategoryId()), WfCategory::getCategoryId, category.getCategoryId())); return !exist; } } diff --git a/ruoyi-ui/src/views/workflow/category/index.vue b/ruoyi-ui/src/views/workflow/category/index.vue index 50e78285..517ad992 100644 --- a/ruoyi-ui/src/views/workflow/category/index.vue +++ b/ruoyi-ui/src/views/workflow/category/index.vue @@ -164,18 +164,12 @@ export default { form: {}, // 表单校验 rules: { - categoryId: [ - { required: true, message: "分类ID不能为空", trigger: "blur" } - ], categoryName: [ { required: true, message: "分类名称不能为空", trigger: "blur" } ], code: [ { required: true, message: "分类编码不能为空", trigger: "blur" } - ], - remark: [ - { required: true, message: "备注不能为空", trigger: "blur" } - ], + ] } }; },