Skip to content

phsl / api

Go to a project
Commit bde664d3 by lijinqi
Options

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

# Conflicts:
#	computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/bannerinfo/AppBannerInfoController.java
#	computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/information/AppInformationController.java
parents f97a6679 231b7c4a
Showing with 265 additions and 23 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")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/bannerinfo/vo/BannerInfoPageReqVO.java
...@@ -38,4 +38,6 @@ public class BannerInfoPageReqVO extends PageParam { ...@@ -38,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
...@@ -17,7 +17,7 @@ public class BannerInfoRespVO { ...@@ -17,7 +17,7 @@ public class BannerInfoRespVO {
@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/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 = "内容不能为空")
......
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;
...@@ -77,7 +79,14 @@ public class ComputilityInformationController { ...@@ -77,7 +79,14 @@ public class ComputilityInformationController {
// @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
...@@ -17,7 +17,7 @@ public class ComputilityInformationRespVO { ...@@ -17,7 +17,7 @@ public class ComputilityInformationRespVO {
@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
...@@ -17,7 +17,7 @@ public class IndustryApplicationRespVO { ...@@ -17,7 +17,7 @@ public class IndustryApplicationRespVO {
@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("内容")
...@@ -45,7 +45,7 @@ public class IndustryApplicationRespVO { ...@@ -45,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
...@@ -37,7 +37,7 @@ public class InformationRespVO { ...@@ -37,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/app/bannerinfo/AppBannerInfoController.java
...@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success; import static com.luhu.computility.framework.common.pojo.CommonResult.success;
...@@ -39,6 +41,21 @@ public class AppBannerInfoController { ...@@ -39,6 +41,21 @@ public class AppBannerInfoController {
@GetMapping("/bannerList") @GetMapping("/bannerList")
public CommonResult<List<BannerInfoRespVO>> getBannerList() { public CommonResult<List<BannerInfoRespVO>> getBannerList() {
List<BannerInfoDO> list = bannerInfoService.getAllBanners(); // 新增Service方法 List<BannerInfoDO> list = bannerInfoService.getAllBanners(); // 新增Service方法
return success(BeanUtils.toBean(list, BannerInfoRespVO.class)); 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
...@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success; import static com.luhu.computility.framework.common.pojo.CommonResult.success;
...@@ -37,6 +38,21 @@ public class AppComputilityinformationController { ...@@ -37,6 +38,21 @@ public class AppComputilityinformationController {
@GetMapping("/computilityList") @GetMapping("/computilityList")
public CommonResult<List<ComputilityInformationRespVO>> getList() { public CommonResult<List<ComputilityInformationRespVO>> getList() {
List<ComputilityInformationDO> list = computilityInformationService.getAllComputilityInformations(); // 新增Service方法 List<ComputilityInformationDO> list = computilityInformationService.getAllComputilityInformations(); // 新增Service方法
return success(BeanUtils.toBean(list, ComputilityInformationRespVO.class)); 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
...@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success; import static com.luhu.computility.framework.common.pojo.CommonResult.success;
...@@ -26,6 +27,25 @@ public class AppIndustryApplicationController { ...@@ -26,6 +27,25 @@ public class AppIndustryApplicationController {
@GetMapping("/assemblyList") @GetMapping("/assemblyList")
public CommonResult<List<IndustryApplicationRespVO>> getIndustryApplicationList() { public CommonResult<List<IndustryApplicationRespVO>> getIndustryApplicationList() {
List<IndustryApplicationDO> list = industryApplicationService.getAllIndustryApplication(); // 新增Service方法 List<IndustryApplicationDO> list = industryApplicationService.getAllIndustryApplication(); // 新增Service方法
return success(BeanUtils.toBean(list, IndustryApplicationRespVO.class)); 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
...@@ -2,7 +2,11 @@ package com.luhu.computility.module.biz.controller.app.information; ...@@ -2,7 +2,11 @@ package com.luhu.computility.module.biz.controller.app.information;
import com.luhu.computility.framework.common.pojo.CommonResult; import com.luhu.computility.framework.common.pojo.CommonResult;
import com.luhu.computility.framework.common.util.object.BeanUtils; 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.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.dal.dataobject.information.InformationDO;
import com.luhu.computility.module.biz.service.information.InformationService; import com.luhu.computility.module.biz.service.information.InformationService;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
...@@ -11,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success; import static com.luhu.computility.framework.common.pojo.CommonResult.success;
...@@ -26,7 +31,22 @@ public class AppInformationController { ...@@ -26,7 +31,22 @@ public class AppInformationController {
@GetMapping("/informationList") @GetMapping("/informationList")
public CommonResult<List<InformationRespVO>> getInformationList() { public CommonResult<List<InformationRespVO>> getInformationList() {
List<InformationDO> list = informationService.getAllInformation(); // 新增Service方法 List<InformationDO> list = informationService.getAllInformation(); // 新增Service方法
return success(BeanUtils.toBean(list, InformationRespVO.class)); 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/dal/mysql/bannerinfo/BannerInfoMapper.java
...@@ -26,6 +26,7 @@ public interface BannerInfoMapper extends BaseMapperX<BannerInfoDO> { ...@@ -26,6 +26,7 @@ public interface BannerInfoMapper extends BaseMapperX<BannerInfoDO> {
.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/service/bannerinfo/BannerInfoServiceImpl.java
...@@ -38,6 +38,10 @@ public class BannerInfoServiceImpl implements BannerInfoService { ...@@ -38,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);
// 返回 // 返回
...@@ -50,6 +54,10 @@ public class BannerInfoServiceImpl implements BannerInfoService { ...@@ -50,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);
} }
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/computilityinformation/ComputilityInformationServiceImpl.java
...@@ -38,6 +38,10 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation ...@@ -38,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);
// 返回 // 返回
...@@ -50,6 +54,10 @@ public class ComputilityInformationServiceImpl implements ComputilityInformation ...@@ -50,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);
} }
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/industryapplication/IndustryApplicationServiceImpl.java
...@@ -37,6 +37,15 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic ...@@ -37,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);
// 返回 // 返回
...@@ -49,6 +58,13 @@ public class IndustryApplicationServiceImpl implements IndustryApplicationServic ...@@ -49,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);
} }
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/information/InformationServiceImpl.java
...@@ -37,6 +37,10 @@ public class InformationServiceImpl implements InformationService { ...@@ -37,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);
// 返回 // 返回
...@@ -49,6 +53,10 @@ public class InformationServiceImpl implements InformationService { ...@@ -49,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);
} }
......
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