From 7b7b858cca6975523a7ab884c958c7054d8337c2 Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 24 Oct 2024 10:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8F=E8=A1=A8=E5=A5=97?= =?UTF-8?q?=E9=A4=90=E7=BB=93=E6=9E=84=E8=B7=AF=E5=8A=B2=E3=80=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=8E=B7=E5=8F=96=E9=87=8F=E8=A1=A8=E5=A5=97=E9=A4=90?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysScalePackageController.java | 11 ++-- .../scale}/domain/SysScalePackage.java | 4 +- .../scale}/domain/bo/SysScalePackageBo.java | 15 +++--- .../domain/vo/SysScalePackageDetailVo.java | 52 +++++++++++++++++++ .../scale}/domain/vo/SysScalePackageVo.java | 2 +- .../scale}/mapper/SysScalePackageMapper.java | 7 +-- .../service/ISysScalePackageService.java | 9 ++-- .../impl/SysScalePackageServiceImpl.java | 29 +++++++---- .../mapper/scale}/SysScalePackageMapper.xml | 2 +- 9 files changed, 99 insertions(+), 32 deletions(-) rename ruoyi-modules/{ruoyi-system/src/main/java/org/dromara/system/controller/system => rouyi-scale/src/main/java/org/dromara/scale/controller}/SysScalePackageController.java (91%) rename ruoyi-modules/{ruoyi-system/src/main/java/org/dromara/system => rouyi-scale/src/main/java/org/dromara/scale}/domain/SysScalePackage.java (94%) rename ruoyi-modules/{ruoyi-system/src/main/java/org/dromara/system => rouyi-scale/src/main/java/org/dromara/scale}/domain/bo/SysScalePackageBo.java (87%) create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java rename ruoyi-modules/{ruoyi-system/src/main/java/org/dromara/system => rouyi-scale/src/main/java/org/dromara/scale}/domain/vo/SysScalePackageVo.java (96%) rename ruoyi-modules/{ruoyi-system/src/main/java/org/dromara/system => rouyi-scale/src/main/java/org/dromara/scale}/mapper/SysScalePackageMapper.java (67%) rename ruoyi-modules/{ruoyi-system/src/main/java/org/dromara/system => rouyi-scale/src/main/java/org/dromara/scale}/service/ISysScalePackageService.java (86%) rename ruoyi-modules/{ruoyi-system/src/main/java/org/dromara/system => rouyi-scale/src/main/java/org/dromara/scale}/service/impl/SysScalePackageServiceImpl.java (81%) rename ruoyi-modules/{ruoyi-system/src/main/resources/mapper/system => rouyi-scale/src/main/resources/mapper/scale}/SysScalePackageMapper.xml (69%) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysScalePackageController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysScalePackageController.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java index c3ee264..76d6231 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysScalePackageController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package org.dromara.scale.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; @@ -15,9 +15,10 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysScalePackageBo; -import org.dromara.system.domain.vo.SysScalePackageVo; -import org.dromara.system.service.ISysScalePackageService; +import org.dromara.scale.domain.bo.SysScalePackageBo; +import org.dromara.scale.domain.vo.SysScalePackageDetailVo; +import org.dromara.scale.domain.vo.SysScalePackageVo; +import org.dromara.scale.service.ISysScalePackageService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -65,7 +66,7 @@ public class SysScalePackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:scalePackage:query") @GetMapping("/{packageId}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long packageId) { return R.ok(sysScalePackageService.queryById(packageId)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePackage.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePackage.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePackage.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePackage.java index c53fcca..1e9b029 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysScalePackage.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePackage.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package org.dromara.scale.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.vo.SysScalePackageVo; +import org.dromara.scale.domain.vo.SysScalePackageVo; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePackageBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePackageBo.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePackageBo.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePackageBo.java index 72b926d..dda6a20 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScalePackageBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePackageBo.java @@ -1,14 +1,15 @@ -package org.dromara.system.domain.bo; +package org.dromara.scale.domain.bo; -import io.github.linpeilie.annotations.AutoMapping; -import org.dromara.system.domain.SysScalePackage; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMapping; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.scale.domain.SysScalePackage; import java.util.List; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java new file mode 100644 index 0000000..d75a355 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageDetailVo.java @@ -0,0 +1,52 @@ +package org.dromara.scale.domain.vo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.scale.domain.SysScale; +import org.dromara.scale.domain.SysScalePackage; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + + +/** + * 量表套餐视图对象 sys_scale_package + * + * @author cjw + * @date 2024-10-23 + */ +@Data +@AutoMapper(target = SysScalePackage.class) +public class SysScalePackageDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 量表套餐id + */ + private Long packageId; + + /** + * 套餐名称 + */ + private String packageName; + + /** + * 关联量表id + */ + List scaleDetail; + + /** + * 备注 + */ + private String remark; + + /** + * 状态（0正常 1停用） + */ + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePackageVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePackageVo.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageVo.java index 7273ade..f0fcee0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysScalePackageVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePackageVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package org.dromara.scale.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePackageMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePackageMapper.java similarity index 67% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePackageMapper.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePackageMapper.java index 2c2f06e..62c72a2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysScalePackageMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePackageMapper.java @@ -1,9 +1,10 @@ -package org.dromara.system.mapper; +package org.dromara.scale.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.domain.SysScalePackage; -import org.dromara.system.domain.vo.SysScalePackageVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.scale.domain.SysScalePackage; +import org.dromara.scale.domain.vo.SysScalePackageVo; + /** * 量表套餐Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePackageService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePackageService.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java index ebba2be..61248c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysScalePackageService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java @@ -1,9 +1,10 @@ -package org.dromara.system.service; +package org.dromara.scale.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysScalePackageBo; -import org.dromara.system.domain.vo.SysScalePackageVo; +import org.dromara.scale.domain.bo.SysScalePackageBo; +import org.dromara.scale.domain.vo.SysScalePackageDetailVo; +import org.dromara.scale.domain.vo.SysScalePackageVo; import java.util.Collection; import java.util.List; @@ -22,7 +23,7 @@ public interface ISysScalePackageService { * @param packageId 主键 * @return 量表套餐 */ - SysScalePackageVo queryById(Long packageId); + SysScalePackageDetailVo queryById(Long packageId); /** * 分页查询量表套餐列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePackageServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePackageServiceImpl.java rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java index 55a1c52..8c7bef4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScalePackageServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java @@ -1,6 +1,7 @@ -package org.dromara.system.service.impl; +package org.dromara.scale.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,16 +12,18 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysScalePackage; +import org.dromara.scale.domain.SysScale; +import org.dromara.scale.domain.SysScalePackage; +import org.dromara.scale.domain.bo.SysScalePackageBo; +import org.dromara.scale.domain.vo.SysScalePackageDetailVo; +import org.dromara.scale.domain.vo.SysScalePackageVo; +import org.dromara.scale.mapper.SysScaleMapper; +import org.dromara.scale.mapper.SysScalePackageMapper; +import org.dromara.scale.service.ISysScalePackageService; import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.bo.SysScalePackageBo; -import org.dromara.system.domain.vo.SysScalePackageVo; -import org.dromara.system.mapper.SysScalePackageMapper; import org.dromara.system.mapper.SysTenantMapper; -import org.dromara.system.service.ISysScalePackageService; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; @@ -37,6 +40,7 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService { private final SysScalePackageMapper baseMapper; private final SysTenantMapper tenantMapper; + private final SysScaleMapper scaleMapper; /** * 查询量表套餐 @@ -45,8 +49,15 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService { * @return 量表套餐 */ @Override - public SysScalePackageVo queryById(Long packageId) { - return baseMapper.selectVoById(packageId); + public SysScalePackageDetailVo queryById(Long packageId) { + + SysScalePackage scalePackage = baseMapper.selectById(packageId); + SysScalePackageDetailVo detailVo = MapstructUtils.convert(scalePackage, SysScalePackageDetailVo.class); + List split = StrUtil.split(scalePackage.getScaleIds(), ","); + List sysScales = scaleMapper.selectList(new LambdaQueryWrapper().select(SysScale::getScaleId) + .select(SysScale::getScaleName).in(SysScale::getScaleId, split)); + detailVo.setScaleDetail(sysScales); + return detailVo; } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScalePackageMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePackageMapper.xml similarity index 69% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScalePackageMapper.xml rename to ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePackageMapper.xml index 51c1c8f..4e6b09f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScalePackageMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePackageMapper.xml @@ -2,6 +2,6 @@ - +