From ec361fd62accdc99872b1add20d2e2d19113625a Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 27 Oct 2023 18:31:45 +0800 Subject: [PATCH 1/3] //video --- .../java/com/iformall/domain/po/Product.java | 3 ++ .../com/iformall/domain/po/WxCVideoTable.java | 2 ++ .../java/com/iformall/enums/EnumProject.java | 2 ++ .../com/iformall/mapper/WxCVideoMapper.java | 2 +- .../service/impl/WxCVideoServiceImpl.java | 33 +++++++++++-------- .../main/resources/mapper/ProductMapper.xml | 3 +- .../main/resources/mapper/WxCVideoMapper.xml | 5 +-- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/domain/po/Product.java b/suimangService/src/main/java/com/iformall/domain/po/Product.java index f6f7afb..618a761 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/Product.java +++ b/suimangService/src/main/java/com/iformall/domain/po/Product.java @@ -23,6 +23,9 @@ public class Product extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="EnumProductType",name="type") private Integer type; + @io.swagger.annotations.ApiModelProperty(value="",name="extraId") + private Long extraId; + @io.swagger.annotations.ApiModelProperty(value="",name="coverImg") private String coverImg; @io.swagger.annotations.ApiModelProperty(value="标题",name="title") diff --git a/suimangService/src/main/java/com/iformall/domain/po/WxCVideoTable.java b/suimangService/src/main/java/com/iformall/domain/po/WxCVideoTable.java index e268447..0cea27e 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/WxCVideoTable.java +++ b/suimangService/src/main/java/com/iformall/domain/po/WxCVideoTable.java @@ -49,6 +49,8 @@ public class WxCVideoTable extends TenantEntityWithoutFinalTenantId { private String modelMd5; @io.swagger.annotations.ApiModelProperty(value = "数字人模板预处理信息md文件校验码", name = "preinfo_md5") private String preInfoMd5; + @io.swagger.annotations.ApiModelProperty(value = "", name = "mask") + private String mask; } diff --git a/suimangService/src/main/java/com/iformall/enums/EnumProject.java b/suimangService/src/main/java/com/iformall/enums/EnumProject.java index acc6dc0..ff33f2a 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumProject.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumProject.java @@ -7,6 +7,8 @@ package com.iformall.enums; public enum EnumProject { + PROJECT_0(0,"通用"),//直播 + PROJECT_1(1,"邃芒慧播"),//直播 PROJECT_2(2,"邃芒慧影"),//数字人视频 PROJECT_3(3,"邃芒慧语"),//照片说话 diff --git a/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java b/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java index 08e9211..f03cd0f 100644 --- a/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java @@ -11,6 +11,6 @@ public interface WxCVideoMapper extends CommonMapper { List getById(Long id); - WxCVideoTable selectOne(Long id, long resource_id); + } diff --git a/suimangService/src/main/java/com/iformall/service/impl/WxCVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/WxCVideoServiceImpl.java index 31ecae1..50e0384 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/WxCVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/WxCVideoServiceImpl.java @@ -53,23 +53,28 @@ public class WxCVideoServiceImpl implements WxCVideoService, IExcelExportServer avatar.put("avatar_image", wxCVideoTable.getImage()); avatar.put("avatar_demo", wxCVideoTable.getDemo()); avatar.put("avatar_model", wxCVideoTable.getModel()); + avatar.put("avatar_model_md5", wxCVideoTable.getModelMd5()); + avatar.put("avatar_preinfo_md5", wxCVideoTable.getPreInfoMd5()); + //模板文件和预处理信息存放问题 - try { - File modelFile = new File(wxCVideoTable.getModelPath()); - avatar.put("avatar_model_md5", getFileMD5(modelFile)); - } catch (Exception e) { - e.printStackTrace(); - avatar.put("avatar_model_md5", wxCVideoTable.getModelMd5()); - } +// try { +// File modelFile = new File(wxCVideoTable.getModelPath()); +// avatar.put("avatar_model_md5", getFileMD5(modelFile)); +// } catch (Exception e) { +// e.printStackTrace(); +// avatar.put("avatar_model_md5", wxCVideoTable.getModelMd5()); +// } +// +// try { +// File preinfoFile = new File(wxCVideoTable.getPreInfoPath()); +// avatar.put("avatar_preinfo_md5", getFileMD5(preinfoFile)); +// } catch (Exception e) { +// e.printStackTrace(); +// avatar.put("avatar_preinfo_md5", wxCVideoTable.getPreInfoMd5()); +// } - try { - File preinfoFile = new File(wxCVideoTable.getPreInfoPath()); - avatar.put("avatar_preinfo_md5", getFileMD5(preinfoFile)); - } catch (Exception e) { - e.printStackTrace(); - avatar.put("avatar_preinfo_md5", wxCVideoTable.getPreInfoMd5()); - } avatar.put("avatar_preinfo", wxCVideoTable.getPreInfo()); + avatar.put("mask", wxCVideoTable.getMask()); avatar.put("expire_time", wxCVideoTable.getExpireTime().getTime() / 1000); avatar.put("class", wxCVideoTable.getClassType()); authorlist.add(avatar); diff --git a/suimangService/src/main/resources/mapper/ProductMapper.xml b/suimangService/src/main/resources/mapper/ProductMapper.xml index 553cc64..c3339ae 100644 --- a/suimangService/src/main/resources/mapper/ProductMapper.xml +++ b/suimangService/src/main/resources/mapper/ProductMapper.xml @@ -7,6 +7,7 @@ + @@ -21,7 +22,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`project_type`,`type`, + `id`,`tenant_id`,`parent_tenant_id`,`project_type`,`type`,`extra_id`, `cover_img`,`title`,`en_title`,`glod`,`detail`, `price_dollar`,`sell_price_dollar`,`price_rmb`,`sell_price_rmb`, `create_date`,`update_date` diff --git a/suimangService/src/main/resources/mapper/WxCVideoMapper.xml b/suimangService/src/main/resources/mapper/WxCVideoMapper.xml index 0dc0e45..7e7c145 100644 --- a/suimangService/src/main/resources/mapper/WxCVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/WxCVideoMapper.xml @@ -14,6 +14,7 @@ + @@ -27,7 +28,7 @@ --> SELECT wca.user_name,expire_time,wcav.id,wcav.name,wcav.image,wcav.model,wcav.preinfo,wcav.demo - ,wcav.class,wcav.model_path,wcav.preinfo_path + ,wcav.class,wcav.model_path,wcav.preinfo_path,wcav.model_md5,wcav.preinfo_md5,wcav.mask from wx_c_author wca left join wx_c_avatar wcav on wcav.id =wca.resource_id where wca.resource_id =#{resource_id} and wca.user_id = #{id} From 81075d077382a503b0c05571b57cf48b1cf4811a Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 27 Oct 2023 18:35:10 +0800 Subject: [PATCH 2/3] //level --- .../controller/LevelPackageController.java | 29 +++++++++++++++++++ .../service/sm/LevelPackageService.java | 10 +++++++ .../sm/impl/LevelPackageServiceImpl.java | 25 ++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 suimangCApi/src/main/java/com/iformall/controller/LevelPackageController.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/LevelPackageService.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/impl/LevelPackageServiceImpl.java diff --git a/suimangCApi/src/main/java/com/iformall/controller/LevelPackageController.java b/suimangCApi/src/main/java/com/iformall/controller/LevelPackageController.java new file mode 100644 index 0000000..7d7de76 --- /dev/null +++ b/suimangCApi/src/main/java/com/iformall/controller/LevelPackageController.java @@ -0,0 +1,29 @@ +package com.iformall.controller; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; +import com.iformall.common.ResultData; +import com.iformall.domain.po.UserBasicFrom; +import com.iformall.domain.po.base.BaseEntity; +import com.iformall.service.UserBasicFromService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@RequestMapping("/api/levelPackage") +@Api(description = "查套餐") +public class LevelPackageController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/LevelPackageService.java b/suimangService/src/main/java/com/iformall/service/sm/LevelPackageService.java new file mode 100644 index 0000000..51210d7 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/LevelPackageService.java @@ -0,0 +1,10 @@ +package com.iformall.service.sm; + + +import java.util.List; + +public interface LevelPackageService { + + + +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/LevelPackageServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/LevelPackageServiceImpl.java new file mode 100644 index 0000000..91afa7c --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/LevelPackageServiceImpl.java @@ -0,0 +1,25 @@ +package com.iformall.service.sm.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.iformall.domain.po.sm.UserConsumptionPackage; +import com.iformall.domain.po.sm.UserPackageDetail; +import com.iformall.enums.EnumYesOrNo; +import com.iformall.enums.sm.*; +import com.iformall.mapper.UserConsumptionPackageMapper; +import com.iformall.service.sm.LevelPackageService; +import com.iformall.service.sm.UserConsumptionPackageService; +import com.iformall.service.sm.UserPackageDetailService; +import org.apache.commons.collections.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class LevelPackageServiceImpl implements LevelPackageService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + +} From f95cb0ea7e882777bb3a784fc9208c3cf4620745 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Fri, 27 Oct 2023 18:50:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9api=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/ai/AiVideoController.java | 4 ++-- .../java/com/iformall/service/AiVideoService.java | 2 +- .../com/iformall/service/impl/AiVideoServiceImpl.java | 11 ++++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java b/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java index 2681945..ff1d3d0 100644 --- a/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java +++ b/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java @@ -30,7 +30,7 @@ public class AiVideoController extends BaseController { @ApiOperation("生成视频") @PostMapping("generateVideo") - public ResultData generateVideo(@RequestBody GenerateVideoDTO dto) { - return new ResultData(aiVideoService.generateVideo(dto, getServiceId())); + public ResultData generateVideo(@RequestBody AiVideoParam aiVideoParam) { + return new ResultData(aiVideoService.generateVideo(aiVideoParam, getServiceId())); } } diff --git a/open-api/src/main/java/com/iformall/service/AiVideoService.java b/open-api/src/main/java/com/iformall/service/AiVideoService.java index 5bee599..63e6757 100644 --- a/open-api/src/main/java/com/iformall/service/AiVideoService.java +++ b/open-api/src/main/java/com/iformall/service/AiVideoService.java @@ -23,5 +23,5 @@ public interface AiVideoService { * @param aiVideoParam * @return {@link AiVideoResult} */ - AiVideoResult generateVideo(GenerateVideoDTO dto, Long serviceId); + AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long serviceId); } diff --git a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java index cfdf67e..f7130b7 100644 --- a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java +++ b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java @@ -2,9 +2,11 @@ package com.iformall.service.impl; import com.iformall.common.CommonConstants; import com.iformall.domain.dto.sm.SaveServiceVideoRecordDTO; +import com.iformall.domain.po.sm.ServiceInfo; import com.iformall.dto.GenerateVideoDTO; import com.iformall.enums.sm.EnumThirdPartyType; import com.iformall.service.AiVideoService; +import com.iformall.service.sm.ServiceInfoService; import com.iformall.service.sm.ServiceVideoRecordService; import com.iformall.sm.*; import com.iformall.utils.Base64Util; @@ -20,6 +22,8 @@ import org.springframework.stereotype.Service; @Service public class AiVideoServiceImpl implements AiVideoService { + @Autowired + private ServiceInfoService serviceInfoService; @Autowired private ServiceVideoRecordService serviceVideoRecordService; @@ -29,10 +33,11 @@ public class AiVideoServiceImpl implements AiVideoService { } @Override - public AiVideoResult generateVideo(GenerateVideoDTO dto, Long serviceId) { - AiVideoParam aiVideoParam = dto.getAiVideoParam(); + public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long serviceId) { + // 查询该接入商的接入方式 + ServiceInfo serviceInfo = serviceInfoService.getServiceInfo(serviceId); // 如果是api接入,则将图片地址转为base64 - if (EnumThirdPartyType.API_JOIN.getCode().equals(dto.getType())) { + if (EnumThirdPartyType.API_JOIN.getCode().equals(serviceInfo.getType())) { AiVideoParam.VideoFiles videoFiles = aiVideoParam.getVideo_files(); videoFiles.getBack_ground().setImage(Base64Util.imageUrlToBase64(videoFiles.getBack_ground().getImage())); for (AiVideoParam.Material material : videoFiles.getMaterial()) {