算力资源重构-算力资源SPU管理修改1.1

computility-module-compute/computility-module-compute-biz/src/main/java/com/luhu/computility/module/compute/controller/admin/resourcespu/ResourceSpuController.java

@@ -84,8 +84,7 @@ public class ResourceSpuController {
     @Operation(summary = "获得算力资源SPU表（基础配置信息）分页")
     @Operation(summary = "获得算力资源SPU表（基础配置信息）分页")
     @PreAuthorize("@ss.hasPermission('compute:resource-spu:query')")
     @PreAuthorize("@ss.hasPermission('compute:resource-spu:query')")
     public CommonResult<PageResult<ResourceSpuRespVO>> getResourceSpuPage(@Valid ResourceSpuPageReqVO pageReqVO) {
     public CommonResult<PageResult<ResourceSpuRespVO>> getResourceSpuPage(@Valid ResourceSpuPageReqVO pageReqVO) {
-        PageResult<ResourceSpuDO> pageResult = resourceSpuService.getResourceSpuPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ResourceSpuRespVO.class));
+        return success(resourceSpuService.getResourceSpuPage(pageReqVO));
     }
     }
 
 
     @GetMapping("/export-excel")
     @GetMapping("/export-excel")
@@ -95,7 +94,7 @@ public class ResourceSpuController {
     public void exportResourceSpuExcel(@Valid ResourceSpuPageReqVO pageReqVO,
     public void exportResourceSpuExcel(@Valid ResourceSpuPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ResourceSpuDO> list = resourceSpuService.getResourceSpuPage(pageReqVO).getList();
+        List<ResourceSpuRespVO> list = resourceSpuService.getResourceSpuPage(pageReqVO).getList();
         // 导出 Excel
         // 导出 Excel
         ExcelUtils.write(response, "算力资源SPU表（基础配置信息）.xls", "数据", ResourceSpuRespVO.class,
         ExcelUtils.write(response, "算力资源SPU表（基础配置信息）.xls", "数据", ResourceSpuRespVO.class,
                         BeanUtils.toBean(list, ResourceSpuRespVO.class));
                         BeanUtils.toBean(list, ResourceSpuRespVO.class));

computility-module-compute/computility-module-compute-biz/src/main/java/com/luhu/computility/module/compute/controller/admin/resourcespu/vo/ResourceSpuRespVO.java

@@ -56,6 +56,10 @@ public class ResourceSpuRespVO {
     @ExcelProperty("算力资源分类编号")
     @ExcelProperty("算力资源分类编号")
     private Long categoryId;
     private Long categoryId;
 
 
+    @Schema(description = "算力资源分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "高性能计算服务资源")
+    @ExcelProperty("算力资源分类名称")
+    private String categoryName;
+
     @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
     @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
     @ExcelProperty("商品封面图")
     @ExcelProperty("商品封面图")
     private String picUrl;
     private String picUrl;

computility-module-compute/computility-module-compute-biz/src/main/java/com/luhu/computility/module/compute/dal/mysql/resourcespu/ResourceSpuMapper.java

@@ -5,7 +5,10 @@ import java.util.*;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
 import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
+import com.luhu.computility.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.luhu.computility.module.compute.dal.dataobject.resourcecategory.ResourceCategoryDO;
 import com.luhu.computility.module.compute.dal.dataobject.resourcespu.ResourceSpuDO;
 import com.luhu.computility.module.compute.dal.dataobject.resourcespu.ResourceSpuDO;
+import com.luhu.computility.module.compute.dal.mysql.resourcecategory.ResourceCategoryMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.luhu.computility.module.compute.controller.admin.resourcespu.vo.*;
 import com.luhu.computility.module.compute.controller.admin.resourcespu.vo.*;
 
 
@@ -17,8 +20,11 @@ import com.luhu.computility.module.compute.controller.admin.resourcespu.vo.*;
 @Mapper
 @Mapper
 public interface ResourceSpuMapper extends BaseMapperX<ResourceSpuDO> {
 public interface ResourceSpuMapper extends BaseMapperX<ResourceSpuDO> {
 
 
-    default PageResult<ResourceSpuDO> selectPage(ResourceSpuPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ResourceSpuDO>()
+    default PageResult<ResourceSpuRespVO> selectPage(ResourceSpuPageReqVO reqVO) {
+        return selectJoinPage(reqVO, ResourceSpuRespVO.class,new MPJLambdaWrapperX<ResourceSpuDO>()
+                .selectAll(ResourceSpuDO.class)
+                .selectAs(ResourceCategoryDO::getName,ResourceSpuRespVO::getCategoryName)
+                .leftJoin(ResourceCategoryDO.class,ResourceCategoryDO::getId,ResourceSpuDO::getCategoryId)
                 .likeIfPresent(ResourceSpuDO::getName, reqVO.getName())
                 .likeIfPresent(ResourceSpuDO::getName, reqVO.getName())
                 .eqIfPresent(ResourceSpuDO::getCpu, reqVO.getCpu())
                 .eqIfPresent(ResourceSpuDO::getCpu, reqVO.getCpu())
                 .eqIfPresent(ResourceSpuDO::getGpu, reqVO.getGpu())
                 .eqIfPresent(ResourceSpuDO::getGpu, reqVO.getGpu())

computility-module-compute/computility-module-compute-biz/src/main/java/com/luhu/computility/module/compute/service/resourcespu/ResourceSpuService.java

@@ -57,6 +57,6 @@ public interface ResourceSpuService {
      * @param pageReqVO 分页查询
      * @param pageReqVO 分页查询
      * @return 算力资源SPU表（基础配置信息）分页
      * @return 算力资源SPU表（基础配置信息）分页
      */
      */
-    PageResult<ResourceSpuDO> getResourceSpuPage(ResourceSpuPageReqVO pageReqVO);
+    PageResult<ResourceSpuRespVO> getResourceSpuPage(ResourceSpuPageReqVO pageReqVO);
 
 
 }
 }
\ No newline at end of file

computility-module-compute/computility-module-compute-biz/src/main/java/com/luhu/computility/module/compute/service/resourcespu/ResourceSpuServiceImpl.java

@@ -78,7 +78,7 @@ public class ResourceSpuServiceImpl implements ResourceSpuService {
     }
     }
 
 
     @Override
     @Override
-    public PageResult<ResourceSpuDO> getResourceSpuPage(ResourceSpuPageReqVO pageReqVO) {
+    public PageResult<ResourceSpuRespVO> getResourceSpuPage(ResourceSpuPageReqVO pageReqVO) {
         return resourceSpuMapper.selectPage(pageReqVO);
         return resourceSpuMapper.selectPage(pageReqVO);
     }
     }