Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/bannerinfo/BannerInfoService.java
#	computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/bannerinfo/BannerInfoServiceImpl.java

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/bannerinfo/BannerInfoController.java

@@ -101,4 +101,5 @@ public class BannerInfoController {
                         BeanUtils.toBean(list, BannerInfoRespVO.class));
                         BeanUtils.toBean(list, BannerInfoRespVO.class));
     }
     }
 
 
+
 }
 }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/computilityinformation/ComputilityInformationController.java

@@ -74,7 +74,7 @@ public class ComputilityInformationController {
     @GetMapping("/get")
     @GetMapping("/get")
     @Operation(summary = "获得计算资源首页管理")
     @Operation(summary = "获得计算资源首页管理")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('biz:computility-information:query')")
+//    @PreAuthorize("@ss.hasPermission('biz:computility-information:query')")
     public CommonResult<ComputilityInformationRespVO> getComputilityInformation(@RequestParam("id") Long id) {
     public CommonResult<ComputilityInformationRespVO> getComputilityInformation(@RequestParam("id") Long id) {
         ComputilityInformationDO computilityInformation = computilityInformationService.getComputilityInformation(id);
         ComputilityInformationDO computilityInformation = computilityInformationService.getComputilityInformation(id);
         return success(BeanUtils.toBean(computilityInformation, ComputilityInformationRespVO.class));
         return success(BeanUtils.toBean(computilityInformation, ComputilityInformationRespVO.class));

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/computilityinformation/vo/ComputilityInformationRespVO.java

@@ -12,6 +12,9 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 @ExcelIgnoreUnannotated
 public class ComputilityInformationRespVO {
 public class ComputilityInformationRespVO {
 
 
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
     @Schema(description = "展示图地址")
     @Schema(description = "展示图地址")
     @ExcelProperty("展示图地址")
     @ExcelProperty("展示图地址")
     private String image;
     private String image;

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/industryapplication/vo/IndustryApplicationRespVO.java

@@ -12,6 +12,9 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 @ExcelIgnoreUnannotated
 public class IndustryApplicationRespVO {
 public class IndustryApplicationRespVO {
 
 
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
     @Schema(description = "展示图地址")
     @Schema(description = "展示图地址")
     @ExcelProperty("展示图地址")
     @ExcelProperty("展示图地址")
     private String image;
     private String image;

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/information/vo/InformationRespVO.java

@@ -12,6 +12,9 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 @ExcelIgnoreUnannotated
 public class InformationRespVO {
 public class InformationRespVO {
 
 
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
     @Schema(description = "咨询类别", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "咨询类别", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("咨询类别")
     @ExcelProperty("咨询类别")
     private Boolean category;
     private Boolean category;

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/client/bannerinfo/AppBannerInfoController.java

+package com.luhu.computility.module.biz.controller.client.bannerinfo;
+
+import com.luhu.computility.framework.common.pojo.CommonResult;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
+import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
+import com.luhu.computility.module.biz.service.bannerinfo.BannerInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import java.util.List;
+
+import static com.luhu.computility.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 APP - banner信息")
+@RestController
+@RequestMapping("/app-api/biz/banner-info")
+public class AppBannerInfoController {
+
+    @Resource
+    private BannerInfoService bannerInfoService;
+
+    // 只包含客户端需要的只读方法
+    @GetMapping("/get")
+    @Operation(summary = "获得banner页管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    //@PreAuthorize("@ss.hasPermission('biz:banner-info:query')")
+    public CommonResult<BannerInfoRespVO> getBannerInfo(@RequestParam("id") Long id) {
+        BannerInfoDO bannerInfo = bannerInfoService.getBannerInfo(id);
+        return success( BeanUtils.toBean(bannerInfo, BannerInfoRespVO.class));
+    }
+
+    @GetMapping("/bannerList")
+    public CommonResult<List<BannerInfoRespVO>> getBannerList() {
+        List<BannerInfoDO> list = bannerInfoService.getAllBanners(); // 新增Service方法
+        return success(BeanUtils.toBean(list, BannerInfoRespVO.class));
+    }
+}

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/client/computilityinformation/AppComputilityinformationController.java

+package com.luhu.computility.module.biz.controller.client.computilityinformation;
+
+import com.luhu.computility.framework.common.pojo.CommonResult;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
+import com.luhu.computility.module.biz.controller.admin.computilityinformation.vo.ComputilityInformationRespVO;
+import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
+import com.luhu.computility.module.biz.dal.dataobject.computilityinformation.ComputilityInformationDO;
+import com.luhu.computility.module.biz.service.computilityinformation.ComputilityInformationService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static com.luhu.computility.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 APP - 计算资源首页管理")
+@RestController
+@RequestMapping("/app-api/biz/computility-information")
+public class AppComputilityinformationController {
+    @Resource
+    private ComputilityInformationService computilityInformationService;
+
+    @GetMapping("/get")
+    @Operation(summary = "获得计算资源首页管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+//    @PreAuthorize("@ss.hasPermission('biz:computility-information:query')")
+    public CommonResult<ComputilityInformationRespVO> getComputilityInformation(@RequestParam("id") Long id) {
+        ComputilityInformationDO computilityInformation = computilityInformationService.getComputilityInformation(id);
+        return success(BeanUtils.toBean(computilityInformation, ComputilityInformationRespVO.class));
+    }
+
+    @GetMapping("/computilityList")
+    public CommonResult<List<ComputilityInformationRespVO>> getList() {
+        List<ComputilityInformationDO> list = computilityInformationService.getAllComputilityInformations(); // 新增Service方法
+        return success(BeanUtils.toBean(list, ComputilityInformationRespVO.class));
+    }
+}

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/client/industryapplication/AppIndustryApplicationController.java

+package com.luhu.computility.module.biz.controller.client.industryapplication;
+
+import com.luhu.computility.framework.common.pojo.CommonResult;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
+import com.luhu.computility.module.biz.controller.admin.industryapplication.vo.IndustryApplicationRespVO;
+import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
+import com.luhu.computility.module.biz.dal.dataobject.industryapplication.IndustryApplicationDO;
+import com.luhu.computility.module.biz.service.bannerinfo.BannerInfoService;
+import com.luhu.computility.module.biz.service.industryapplication.IndustryApplicationService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static com.luhu.computility.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 APP - 行业应用首页管理")
+@RestController
+@RequestMapping("/app-api/biz/assembly")
+public class AppIndustryApplicationController {
+
+    @Resource
+    private IndustryApplicationService industryApplicationService;
+
+    @GetMapping("/assemblyList")
+    public CommonResult<List<IndustryApplicationRespVO>> getIndustryApplicationList() {
+        List<IndustryApplicationDO> list = industryApplicationService.getAllIndustryApplication(); // 新增Service方法
+        return success(BeanUtils.toBean(list, IndustryApplicationRespVO.class));
+    }
+}

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/client/information/AppInformationController.java

+package com.luhu.computility.module.biz.controller.client.information;
+
+import com.luhu.computility.framework.common.pojo.CommonResult;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+import com.luhu.computility.module.biz.controller.admin.industryapplication.vo.IndustryApplicationRespVO;
+import com.luhu.computility.module.biz.controller.admin.information.vo.InformationRespVO;
+import com.luhu.computility.module.biz.dal.dataobject.industryapplication.IndustryApplicationDO;
+import com.luhu.computility.module.biz.dal.dataobject.information.InformationDO;
+import com.luhu.computility.module.biz.service.information.InformationService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static com.luhu.computility.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 APP - 活动资讯首页管理")
+@RestController
+@RequestMapping("/app-api/biz/information")
+public class AppInformationController {
+
+    @Resource
+    private InformationService informationService;
+
+    @GetMapping("/informationList")
+    public CommonResult<List<InformationRespVO>> getInformationList() {
+        List<InformationDO> list = informationService.getAllInformation(); // 新增Service方法
+        return success(BeanUtils.toBean(list, InformationRespVO.class));
+    }
+
+}

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/bannerinfo/BannerInfoService.java

@@ -65,7 +65,5 @@ public interface BannerInfoService {
      */
      */
     List<BannerInfoDO> getBannerInfo(BannerInfoPageReqVO pageReqVO);
     List<BannerInfoDO> getBannerInfo(BannerInfoPageReqVO pageReqVO);
 
 
-    List<BannerInfoDO> getAllBanner();
-
-
+    List<BannerInfoDO> getAllBanners();
+}
\ No newline at end of file
-    }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/bannerinfo/BannerInfoServiceImpl.java

 package com.luhu.computility.module.biz.service.bannerinfo;
 package com.luhu.computility.module.biz.service.bannerinfo;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -88,10 +90,9 @@ public class BannerInfoServiceImpl implements BannerInfoService {
         return bannerInfoMapper.selectList(pageReqVO);
         return bannerInfoMapper.selectList(pageReqVO);
     }
     }
 
 
-
     @Override
     @Override
-    public List<BannerInfoDO> getAllBanner() {
-        return bannerInfoMapper.selectList();
+    public List<BannerInfoDO> getAllBanners() {
+        return bannerInfoMapper.selectList(new BannerInfoPageReqVO()); // 查询所有数据
     }
     }
 
 
 }
 }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/computilityinformation/ComputilityInformationService.java

@@ -59,4 +59,5 @@ public interface ComputilityInformationService {
      */
      */
     PageResult<ComputilityInformationDO> getComputilityInformationPage(ComputilityInformationPageReqVO pageReqVO);
     PageResult<ComputilityInformationDO> getComputilityInformationPage(ComputilityInformationPageReqVO pageReqVO);
 
 
+    List<ComputilityInformationDO> getAllComputilityInformations();
 }
 }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/computilityinformation/ComputilityInformationServiceImpl.java

 package com.luhu.computility.module.biz.service.computilityinformation;
 package com.luhu.computility.module.biz.service.computilityinformation;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoPageReqVO;
+import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -82,4 +84,8 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation
         return computilityInformationMapper.selectPage(pageReqVO);
         return computilityInformationMapper.selectPage(pageReqVO);
     }
     }
 
 
+    @Override
+    public List<ComputilityInformationDO> getAllComputilityInformations() {
+        return computilityInformationMapper.selectList(null); // 查询所有数据
+    }
 }
 }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/industryapplication/IndustryApplicationService.java

@@ -59,4 +59,5 @@ public interface IndustryApplicationService {
      */
      */
     PageResult<IndustryApplicationDO> getIndustryApplicationPage(IndustryApplicationPageReqVO pageReqVO);
     PageResult<IndustryApplicationDO> getIndustryApplicationPage(IndustryApplicationPageReqVO pageReqVO);
 
 
+    List<IndustryApplicationDO> getAllIndustryApplication();
 }
 }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/industryapplication/IndustryApplicationServiceImpl.java

 package com.luhu.computility.module.biz.service.industryapplication;
 package com.luhu.computility.module.biz.service.industryapplication;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.luhu.computility.module.biz.dal.dataobject.computilityinformation.ComputilityInformationDO;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -82,4 +83,9 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic
         return industryApplicationMapper.selectPage(pageReqVO);
         return industryApplicationMapper.selectPage(pageReqVO);
     }
     }
 
 
+    @Override
+    public List<IndustryApplicationDO> getAllIndustryApplication() {
+        return industryApplicationMapper.selectList(null); // 查询所有数据
+    }
+
 }
 }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/information/InformationService.java

@@ -59,4 +59,5 @@ public interface InformationService {
      */
      */
     PageResult<InformationDO> getInformationPage(InformationPageReqVO pageReqVO);
     PageResult<InformationDO> getInformationPage(InformationPageReqVO pageReqVO);
 
 
+    List<InformationDO> getAllInformation();
 }
 }
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/information/InformationServiceImpl.java

 package com.luhu.computility.module.biz.service.information;
 package com.luhu.computility.module.biz.service.information;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.luhu.computility.module.biz.dal.dataobject.industryapplication.IndustryApplicationDO;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -82,4 +83,9 @@ public class InformationServiceImpl implements InformationService {
         return informationMapper.selectPage(pageReqVO);
         return informationMapper.selectPage(pageReqVO);
     }
     }
 
 
+    @Override
+    public List<InformationDO> getAllInformation() {
+        return informationMapper.selectList(null); // 查询所有数据
+    }
+
 }
 }
\ No newline at end of file