diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java index 76d6231..777b99d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePackageController.java @@ -16,7 +16,6 @@ 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.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; @@ -66,7 +65,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/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java index 61248c4..ba71f63 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePackageService.java @@ -3,7 +3,6 @@ package org.dromara.scale.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; 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; @@ -23,7 +22,7 @@ public interface ISysScalePackageService { * @param packageId 主键 * @return 量表套餐 */ - SysScalePackageDetailVo queryById(Long packageId); + SysScalePackageVo queryById(Long packageId); /** * 分页查询量表套餐列表 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java index ee866c5..4c95676 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePackageServiceImpl.java @@ -1,7 +1,6 @@ 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; @@ -12,10 +11,8 @@ 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.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; @@ -49,16 +46,16 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService { * @return 量表套餐 */ @Override - 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, SysScale::getScaleName) - .in(SysScale::getScaleId, split)); - detailVo.setScaleDetail(sysScales); - return detailVo; + public SysScalePackageVo 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, SysScale::getScaleName) +// .in(SysScale::getScaleId, split)); +// detailVo.setScaleDetail(sysScales); +// return detailVo; + return baseMapper.selectVoById(packageId); } /**