bonus
/
pub_svc_platform_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2025-10-29 09:57:22 +08:00
parent e99f62f985 157eeeff8d
commit e6b36012f1
5 changed files with 76 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-business/src/main/java/com/bonus/business/controller/ProductScreenController.java
View File

@ -34,4 +34,9 @@ public class ProductScreenController {
return service.getProductDetails(product) ;
}
@PostMapping("/getProductDetailsById")
public AjaxResult getProductDetailsById(@RequestBody TbProduct product ){
return service.getProductDetailsById(product) ;
}
}

2
bonus-business/src/main/java/com/bonus/business/mapper/ProductMapper.java
View File

@ -121,4 +121,6 @@ public interface ProductMapper {
* @return
*/
Integer getProductOnCz(TbProduct product);
TbProductCase getProductDetailsById(String id);
}

2
bonus-business/src/main/java/com/bonus/business/service/ProductScreenService.java
View File

@ -17,4 +17,6 @@ public interface ProductScreenService {
* @return
*/
AjaxResult getProductDetails(TbProduct product);
AjaxResult getProductDetailsById(TbProduct product);
}

103
bonus-business/src/main/java/com/bonus/business/service/impl/ProductScreenImpl.java
View File

@ -38,22 +38,22 @@ public class ProductScreenImpl implements ProductScreenService {
@Autowired
public FileServiceUtils fileServiceUtils;
public FileServiceUtils fileServiceUtils;
@Override
public AjaxResult getProductList(TbProduct product) {
try{
List<TbProduct> list=mapper.getProductList(product);
if(StringUtils.isNotEmpty(list)){
list.forEach(vo->{
String url = fileServiceUtils.getFileUrl(vo.getLinkImage(),null);
// String url = minioUtil.getFileUrl(minioConfig.getBucketName(),vo.getLinkImage(), GlobalUtils.FILE_TIMES);
try {
List<TbProduct> list = mapper.getProductList(product);
if (StringUtils.isNotEmpty(list)) {
list.forEach(vo -> {
String url = fileServiceUtils.getFileUrl(vo.getLinkImage(), null);
// String url = minioUtil.getFileUrl(minioConfig.getBucketName(),vo.getLinkImage(), GlobalUtils.FILE_TIMES);
vo.setLinkImage(url);
});
}
return AjaxResult.success(list);
}catch (Exception e){
return AjaxResult.success(list);
} catch (Exception e) {
log.error(e.toString());
}
return AjaxResult.success(new ArrayList<TbProduct>());
@ -61,59 +61,76 @@ public class ProductScreenImpl implements ProductScreenService {
/**
* 查看宣传物料信息
*
* @param product
* @return
*/
@Override
public AjaxResult getProductDetails(TbProduct product) {
try{
try {
//详情
TbProduct vo=mapper.getProductDetails(product);
if(vo!=null){
TbProduct vo = mapper.getProductDetails(product);
if (vo != null) {
//封面图
String url = fileServiceUtils.getFileUrl(vo.getLinkImage(),null);
// String url = minioUtil.getFileUrl(minioConfig.getBucketName(),vo.getLinkImage(), GlobalUtils.FILE_TIMES);
String url = fileServiceUtils.getFileUrl(vo.getLinkImage(), null);
// String url = minioUtil.getFileUrl(minioConfig.getBucketName(),vo.getLinkImage(), GlobalUtils.FILE_TIMES);
vo.setLinkImage(url);
// vo.setLinkImage(minioConfig.getUrl()+"/"+minioConfig.getBucketName()+vo.getLinkImage());
// vo.setLinkImage(minioConfig.getUrl()+"/"+minioConfig.getBucketName()+vo.getLinkImage());
getProductDetails(product, vo, productMapper, minioUtil);
//查询 宣传手册和宣传视频
List<ProductScreenVo> list=mapper.getMaterialList(vo);
List<ProductScreenVo> videoList=new ArrayList<>();
List<ProductScreenVo> fileList=new ArrayList<>();
if(StringUtils.isNotEmpty(list)){
list.forEach(vo1->{
String imageUlr = fileServiceUtils.getFileUrl(vo1.getImage(),null);
String path = fileServiceUtils.getFileUrl(vo1.getFilePath(),null);
// String imageUlr = minioUtil.getFileUrl(minioConfig.getBucketName(),vo1.getImage(), GlobalUtils.FILE_TIMES);
// String path = minioUtil.getFileUrl(minioConfig.getBucketName(),vo1.getFilePath(), GlobalUtils.FILE_TIMES);
vo1.setImage(imageUlr);
vo1.setUrl(path);
if("0".equals(vo1.getFileType())){
videoList.add(vo1);
}else {
fileList.add(vo1);
}
});
vo.setVideoList(videoList);
vo.setFileList(fileList);
List<ProductScreenVo> list = mapper.getMaterialList(vo);
List<ProductScreenVo> videoList = new ArrayList<>();
List<ProductScreenVo> fileList = new ArrayList<>();
if (StringUtils.isNotEmpty(list)) {
list.forEach(vo1 -> {
String imageUlr = fileServiceUtils.getFileUrl(vo1.getImage(), null);
String path = fileServiceUtils.getFileUrl(vo1.getFilePath(), null);
// String imageUlr = minioUtil.getFileUrl(minioConfig.getBucketName(),vo1.getImage(), GlobalUtils.FILE_TIMES);
// String path = minioUtil.getFileUrl(minioConfig.getBucketName(),vo1.getFilePath(), GlobalUtils.FILE_TIMES);
vo1.setImage(imageUlr);
vo1.setUrl(path);
if ("0".equals(vo1.getFileType())) {
videoList.add(vo1);
} else {
fileList.add(vo1);
}
});
vo.setVideoList(videoList);
vo.setFileList(fileList);
}
}
return AjaxResult.success(vo);
}catch (Exception e){
} catch (Exception e) {
log.error(e.toString());
}
return AjaxResult.success(product);
}
public void getProductDetails(TbProduct product, TbProduct vo, ProductMapper productMapper, MinioUtil minioUtil) {
List<TbProductCase> productCases= productMapper.getProductCaseList(product.getId());
for (TbProductCase productCase:productCases) {
@Override
public AjaxResult getProductDetailsById(TbProduct product) {
TbProductCase productCase = productMapper.getProductDetailsById(product.getId());
//产品案例
List<ProductCaseImage> caseImages = productMapper.getCaseImageByTable(productCase.getId(), "tb_product_case");
if (StringUtils.isNotEmpty(caseImages)) {
caseImages.forEach(image -> {
String path = fileServiceUtils.getFileUrl(image.getFilePath(), image.getBucketName());
// String path = minioUtil.getFileUrl(image.getBucketName(),image.getFilePath(), GlobalUtils.FILE_TIMES);
image.setUrl(path);
});
productCase.setImageList(caseImages);
}
return AjaxResult.success(productCase);
}
public void getProductDetails(TbProduct product, TbProduct vo, ProductMapper productMapper, MinioUtil minioUtil) {
List<TbProductCase> productCases = productMapper.getProductCaseList(product.getId());
for (TbProductCase productCase : productCases) {
//产品案例
List<ProductCaseImage> caseImages= productMapper.getCaseImageByTable(productCase.getId(),"tb_product_case");
if(StringUtils.isNotEmpty(caseImages)){
caseImages.forEach(image->{
String path = fileServiceUtils.getFileUrl(image.getFilePath(),image.getBucketName());
// String path = minioUtil.getFileUrl(image.getBucketName(),image.getFilePath(), GlobalUtils.FILE_TIMES);
List<ProductCaseImage> caseImages = productMapper.getCaseImageByTable(productCase.getId(), "tb_product_case");
if (StringUtils.isNotEmpty(caseImages)) {
caseImages.forEach(image -> {
String path = fileServiceUtils.getFileUrl(image.getFilePath(), image.getBucketName());
// String path = minioUtil.getFileUrl(image.getBucketName(),image.getFilePath(), GlobalUtils.FILE_TIMES);
image.setUrl(path);
});
productCase.setImageList(caseImages);

9
bonus-business/src/main/resources/mapper/business/TbProductMapper.xml
View File

@ -76,6 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where product_id=#{id}
</select>
<select id="getProductDetailsById" resultType="com.bonus.business.domain.TbProductCase">
SELECT id,product_id productId,case_company caseCompany,case_introduction caseIntroduction,case_sort caseSort
from tb_product_case
where del_flag=0 and id=#{id}
</select>
<insert id="addProduct" parameterType="com.bonus.business.domain.TbProduct" keyProperty="id" useGeneratedKeys="true" >
insert into tb_product
@ -158,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTbProductByIds" parameterType="String">
delete from tb_product where id in
delete from tb_product where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
@ -177,4 +182,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</update>
</mapper>
</mapper>