Skip to content

phsl / api

Go to a project
Commit 1899c420 by Jony.L
Options

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

parents 5d5c3614 8f14a0d3
Showing with 1047 additions and 111 deletions
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/bannerinfo/BannerInfoController.java
...@@ -71,21 +71,57 @@ public class BannerInfoController { ...@@ -71,21 +71,57 @@ public class BannerInfoController {
return success(true); return success(true);
} }
// @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("/get") @GetMapping("/get")
@Operation(summary = "获得banner页管理") @Operation(summary = "获得banner页管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('biz:banner-info:query')")
public CommonResult<BannerInfoRespVO> getBannerInfo(@RequestParam("id") Long id) { public CommonResult<BannerInfoRespVO> getBannerInfo(@RequestParam("id") Long id) {
BannerInfoDO bannerInfo = bannerInfoService.getBannerInfo(id); BannerInfoDO bannerInfo = bannerInfoService.getBannerInfo(id);
return success(BeanUtils.toBean(bannerInfo, BannerInfoRespVO.class)); BannerInfoRespVO respVO = BeanUtils.toBean(bannerInfo, BannerInfoRespVO.class);
// 将存储的逗号分隔字符串转换为列表
if (bannerInfo.getImage() != null && !bannerInfo.getImage().isEmpty()) {
List<String> images = Arrays.asList(bannerInfo.getImage().split(","));
respVO.setImages(images);
}
return success(respVO);
} }
// @GetMapping("/page")
// @Operation(summary = "获得banner页管理分页")
// @PreAuthorize("@ss.hasPermission('biz:banner-info:query')")
// public CommonResult<PageResult<BannerInfoRespVO>> getBannerInfoPage(@Valid BannerInfoPageReqVO pageReqVO) {
// PageResult<BannerInfoDO> pageResult = bannerInfoService.getBannerInfoPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, BannerInfoRespVO.class));
// }
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得banner页管理分页") @Operation(summary = "获得banner页管理分页")
@PreAuthorize("@ss.hasPermission('biz:banner-info:query')") @PreAuthorize("@ss.hasPermission('biz:banner-info:query')")
public CommonResult<PageResult<BannerInfoRespVO>> getBannerInfoPage(@Valid BannerInfoPageReqVO pageReqVO) { public CommonResult<PageResult<BannerInfoRespVO>> getBannerInfoPage(@Valid BannerInfoPageReqVO pageReqVO) {
PageResult<BannerInfoDO> pageResult = bannerInfoService.getBannerInfoPage(pageReqVO); PageResult<BannerInfoDO> pageResult = bannerInfoService.getBannerInfoPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BannerInfoRespVO.class)); PageResult<BannerInfoRespVO> respResult = BeanUtils.toBean(pageResult, BannerInfoRespVO.class);
// 处理图片列表转换
if (respResult.getList() != null) {
respResult.getList().forEach(banner -> {
BannerInfoDO original = pageResult.getList().stream()
.filter(item -> item.getId().equals(banner.getId()))
.findFirst()
.orElse(null);
if (original != null && original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
banner.setImages(images);
}
});
}
return success(respResult);
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
...@@ -101,4 +137,5 @@ public class BannerInfoController { ...@@ -101,4 +137,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/bannerinfo/vo/BannerInfoPageReqVO.java
...@@ -13,6 +13,9 @@ import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_Y ...@@ -13,6 +13,9 @@ import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_Y
@Data @Data
public class BannerInfoPageReqVO extends PageParam { public class BannerInfoPageReqVO extends PageParam {
@Schema(description = "Id")
private Long id;
@Schema(description = "内容") @Schema(description = "内容")
private String information; private String information;
...@@ -26,7 +29,7 @@ public class BannerInfoPageReqVO extends PageParam { ...@@ -26,7 +29,7 @@ public class BannerInfoPageReqVO extends PageParam {
private Integer orderNum; private Integer orderNum;
@Schema(description = "状态：0-已隐藏，1-已显示", example = "1") @Schema(description = "状态：0-已隐藏，1-已显示", example = "1")
private Boolean showStatus; private Integer showStatus;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
...@@ -35,4 +38,6 @@ public class BannerInfoPageReqVO extends PageParam { ...@@ -35,4 +38,6 @@ public class BannerInfoPageReqVO extends PageParam {
@Schema(description = "备注", example = "你说的对") @Schema(description = "备注", example = "你说的对")
private String remark; private String remark;
@Schema(description = "链接地址", example = "https://www.iocoder.cn")
private String url;
} }
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/bannerinfo/vo/BannerInfoRespVO.java
...@@ -12,9 +12,12 @@ import com.alibaba.excel.annotation.*; ...@@ -12,9 +12,12 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
public class BannerInfoRespVO { public class BannerInfoRespVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "轮播图地址") @Schema(description = "轮播图地址")
@ExcelProperty("轮播图地址") @ExcelProperty("轮播图地址")
private String image; private List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("内容") @ExcelProperty("内容")
...@@ -38,7 +41,7 @@ public class BannerInfoRespVO { ...@@ -38,7 +41,7 @@ public class BannerInfoRespVO {
@Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("状态：0-已隐藏，1-已显示") @ExcelProperty("状态：0-已隐藏，1-已显示")
private Boolean showStatus; private Integer showStatus;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/bannerinfo/vo/BannerInfoSaveReqVO.java
...@@ -13,7 +13,7 @@ public class BannerInfoSaveReqVO { ...@@ -13,7 +13,7 @@ public class BannerInfoSaveReqVO {
private Long id; private Long id;
@Schema(description = "轮播图地址") @Schema(description = "轮播图地址")
private String image; private List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "内容不能为空") @NotEmpty(message = "内容不能为空")
...@@ -34,7 +34,7 @@ public class BannerInfoSaveReqVO { ...@@ -34,7 +34,7 @@ public class BannerInfoSaveReqVO {
@Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态：0-已隐藏，1-已显示不能为空") @NotNull(message = "状态：0-已隐藏，1-已显示不能为空")
private Boolean showStatus; private Integer showStatus;
@Schema(description = "备注", example = "你说的对") @Schema(description = "备注", example = "你说的对")
private String remark; private String remark;
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/computilityinformation/ComputilityInformationController.java
package com.luhu.computility.module.biz.controller.admin.computilityinformation; package com.luhu.computility.module.biz.controller.admin.computilityinformation;
import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -74,10 +76,17 @@ public class ComputilityInformationController { ...@@ -74,10 +76,17 @@ 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));
ComputilityInformationRespVO respVO = BeanUtils.toBean(computilityInformation, ComputilityInformationRespVO.class);
// 将存储的逗号分隔字符串转换为列表
if (computilityInformation.getImage() != null && !computilityInformation.getImage().isEmpty()) {
List<String> images = Arrays.asList(computilityInformation.getImage().split(","));
respVO.setImages(images);
}
return success(respVO);
} }
@GetMapping("/page") @GetMapping("/page")
...@@ -85,7 +94,24 @@ public class ComputilityInformationController { ...@@ -85,7 +94,24 @@ public class ComputilityInformationController {
@PreAuthorize("@ss.hasPermission('biz:computility-information:query')") @PreAuthorize("@ss.hasPermission('biz:computility-information:query')")
public CommonResult<PageResult<ComputilityInformationRespVO>> getComputilityInformationPage(@Valid ComputilityInformationPageReqVO pageReqVO) { public CommonResult<PageResult<ComputilityInformationRespVO>> getComputilityInformationPage(@Valid ComputilityInformationPageReqVO pageReqVO) {
PageResult<ComputilityInformationDO> pageResult = computilityInformationService.getComputilityInformationPage(pageReqVO); PageResult<ComputilityInformationDO> pageResult = computilityInformationService.getComputilityInformationPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ComputilityInformationRespVO.class));
PageResult<ComputilityInformationRespVO> respResult = BeanUtils.toBean(pageResult, ComputilityInformationRespVO.class);
// 处理图片列表转换
if (respResult.getList() != null) {
respResult.getList().forEach(computility -> {
ComputilityInformationDO original = pageResult.getList().stream()
.filter(item -> item.getId().equals(computility.getId()))
.findFirst()
.orElse(null);
if (original != null && original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
computility.setImages(images);
}
});
}
return success(respResult);
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/computilityinformation/vo/ComputilityInformationPageReqVO.java
...@@ -29,4 +29,6 @@ public class ComputilityInformationPageReqVO extends PageParam { ...@@ -29,4 +29,6 @@ public class ComputilityInformationPageReqVO extends PageParam {
@Schema(description = "备注", example = "随便") @Schema(description = "备注", example = "随便")
private String remark; private String remark;
@Schema(description = "链接地址", example = "https://www.iocoder.cn")
private String url;
} }
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/computilityinformation/vo/ComputilityInformationRespVO.java
...@@ -12,9 +12,12 @@ import com.alibaba.excel.annotation.*; ...@@ -12,9 +12,12 @@ 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 List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("内容") @ExcelProperty("内容")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/computilityinformation/vo/ComputilityInformationSaveReqVO.java
...@@ -13,7 +13,7 @@ public class ComputilityInformationSaveReqVO { ...@@ -13,7 +13,7 @@ public class ComputilityInformationSaveReqVO {
private Long id; private Long id;
@Schema(description = "展示图地址") @Schema(description = "展示图地址")
private String image; private List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "内容不能为空") @NotEmpty(message = "内容不能为空")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/industryapplication/IndustryApplicationController.java
package com.luhu.computility.module.biz.controller.admin.industryapplication; package com.luhu.computility.module.biz.controller.admin.industryapplication;
import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -77,7 +79,18 @@ public class IndustryApplicationController { ...@@ -77,7 +79,18 @@ public class IndustryApplicationController {
@PreAuthorize("@ss.hasPermission('biz:industry-application:query')") @PreAuthorize("@ss.hasPermission('biz:industry-application:query')")
public CommonResult<IndustryApplicationRespVO> getIndustryApplication(@RequestParam("id") Long id) { public CommonResult<IndustryApplicationRespVO> getIndustryApplication(@RequestParam("id") Long id) {
IndustryApplicationDO industryApplication = industryApplicationService.getIndustryApplication(id); IndustryApplicationDO industryApplication = industryApplicationService.getIndustryApplication(id);
return success(BeanUtils.toBean(industryApplication, IndustryApplicationRespVO.class));
IndustryApplicationRespVO respVO = BeanUtils.toBean(industryApplication, IndustryApplicationRespVO.class);
// 将存储的逗号分隔字符串转换为列表
if (industryApplication.getImage() != null && !industryApplication.getImage().isEmpty()) {
List<String> images = Arrays.asList(industryApplication.getImage().split(","));
respVO.setImages(images);
}
if (industryApplication.getHomeImage() != null && !industryApplication.getHomeImage().isEmpty()) {
List<String> homeImages = Arrays.asList(industryApplication.getHomeImage().split(","));
respVO.setHomeImages(homeImages);
}
return success(respVO);
} }
@GetMapping("/page") @GetMapping("/page")
...@@ -85,7 +98,28 @@ public class IndustryApplicationController { ...@@ -85,7 +98,28 @@ public class IndustryApplicationController {
@PreAuthorize("@ss.hasPermission('biz:industry-application:query')") @PreAuthorize("@ss.hasPermission('biz:industry-application:query')")
public CommonResult<PageResult<IndustryApplicationRespVO>> getIndustryApplicationPage(@Valid IndustryApplicationPageReqVO pageReqVO) { public CommonResult<PageResult<IndustryApplicationRespVO>> getIndustryApplicationPage(@Valid IndustryApplicationPageReqVO pageReqVO) {
PageResult<IndustryApplicationDO> pageResult = industryApplicationService.getIndustryApplicationPage(pageReqVO); PageResult<IndustryApplicationDO> pageResult = industryApplicationService.getIndustryApplicationPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, IndustryApplicationRespVO.class));
PageResult<IndustryApplicationRespVO> respResult = BeanUtils.toBean(pageResult, IndustryApplicationRespVO.class);
// 处理图片列表转换
if (respResult.getList() != null) {
respResult.getList().forEach(industryApplication -> {
IndustryApplicationDO original = pageResult.getList().stream()
.filter(item -> item.getId().equals(industryApplication.getId()))
.findFirst()
.orElse(null);
if (original != null && original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
industryApplication.setImages(images);
}
if (original != null && original.getHomeImage() != null && !original.getHomeImage().isEmpty()) {
List<String> homeImages = Arrays.asList(original.getHomeImage().split(","));
industryApplication.setHomeImages(homeImages);
}
});
}
return success(respResult);
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/industryapplication/vo/IndustryApplicationRespVO.java
...@@ -12,9 +12,12 @@ import com.alibaba.excel.annotation.*; ...@@ -12,9 +12,12 @@ 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 List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("内容") @ExcelProperty("内容")
...@@ -42,7 +45,7 @@ public class IndustryApplicationRespVO { ...@@ -42,7 +45,7 @@ public class IndustryApplicationRespVO {
@Schema(description = "首页展示图片") @Schema(description = "首页展示图片")
@ExcelProperty("首页展示图片") @ExcelProperty("首页展示图片")
private String homeImage; private List<String> homeImages;
@Schema(description = "组件类型：0-全部", example = "1") @Schema(description = "组件类型：0-全部", example = "1")
@ExcelProperty("组件类型：0-全部") @ExcelProperty("组件类型：0-全部")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/industryapplication/vo/IndustryApplicationSaveReqVO.java
...@@ -13,7 +13,7 @@ public class IndustryApplicationSaveReqVO { ...@@ -13,7 +13,7 @@ public class IndustryApplicationSaveReqVO {
private Long id; private Long id;
@Schema(description = "展示图地址") @Schema(description = "展示图地址")
private String image; private List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "内容不能为空") @NotEmpty(message = "内容不能为空")
...@@ -37,7 +37,7 @@ public class IndustryApplicationSaveReqVO { ...@@ -37,7 +37,7 @@ public class IndustryApplicationSaveReqVO {
private String remark; private String remark;
@Schema(description = "首页展示图片") @Schema(description = "首页展示图片")
private String homeImage; private List<String> homeImages;
@Schema(description = "组件类型：0-全部", example = "1") @Schema(description = "组件类型：0-全部", example = "1")
private Integer assemblyType; private Integer assemblyType;
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/information/InformationController.java
package com.luhu.computility.module.biz.controller.admin.information; package com.luhu.computility.module.biz.controller.admin.information;
import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -77,7 +79,14 @@ public class InformationController { ...@@ -77,7 +79,14 @@ public class InformationController {
@PreAuthorize("@ss.hasPermission('biz:information:query')") @PreAuthorize("@ss.hasPermission('biz:information:query')")
public CommonResult<InformationRespVO> getInformation(@RequestParam("id") Long id) { public CommonResult<InformationRespVO> getInformation(@RequestParam("id") Long id) {
InformationDO information = informationService.getInformation(id); InformationDO information = informationService.getInformation(id);
return success(BeanUtils.toBean(information, InformationRespVO.class));
InformationRespVO respVO = BeanUtils.toBean(information, InformationRespVO.class);
// 将存储的逗号分隔字符串转换为列表
if (information.getImage() != null && !information.getImage().isEmpty()) {
List<String> images = Arrays.asList(information.getImage().split(","));
respVO.setImages(images);
}
return success(respVO);
} }
@GetMapping("/page") @GetMapping("/page")
...@@ -85,7 +94,23 @@ public class InformationController { ...@@ -85,7 +94,23 @@ public class InformationController {
@PreAuthorize("@ss.hasPermission('biz:information:query')") @PreAuthorize("@ss.hasPermission('biz:information:query')")
public CommonResult<PageResult<InformationRespVO>> getInformationPage(@Valid InformationPageReqVO pageReqVO) { public CommonResult<PageResult<InformationRespVO>> getInformationPage(@Valid InformationPageReqVO pageReqVO) {
PageResult<InformationDO> pageResult = informationService.getInformationPage(pageReqVO); PageResult<InformationDO> pageResult = informationService.getInformationPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, InformationRespVO.class)); PageResult<InformationRespVO> respResult = BeanUtils.toBean(pageResult, InformationRespVO.class);
// 处理图片列表转换
if (respResult.getList() != null) {
respResult.getList().forEach(information -> {
InformationDO original = pageResult.getList().stream()
.filter(item -> item.getId().equals(information.getId()))
.findFirst()
.orElse(null);
if (original != null && original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
information.setImages(images);
}
});
}
return success(respResult);
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
......
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.*; ...@@ -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;
...@@ -34,7 +37,7 @@ public class InformationRespVO { ...@@ -34,7 +37,7 @@ public class InformationRespVO {
@Schema(description = "预览图") @Schema(description = "预览图")
@ExcelProperty("预览图") @ExcelProperty("预览图")
private String image; private List<String> images;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/information/vo/InformationSaveReqVO.java
...@@ -32,7 +32,7 @@ public class InformationSaveReqVO { ...@@ -32,7 +32,7 @@ public class InformationSaveReqVO {
private Boolean showStatus; private Boolean showStatus;
@Schema(description = "预览图") @Schema(description = "预览图")
private String image; private List<String> images;
@Schema(description = "备注", example = "你说的对") @Schema(description = "备注", example = "你说的对")
private String remark; private String remark;
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/PartnerController.java 0 → 100644
package com.luhu.computility.module.biz.controller.admin.partner;
import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoPageReqVO;
import com.luhu.computility.module.biz.controller.admin.bannerinfo.vo.BannerInfoRespVO;
import com.luhu.computility.module.biz.dal.dataobject.bannerinfo.BannerInfoDO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.luhu.computility.framework.common.pojo.PageParam;
import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.common.pojo.CommonResult;
import com.luhu.computility.framework.common.util.object.BeanUtils;
import static com.luhu.computility.framework.common.pojo.CommonResult.success;
import com.luhu.computility.framework.excel.core.util.ExcelUtils;
import com.luhu.computility.framework.apilog.core.annotation.ApiAccessLog;
import static com.luhu.computility.framework.apilog.core.enums.OperateTypeEnum.*;
import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
import com.luhu.computility.module.biz.service.partner.PartnerService;
@Tag(name = "管理后台 - 合作伙伴管理")
@RestController
@RequestMapping("/biz/partner")
@Validated
public class PartnerController {
@Resource
private PartnerService partnerService;
@PostMapping("/create")
@Operation(summary = "创建合作伙伴管理")
@PreAuthorize("@ss.hasPermission('biz:partner:create')")
public CommonResult<Long> createPartner(@Valid @RequestBody PartnerSaveReqVO createReqVO) {
return success(partnerService.createPartner(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新合作伙伴管理")
@PreAuthorize("@ss.hasPermission('biz:partner:update')")
public CommonResult<Boolean> updatePartner(@Valid @RequestBody PartnerSaveReqVO updateReqVO) {
partnerService.updatePartner(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除合作伙伴管理")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('biz:partner:delete')")
public CommonResult<Boolean> deletePartner(@RequestParam("id") Long id) {
partnerService.deletePartner(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除合作伙伴管理")
@PreAuthorize("@ss.hasPermission('biz:partner:delete')")
public CommonResult<Boolean> deletePartnerList(@RequestParam("ids") List<Long> ids) {
partnerService.deletePartnerListByIds(ids);
return success(true);
}
// @GetMapping("/get")
// @Operation(summary = "获得合作伙伴管理")
// @Parameter(name = "id", description = "编号", required = true, example = "1024")
// @PreAuthorize("@ss.hasPermission('biz:partner:query')")
// public CommonResult<PartnerRespVO> getPartner(@RequestParam("id") Long id) {
// PartnerDO partner = partnerService.getPartner(id);
// return success(BeanUtils.toBean(partner, PartnerRespVO.class));
// }
@GetMapping("/get")
@Operation(summary = "获得合作伙伴管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<PartnerRespVO> getPartner(@RequestParam("id") Long id) {
PartnerDO partner = partnerService.getPartner(id);
PartnerRespVO respVO = BeanUtils.toBean(partner, PartnerRespVO.class);
// 将存储的逗号分隔字符串转换为列表
if (partner.getImage() != null && !partner.getImage().isEmpty()) {
List<String> images = Arrays.asList(partner.getImage().split(","));
respVO.setImages(images);
}
return success(respVO);
}
// @GetMapping("/page")
// @Operation(summary = "获得合作伙伴管理分页")
// @PreAuthorize("@ss.hasPermission('biz:partner:query')")
// public CommonResult<PageResult<PartnerRespVO>> getPartnerPage(@Valid PartnerPageReqVO pageReqVO) {
// PageResult<PartnerDO> pageResult = partnerService.getPartnerPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, PartnerRespVO.class));
// }
@GetMapping("/page")
@Operation(summary = "获得合作伙伴管理分页")
// @PreAuthorize("@ss.hasPermission('biz:partner:query')")
public CommonResult<PageResult<PartnerRespVO>> getPartnerPage(@Valid PartnerPageReqVO pageReqVO) {
PageResult<PartnerDO> pageResult = partnerService.getPartnerPage(pageReqVO);
PageResult<PartnerRespVO> respResult = BeanUtils.toBean(pageResult, PartnerRespVO.class);
// 处理图片列表转换
if (respResult.getList() != null) {
respResult.getList().forEach(partner -> {
PartnerDO original = pageResult.getList().stream()
.filter(item -> item.getId().equals(partner.getId()))
.findFirst()
.orElse(null);
if (original != null && original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
partner.setImages(images);
}
});
}
return success(respResult);
}
@GetMapping("/export-excel")
@Operation(summary = "导出合作伙伴管理 Excel")
@PreAuthorize("@ss.hasPermission('biz:partner:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportPartnerExcel(@Valid PartnerPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<PartnerDO> list = partnerService.getPartnerPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "合作伙伴管理.xls", "数据", PartnerRespVO.class,
BeanUtils.toBean(list, PartnerRespVO.class));
}
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/vo/PartnerPageReqVO.java 0 → 100644
package com.luhu.computility.module.biz.controller.admin.partner.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.luhu.computility.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 合作伙伴管理分页 Request VO")
@Data
public class PartnerPageReqVO extends PageParam {
@Schema(description = "内容")
private String information;
@Schema(description = "标题")
private String title;
@Schema(description = "链接地址", example = "https://www.iocoder.cn")
private String url;
@Schema(description = "描述内容", example = "随便")
private String description;
@Schema(description = "排序值")
private Integer orderNum;
@Schema(description = "状态：0-已隐藏，1-已显示", example = "1")
private Integer showStatus;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注", example = "你说的对")
private String remark;
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/client/dto/ClientBannerInfoReqDTO.java → computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/vo/PartnerRespVO.java
package com.luhu.computility.module.biz.controller.client.dto; package com.luhu.computility.module.biz.controller.admin.partner.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "客户端 - banner页管理 Request DTO") @Schema(description = "管理后台 - 合作伙伴管理 Response VO")
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
public class ClientBannerInfoReqDTO { public class PartnerRespVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28362")
private Long id;
@Schema(description = "轮播图地址") @Schema(description = "展示图地址")
@ExcelProperty("轮播图地址") @ExcelProperty("展示图地址")
private String image; private List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("内容") @ExcelProperty("内容")
...@@ -38,7 +41,7 @@ public class ClientBannerInfoReqDTO { ...@@ -38,7 +41,7 @@ public class ClientBannerInfoReqDTO {
@Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("状态：0-已隐藏，1-已显示") @ExcelProperty("状态：0-已隐藏，1-已显示")
private Boolean showStatus; private Integer showStatus;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/vo/PartnerSaveReqVO.java 0 → 100644
package com.luhu.computility.module.biz.controller.admin.partner.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合作伙伴管理新增/修改 Request VO")
@Data
public class PartnerSaveReqVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28362")
private Long id;
@Schema(description = "展示图地址")
private List<String> images;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "内容不能为空")
private String information;
@Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "标题不能为空")
private String title;
@Schema(description = "链接地址", example = "https://www.iocoder.cn")
private String url;
@Schema(description = "描述内容", example = "随便")
private String description;
@Schema(description = "排序值")
private Integer orderNum;
@Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态：0-已隐藏，1-已显示不能为空")
private Integer showStatus;
@Schema(description = "备注", example = "你说的对")
private String remark;
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/bannerinfo/AppBannerInfoController.java 0 → 100644
package com.luhu.computility.module.biz.controller.app.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.Arrays;
import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 APP - banner信息")
@RestController
@RequestMapping("/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方法
List<BannerInfoRespVO> result = BeanUtils.toBean(list, BannerInfoRespVO.class);
// 处理图片列表转换
if (result != null) {
for (int i = 0; i < result.size(); i++) {
BannerInfoDO original = list.get(i);
BannerInfoRespVO banner = result.get(i);
if (original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
banner.setImages(images);
}
}
}
return success(result);
}
}
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/computilityinformation/AppComputilityinformationController.java 0 → 100644
package com.luhu.computility.module.biz.controller.app.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.computilityinformation.vo.ComputilityInformationRespVO;
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.Arrays;
import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 APP - 计算资源首页管理")
@RestController
@RequestMapping("/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方法
List<ComputilityInformationRespVO> result = BeanUtils.toBean(list, ComputilityInformationRespVO.class);
// 处理图片列表转换
if (result != null) {
for (int i = 0; i < result.size(); i++) {
ComputilityInformationDO original = list.get(i);
ComputilityInformationRespVO computility = result.get(i);
if (original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
computility.setImages(images);
}
}
}
return success(result);
}
}
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/industryapplication/AppIndustryApplicationController.java 0 → 100644
package com.luhu.computility.module.biz.controller.app.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.industryapplication.vo.IndustryApplicationRespVO;
import com.luhu.computility.module.biz.dal.dataobject.industryapplication.IndustryApplicationDO;
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.Arrays;
import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 APP - 行业应用首页管理")
@RestController
@RequestMapping("/biz/assembly")
public class AppIndustryApplicationController {
@Resource
private IndustryApplicationService industryApplicationService;
@GetMapping("/assemblyList")
public CommonResult<List<IndustryApplicationRespVO>> getIndustryApplicationList() {
List<IndustryApplicationDO> list = industryApplicationService.getAllIndustryApplication(); // 新增Service方法
List<IndustryApplicationRespVO> result = BeanUtils.toBean(list, IndustryApplicationRespVO.class);
// 处理图片列表转换
if (result != null) {
for (int i = 0; i < result.size(); i++) {
IndustryApplicationDO original = list.get(i);
IndustryApplicationRespVO industry = result.get(i);
if (original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
industry.setImages(images);
}
if (original.getHomeImage() != null && !original.getHomeImage().isEmpty()) {
List<String> homeImages = Arrays.asList(original.getHomeImage().split(","));
industry.setHomeImages(homeImages);
}
}
}
return success(result);
}
}
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/information/AppInformationController.java 0 → 100644
package com.luhu.computility.module.biz.controller.app.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.bannerinfo.vo.BannerInfoRespVO;
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.bannerinfo.BannerInfoDO;
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.Arrays;
import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 APP - 活动资讯首页管理")
@RestController
@RequestMapping("/biz/information")
public class AppInformationController {
@Resource
private InformationService informationService;
@GetMapping("/informationList")
public CommonResult<List<InformationRespVO>> getInformationList() {
List<InformationDO> list = informationService.getAllInformation(); // 新增Service方法
List<InformationRespVO> result = BeanUtils.toBean(list, InformationRespVO.class);
// 处理图片列表转换
if (result != null) {
for (int i = 0; i < result.size(); i++) {
InformationDO original = list.get(i);
InformationRespVO information = result.get(i);
if (original.getImage() != null && !original.getImage().isEmpty()) {
List<String> images = Arrays.asList(original.getImage().split(","));
information.setImages(images);
}
}
}
return success(result);
}
}
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/client/dto/ClientBannerInfoRespVO.java deleted 100644 → 0
package com.luhu.computility.module.biz.controller.client.dto;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "客户端 - banner页管理 Response VO")
@Data
@ExcelIgnoreUnannotated
public class ClientBannerInfoRespVO {
@Schema(description = "轮播图地址")
@ExcelProperty("轮播图地址")
private String image;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("内容")
private String information;
@Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("标题")
private String title;
@Schema(description = "链接地址", example = "https://www.iocoder.cn")
@ExcelProperty("链接地址")
private String url;
@Schema(description = "描述内容", example = "随便")
@ExcelProperty("描述内容")
private String description;
@Schema(description = "排序值")
@ExcelProperty("排序值")
private Integer orderNum;
@Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("状态：0-已隐藏，1-已显示")
private Boolean showStatus;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注", example = "你说的对")
@ExcelProperty("备注")
private String remark;
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/dataobject/bannerinfo/BannerInfoDO.java
...@@ -54,7 +54,7 @@ public class BannerInfoDO extends BaseDO { ...@@ -54,7 +54,7 @@ public class BannerInfoDO extends BaseDO {
/** /**
* 状态：0-已隐藏，1-已显示 * 状态：0-已隐藏，1-已显示
*/ */
private Boolean showStatus; private Integer showStatus;
/** /**
* 备注 * 备注
*/ */
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/dataobject/partner/PartnerDO.java 0 → 100644
package com.luhu.computility.module.biz.dal.dataobject.partner;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
/**
* 合作伙伴管理 DO
*
* @author ljq
*/
@TableName("biz_partner")
@KeySequence("biz_partner_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PartnerDO extends BaseDO {
/**
* 主键
*/
@TableId
private Long id;
/**
* 展示图地址
*/
private String image;
/**
* 内容
*/
private String information;
/**
* 标题
*/
private String title;
/**
* 链接地址
*/
private String url;
/**
* 描述内容
*/
private String description;
/**
* 排序值
*/
private Integer orderNum;
/**
* 状态：0-已隐藏，1-已显示
*/
private Integer showStatus;
/**
* 备注
*/
private String remark;
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/mysql/bannerinfo/BannerInfoMapper.java
...@@ -20,11 +20,13 @@ public interface BannerInfoMapper extends BaseMapperX<BannerInfoDO> { ...@@ -20,11 +20,13 @@ public interface BannerInfoMapper extends BaseMapperX<BannerInfoDO> {
default PageResult<BannerInfoDO> selectPage(BannerInfoPageReqVO reqVO) { default PageResult<BannerInfoDO> selectPage(BannerInfoPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<BannerInfoDO>() return selectPage(reqVO, new LambdaQueryWrapperX<BannerInfoDO>()
.eqIfPresent(BannerInfoDO::getId, reqVO.getId())
.eqIfPresent(BannerInfoDO::getInformation, reqVO.getInformation()) .eqIfPresent(BannerInfoDO::getInformation, reqVO.getInformation())
.eqIfPresent(BannerInfoDO::getTitle, reqVO.getTitle()) .eqIfPresent(BannerInfoDO::getTitle, reqVO.getTitle())
.eqIfPresent(BannerInfoDO::getDescription, reqVO.getDescription()) .eqIfPresent(BannerInfoDO::getDescription, reqVO.getDescription())
.eqIfPresent(BannerInfoDO::getOrderNum, reqVO.getOrderNum()) .eqIfPresent(BannerInfoDO::getOrderNum, reqVO.getOrderNum())
.eqIfPresent(BannerInfoDO::getShowStatus, reqVO.getShowStatus()) .eqIfPresent(BannerInfoDO::getShowStatus, reqVO.getShowStatus())
.eqIfPresent(BannerInfoDO::getUrl, reqVO.getUrl())
.betweenIfPresent(BannerInfoDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(BannerInfoDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(BannerInfoDO::getRemark, reqVO.getRemark()) .eqIfPresent(BannerInfoDO::getRemark, reqVO.getRemark())
.orderByDesc(BannerInfoDO::getId)); .orderByDesc(BannerInfoDO::getId));
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/mysql/computilityinformation/ComputilityInformationMapper.java
...@@ -22,6 +22,7 @@ public interface ComputilityInformationMapper extends BaseMapperX<ComputilityInf ...@@ -22,6 +22,7 @@ public interface ComputilityInformationMapper extends BaseMapperX<ComputilityInf
.likeIfPresent(ComputilityInformationDO::getTitle, reqVO.getTitle()) .likeIfPresent(ComputilityInformationDO::getTitle, reqVO.getTitle())
.eqIfPresent(ComputilityInformationDO::getCategory, reqVO.getCategory()) .eqIfPresent(ComputilityInformationDO::getCategory, reqVO.getCategory())
.eqIfPresent(ComputilityInformationDO::getShowStatus, reqVO.getShowStatus()) .eqIfPresent(ComputilityInformationDO::getShowStatus, reqVO.getShowStatus())
.eqIfPresent(ComputilityInformationDO::getUrl, reqVO.getUrl())
.betweenIfPresent(ComputilityInformationDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(ComputilityInformationDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(ComputilityInformationDO::getRemark, reqVO.getRemark()) .eqIfPresent(ComputilityInformationDO::getRemark, reqVO.getRemark())
.orderByDesc(ComputilityInformationDO::getId)); .orderByDesc(ComputilityInformationDO::getId));
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/mysql/partner/PartnerMapper.java 0 → 100644
package com.luhu.computility.module.biz.dal.mysql.partner;
import java.util.*;
import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
import org.apache.ibatis.annotations.Mapper;
import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
/**
* 合作伙伴管理 Mapper
*
* @author ljq
*/
@Mapper
public interface PartnerMapper extends BaseMapperX<PartnerDO> {
default PageResult<PartnerDO> selectPage(PartnerPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PartnerDO>()
.eqIfPresent(PartnerDO::getInformation, reqVO.getInformation())
.eqIfPresent(PartnerDO::getTitle, reqVO.getTitle())
.eqIfPresent(PartnerDO::getUrl, reqVO.getUrl())
.eqIfPresent(PartnerDO::getDescription, reqVO.getDescription())
.eqIfPresent(PartnerDO::getOrderNum, reqVO.getOrderNum())
.eqIfPresent(PartnerDO::getShowStatus, reqVO.getShowStatus())
.betweenIfPresent(PartnerDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PartnerDO::getRemark, reqVO.getRemark())
.orderByDesc(PartnerDO::getId));
}
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/enums/ErrorCodeConstants.java
...@@ -20,4 +20,6 @@ public interface ErrorCodeConstants { ...@@ -20,4 +20,6 @@ public interface ErrorCodeConstants {
ErrorCode ORDER_NOT_EXISTS = new ErrorCode(1_040_015_000, "订单管理-需求单管理不存在"); ErrorCode ORDER_NOT_EXISTS = new ErrorCode(1_040_015_000, "订单管理-需求单管理不存在");
ErrorCode PARTNER_NOT_EXISTS = new ErrorCode(1_040_016_000, "合作伙伴管理不存在");
} }
computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/bannerinfo/BannerInfoService.java
...@@ -65,4 +65,5 @@ public interface BannerInfoService { ...@@ -65,4 +65,5 @@ public interface BannerInfoService {
*/ */
List<BannerInfoDO> getBannerInfo(BannerInfoPageReqVO pageReqVO); List<BannerInfoDO> getBannerInfo(BannerInfoPageReqVO pageReqVO);
List<BannerInfoDO> getAllBanners();
} }
\ 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;
...@@ -36,6 +38,10 @@ public class BannerInfoServiceImpl implements BannerInfoService { ...@@ -36,6 +38,10 @@ public class BannerInfoServiceImpl implements BannerInfoService {
public Long createBannerInfo(BannerInfoSaveReqVO createReqVO) { public Long createBannerInfo(BannerInfoSaveReqVO createReqVO) {
// 插入 // 插入
BannerInfoDO bannerInfo = BeanUtils.toBean(createReqVO, BannerInfoDO.class); BannerInfoDO bannerInfo = BeanUtils.toBean(createReqVO, BannerInfoDO.class);
// 将图片列表转换为JSON字符串存储
if (createReqVO.getImages() != null && !createReqVO.getImages().isEmpty()) {
bannerInfo.setImage(String.join(",", createReqVO.getImages()));
}
bannerInfoMapper.insert(bannerInfo); bannerInfoMapper.insert(bannerInfo);
// 返回 // 返回
...@@ -48,6 +54,10 @@ public class BannerInfoServiceImpl implements BannerInfoService { ...@@ -48,6 +54,10 @@ public class BannerInfoServiceImpl implements BannerInfoService {
validateBannerInfoExists(updateReqVO.getId()); validateBannerInfoExists(updateReqVO.getId());
// 更新 // 更新
BannerInfoDO updateObj = BeanUtils.toBean(updateReqVO, BannerInfoDO.class); BannerInfoDO updateObj = BeanUtils.toBean(updateReqVO, BannerInfoDO.class);
// 将图片列表转换为JSON字符串存储
if (updateReqVO.getImages() != null && !updateReqVO.getImages().isEmpty()) {
updateObj.setImage(String.join(",", updateReqVO.getImages()));
}
bannerInfoMapper.updateById(updateObj); bannerInfoMapper.updateById(updateObj);
} }
...@@ -88,4 +98,9 @@ public class BannerInfoServiceImpl implements BannerInfoService { ...@@ -88,4 +98,9 @@ public class BannerInfoServiceImpl implements BannerInfoService {
return bannerInfoMapper.selectList(pageReqVO); return bannerInfoMapper.selectList(pageReqVO);
} }
@Override
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 { ...@@ -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;
...@@ -36,6 +38,10 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation ...@@ -36,6 +38,10 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation
public Long createComputilityInformation(ComputilityInformationSaveReqVO createReqVO) { public Long createComputilityInformation(ComputilityInformationSaveReqVO createReqVO) {
// 插入 // 插入
ComputilityInformationDO computilityInformation = BeanUtils.toBean(createReqVO, ComputilityInformationDO.class); ComputilityInformationDO computilityInformation = BeanUtils.toBean(createReqVO, ComputilityInformationDO.class);
// 将图片列表转换为JSON字符串存储
if (createReqVO.getImages() != null && !createReqVO.getImages().isEmpty()) {
computilityInformation.setImage(String.join(",", createReqVO.getImages()));
}
computilityInformationMapper.insert(computilityInformation); computilityInformationMapper.insert(computilityInformation);
// 返回 // 返回
...@@ -48,6 +54,10 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation ...@@ -48,6 +54,10 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation
validateComputilityInformationExists(updateReqVO.getId()); validateComputilityInformationExists(updateReqVO.getId());
// 更新 // 更新
ComputilityInformationDO updateObj = BeanUtils.toBean(updateReqVO, ComputilityInformationDO.class); ComputilityInformationDO updateObj = BeanUtils.toBean(updateReqVO, ComputilityInformationDO.class);
// 将图片列表转换为JSON字符串存储
if (updateReqVO.getImages() != null && !updateReqVO.getImages().isEmpty()) {
updateObj.setImage(String.join(",", updateReqVO.getImages()));
}
computilityInformationMapper.updateById(updateObj); computilityInformationMapper.updateById(updateObj);
} }
...@@ -82,4 +92,8 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation ...@@ -82,4 +92,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 { ...@@ -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;
...@@ -36,6 +37,15 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic ...@@ -36,6 +37,15 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic
public Long createIndustryApplication(IndustryApplicationSaveReqVO createReqVO) { public Long createIndustryApplication(IndustryApplicationSaveReqVO createReqVO) {
// 插入 // 插入
IndustryApplicationDO industryApplication = BeanUtils.toBean(createReqVO, IndustryApplicationDO.class); IndustryApplicationDO industryApplication = BeanUtils.toBean(createReqVO, IndustryApplicationDO.class);
// 将图片列表转换为JSON字符串存储
if (createReqVO.getImages() != null && !createReqVO.getImages().isEmpty()) {
industryApplication.setImage(String.join(",", createReqVO.getImages()));
}
if (createReqVO.getHomeImages() != null && !createReqVO.getHomeImages().isEmpty()) {
industryApplication.setHomeImage(String.join(",", createReqVO.getHomeImages()));
}
industryApplicationMapper.insert(industryApplication); industryApplicationMapper.insert(industryApplication);
// 返回 // 返回
...@@ -48,6 +58,13 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic ...@@ -48,6 +58,13 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic
validateIndustryApplicationExists(updateReqVO.getId()); validateIndustryApplicationExists(updateReqVO.getId());
// 更新 // 更新
IndustryApplicationDO updateObj = BeanUtils.toBean(updateReqVO, IndustryApplicationDO.class); IndustryApplicationDO updateObj = BeanUtils.toBean(updateReqVO, IndustryApplicationDO.class);
// 将图片列表转换为JSON字符串存储
if (updateReqVO.getImages() != null && !updateReqVO.getImages().isEmpty()) {
updateObj.setImage(String.join(",", updateReqVO.getImages()));
}
if (updateReqVO.getHomeImages() != null && !updateReqVO.getHomeImages().isEmpty()) {
updateObj.setHomeImage(String.join(",", updateReqVO.getHomeImages()));
}
industryApplicationMapper.updateById(updateObj); industryApplicationMapper.updateById(updateObj);
} }
...@@ -82,4 +99,9 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic ...@@ -82,4 +99,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 { ...@@ -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;
...@@ -36,6 +37,10 @@ public class InformationServiceImpl implements InformationService { ...@@ -36,6 +37,10 @@ public class InformationServiceImpl implements InformationService {
public Long createInformation(InformationSaveReqVO createReqVO) { public Long createInformation(InformationSaveReqVO createReqVO) {
// 插入 // 插入
InformationDO information = BeanUtils.toBean(createReqVO, InformationDO.class); InformationDO information = BeanUtils.toBean(createReqVO, InformationDO.class);
// 将图片列表转换为JSON字符串存储
if (createReqVO.getImages() != null && !createReqVO.getImages().isEmpty()) {
information.setImage(String.join(",", createReqVO.getImages()));
}
informationMapper.insert(information); informationMapper.insert(information);
// 返回 // 返回
...@@ -48,6 +53,10 @@ public class InformationServiceImpl implements InformationService { ...@@ -48,6 +53,10 @@ public class InformationServiceImpl implements InformationService {
validateInformationExists(updateReqVO.getId()); validateInformationExists(updateReqVO.getId());
// 更新 // 更新
InformationDO updateObj = BeanUtils.toBean(updateReqVO, InformationDO.class); InformationDO updateObj = BeanUtils.toBean(updateReqVO, InformationDO.class);
// 将图片列表转换为JSON字符串存储
if (updateReqVO.getImages() != null && !updateReqVO.getImages().isEmpty()) {
updateObj.setImage(String.join(",", updateReqVO.getImages()));
}
informationMapper.updateById(updateObj); informationMapper.updateById(updateObj);
} }
...@@ -82,4 +91,9 @@ public class InformationServiceImpl implements InformationService { ...@@ -82,4 +91,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
computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/partner/PartnerService.java 0 → 100644
package com.luhu.computility.module.biz.service.partner;
import java.util.*;
import javax.validation.*;
import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.common.pojo.PageParam;
/**
* 合作伙伴管理 Service 接口
*
* @author ljq
*/
public interface PartnerService {
/**
* 创建合作伙伴管理
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPartner(@Valid PartnerSaveReqVO createReqVO);
/**
* 更新合作伙伴管理
*
* @param updateReqVO 更新信息
*/
void updatePartner(@Valid PartnerSaveReqVO updateReqVO);
/**
* 删除合作伙伴管理
*
* @param id 编号
*/
void deletePartner(Long id);
/**
* 批量删除合作伙伴管理
*
* @param ids 编号
*/
void deletePartnerListByIds(List<Long> ids);
/**
* 获得合作伙伴管理
*
* @param id 编号
* @return 合作伙伴管理
*/
PartnerDO getPartner(Long id);
/**
* 获得合作伙伴管理分页
*
* @param pageReqVO 分页查询
* @return 合作伙伴管理分页
*/
PageResult<PartnerDO> getPartnerPage(PartnerPageReqVO pageReqVO);
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/partner/PartnerServiceImpl.java 0 → 100644
package com.luhu.computility.module.biz.service.partner;
import cn.hutool.core.collection.CollUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import com.luhu.computility.module.biz.controller.admin.partner.vo.*;
import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.common.pojo.PageParam;
import com.luhu.computility.framework.common.util.object.BeanUtils;
import com.luhu.computility.module.biz.dal.mysql.partner.PartnerMapper;
import static com.luhu.computility.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.luhu.computility.framework.common.util.collection.CollectionUtils.convertList;
import static com.luhu.computility.framework.common.util.collection.CollectionUtils.diffList;
import static com.luhu.computility.module.biz.enums.ErrorCodeConstants.*;
/**
* 合作伙伴管理 Service 实现类
*
* @author ljq
*/
@Service
@Validated
public class PartnerServiceImpl implements PartnerService {
@Resource
private PartnerMapper partnerMapper;
@Override
public Long createPartner(PartnerSaveReqVO createReqVO) {
// 插入
PartnerDO partner = BeanUtils.toBean(createReqVO, PartnerDO.class);
// 将图片列表转换为JSON字符串存储
if (createReqVO.getImages() != null && !createReqVO.getImages().isEmpty()) {
partner.setImage(String.join(",", createReqVO.getImages()));
}
partnerMapper.insert(partner);
// 返回
return partner.getId();
}
@Override
public void updatePartner(PartnerSaveReqVO updateReqVO) {
// 校验存在
validatePartnerExists(updateReqVO.getId());
// 更新
PartnerDO updateObj = BeanUtils.toBean(updateReqVO, PartnerDO.class);
// 将图片列表转换为JSON字符串存储
if (updateReqVO.getImages() != null && !updateReqVO.getImages().isEmpty()) {
updateObj.setImage(String.join(",", updateReqVO.getImages()));
}
partnerMapper.updateById(updateObj);
}
@Override
public void deletePartner(Long id) {
// 校验存在
validatePartnerExists(id);
// 删除
partnerMapper.deleteById(id);
}
@Override
public void deletePartnerListByIds(List<Long> ids) {
// 删除
partnerMapper.deleteByIds(ids);
}
private void validatePartnerExists(Long id) {
if (partnerMapper.selectById(id) == null) {
throw exception(PARTNER_NOT_EXISTS);
}
}
@Override
public PartnerDO getPartner(Long id) {
return partnerMapper.selectById(id);
}
@Override
public PageResult<PartnerDO> getPartnerPage(PartnerPageReqVO pageReqVO) {
return partnerMapper.selectPage(pageReqVO);
}
}
\ No newline at end of file
computility-module-pay/src/main/java/com/luhu/computility/module/pay/controller/admin/notify/PayNotifyController.java
...@@ -68,7 +68,7 @@ public class PayNotifyController { ...@@ -68,7 +68,7 @@ public class PayNotifyController {
@RequestParam(required = false) Map<String, String> params, @RequestParam(required = false) Map<String, String> params,
@RequestBody(required = false) String body, @RequestBody(required = false) String body,
@RequestHeader Map<String, String> headers) { @RequestHeader Map<String, String> headers) {
log.info("[notifyOrder][channelId({}) 回调数据({}/{})]", channelId, params, body); log.error("[notifyOrder][channelId({}) 回调数据({}/{})]", channelId, params, body);
// 1. 校验支付渠道是否存在 // 1. 校验支付渠道是否存在
PayClient payClient = channelService.getPayClient(channelId); PayClient payClient = channelService.getPayClient(channelId);
if (payClient == null) { if (payClient == null) {
......
computility-module-pay/src/main/java/com/luhu/computility/module/pay/controller/admin/order/PayOrderController.java
...@@ -6,6 +6,8 @@ import com.luhu.computility.framework.common.pojo.CommonResult; ...@@ -6,6 +6,8 @@ import com.luhu.computility.framework.common.pojo.CommonResult;
import com.luhu.computility.framework.common.pojo.PageResult; import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.common.util.object.BeanUtils; import com.luhu.computility.framework.common.util.object.BeanUtils;
import com.luhu.computility.framework.excel.core.util.ExcelUtils; import com.luhu.computility.framework.excel.core.util.ExcelUtils;
import com.luhu.computility.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
import com.luhu.computility.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
import com.luhu.computility.module.pay.controller.admin.order.vo.*; import com.luhu.computility.module.pay.controller.admin.order.vo.*;
import com.luhu.computility.module.pay.convert.order.PayOrderConvert; import com.luhu.computility.module.pay.convert.order.PayOrderConvert;
import com.luhu.computility.module.pay.dal.dataobject.app.PayAppDO; import com.luhu.computility.module.pay.dal.dataobject.app.PayAppDO;
...@@ -23,11 +25,14 @@ import io.swagger.v3.oas.annotations.Operation; ...@@ -23,11 +25,14 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
...@@ -49,6 +54,7 @@ import static com.luhu.computility.framework.web.core.util.WebFrameworkUtils.get ...@@ -49,6 +54,7 @@ import static com.luhu.computility.framework.web.core.util.WebFrameworkUtils.get
@Validated @Validated
public class PayOrderController { public class PayOrderController {
private static final Logger log = LoggerFactory.getLogger(PayOrderController.class);
@Resource @Resource
private PayOrderService orderService; private PayOrderService orderService;
@Resource @Resource
...@@ -142,4 +148,29 @@ public class PayOrderController { ...@@ -142,4 +148,29 @@ public class PayOrderController {
ExcelUtils.write(response, "支付订单.xls", "数据", PayOrderExcelVO.class, excelList); ExcelUtils.write(response, "支付订单.xls", "数据", PayOrderExcelVO.class, excelList);
} }
/**
* 内部支付任务回调
*/
@PostMapping("/update-paid")
@PermitAll
public CommonResult<Boolean> updateOrderPaid(@RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
/*ticketOrderService.updateOrderPaid(notifyReqDTO.getMerchantOrderId(),
notifyReqDTO.getPayOrderId());*/
log.error("内部支付任务回调 ");
return success(true);
}
/**
* 内部退款任务回调
*/
@PostMapping("/update-refunded")
@PermitAll
public CommonResult<Boolean> refunded(@RequestBody PayRefundNotifyReqDTO notifyReqDTO) {
/*ticketOrderService.updateOrderRefunded(notifyReqDTO.getMerchantOrderId(),
notifyReqDTO.getPayRefundId());*/
log.error("内部退款任务回调");
return success(true);
}
} }
computility-server/src/main/java/com/luhu/computility/server/Test.java 0 → 100644
package com.luhu.computility.server;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* @version 1.0
* @Author ljq
* @Date 2025/8/4
* @注释
*/
public class Test {
public static void main(String[] args) {
System.out.println(new BCryptPasswordEncoder().encode("a123456"));
}
}
computility-server/src/main/resources/application-dev.yaml
server: server:
port: 48080 port: 58080
--- #################### 数据库相关配置 #################### --- #################### 数据库相关配置 ####################
spring: spring:
autoconfigure: autoconfigure:
exclude: exclude:
- org.springframework.ai.autoconfigure.vectorstore.qdrant.QdrantVectorStoreAutoConfiguration # 禁用 AI 模块的 Qdrant，手动创建
- org.springframework.ai.autoconfigure.vectorstore.milvus.MilvusVectorStoreAutoConfiguration # 禁用 AI 模块的 Milvus，手动创建
# 数据源配置项
autoconfigure:
exclude:
- com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
datasource: datasource:
druid: # Druid 【监控】相关的全局配置 druid: # Druid 【监控】相关的全局配置
...@@ -47,21 +42,16 @@ spring: ...@@ -47,21 +42,16 @@ spring:
primary: master primary: master
datasource: datasource:
master: master:
url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 url: jdbc:mysql://43.139.100.220:13306/new_computility?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: 123456
slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
lazy: true # 开启懒加载，保证启动速度
url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root username: root
password: 123456 password: D7kaJdNdLsjzXGhD
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis: redis:
host: 400-infra.server.iocoder.cn # 地址 host: 127.0.0.1 # 地址
port: 6379 # 端口 port: 6379 # 端口
database: 1 # 数据库索引 database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启 password: foobared # 密码，建议生产环境开启
--- #################### 定时任务相关配置 #################### --- #################### 定时任务相关配置 ####################
...@@ -169,9 +159,11 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta ...@@ -169,9 +159,11 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
# 芋道配置项，设置当前项目所有自定义的配置 # 芋道配置项，设置当前项目所有自定义的配置
computility: computility:
pay: pay:
order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 order-notify-url: https://phsl.lijinqi.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 refund-notify-url: https://phsl.lijinqi.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
transfer-notify-url: https://yunai.natapp1.cc/admin-api/pay/notify/transfer # 支付渠道的【转账】回调地址 transfer-notify-url: https://phsl.lijinqi.com/admin-api/pay/notify/transfer # 支付渠道的【转账】回调地址
access-log: # 访问日志的配置项
enable: true
demo: false # 开启演示模式 demo: false # 开启演示模式
tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
......
computility-server/src/main/resources/application-local.yaml
...@@ -3,6 +3,12 @@ server: ...@@ -3,6 +3,12 @@ server:
--- #################### 数据库相关配置 #################### --- #################### 数据库相关配置 ####################
spring: spring:
# web:
# resources:
# static-locations:
# - "classpath:/static/"
# - "file:D:/study/profile/"
# -
autoconfigure: autoconfigure:
# noinspection SpringBootApplicationYaml # noinspection SpringBootApplicationYaml
exclude: exclude:
...@@ -50,6 +56,9 @@ spring: ...@@ -50,6 +56,9 @@ spring:
datasource: datasource:
master: master:
url: jdbc:mysql://43.139.100.220:13306/new_computility?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 url: jdbc:mysql://43.139.100.220:13306/new_computility?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
#url: jdbc:mysql://localhost/new_computility?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
#username: root
#password: 159357 # D7kaJdNdLsjzXGhD
username: root username: root
password: D7kaJdNdLsjzXGhD password: D7kaJdNdLsjzXGhD
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
...@@ -57,7 +66,7 @@ spring: ...@@ -57,7 +66,7 @@ spring:
host: 127.0.0.1 # 地址 host: 127.0.0.1 # 地址
port: 6379 # 端口 port: 6379 # 端口
database: 0 # 数据库索引 database: 0 # 数据库索引
# password: dev # 密码，建议生产环境开启 #password: foobared # 密码，建议生产环境开启
--- #################### 定时任务相关配置 #################### --- #################### 定时任务相关配置 ####################
...@@ -202,9 +211,9 @@ computility: ...@@ -202,9 +211,9 @@ computility:
security: security:
mock-enable: true mock-enable: true
pay: pay:
order-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 order-notify-url: https://ltx.lijinqi.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
refund-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 refund-notify-url: https://ltx.lijinqi.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
transfer-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/transfer # 支付渠道的【转账】回调地址 transfer-notify-url: https://ltx.lijinqi.com/admin-api/pay/notify/transfer # 支付渠道的【转账】回调地址
access-log: # 访问日志的配置项 access-log: # 访问日志的配置项
enable: false enable: false
demo: false # 关闭演示模式 demo: false # 关闭演示模式
......
computility-server/src/main/resources/application.yaml
...@@ -190,6 +190,7 @@ spring: ...@@ -190,6 +190,7 @@ spring:
api-key: sk-abc api-key: sk-abc
computility: computility:
# profile: D:/study/uploadPath
ai: ai:
deep-seek: # DeepSeek deep-seek: # DeepSeek
enable: true enable: true
...@@ -284,6 +285,7 @@ computility: ...@@ -284,6 +285,7 @@ computility:
- biz_computility_information - biz_computility_information
- biz_industry_application - biz_industry_application
- biz_information - biz_information
- biz_partner
- system_tenant - system_tenant
- system_tenant_package - system_tenant_package
- system_dict_data - system_dict_data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment