From ec361fd62accdc99872b1add20d2e2d19113625a Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 27 Oct 2023 18:31:45 +0800 Subject: [PATCH] //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}