From e57dd979149fac0ad4db965950e974022d3fc830 Mon Sep 17 00:00:00 2001 From: twy <2301620162@qq.com> Date: Tue, 18 Jul 2023 16:59:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=A8=A1=E6=9D=BF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/VideoController.java | 6 ++-- .../com/iformall/domain/po/WxCVideoTable.java | 36 +++++++++---------- .../com/iformall/mapper/WxCVideoMapper.java | 4 ++- .../com/iformall/service/WxCVideoService.java | 3 +- .../service/impl/WxCVideoServiceImpl.java | 35 ++++++++++++++---- .../main/resources/mapper/WxCVideoMapper.xml | 26 +++++++------- 6 files changed, 67 insertions(+), 43 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/VideoController.java b/suimangCApi/src/main/java/com/iformall/controller/VideoController.java index 74210f7..ec11a6f 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VideoController.java @@ -131,10 +131,10 @@ public class VideoController extends BaseController { @AuthIgnore @PostMapping("/avatarList") @ApiOperation(value = "视频模板列表", notes = "{\"username\",\"string\",\"code\",\"string\"}") - public WxCVideoTable avatarList(@RequestBody Map params){ + public ResultData avatarList(@RequestBody Map params){ String username = params.get("username"); - WxCVideoTable TemplateVideo = wxCVideoService.findByUserName(username); - return TemplateVideo; + + return wxCVideoService.findByUserName(username); } } 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 000f2ea..35749ba 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/WxCVideoTable.java +++ b/suimangService/src/main/java/com/iformall/domain/po/WxCVideoTable.java @@ -11,7 +11,7 @@ import lombok.ToString; import java.util.ArrayList; import java.util.Date; -@TableName(value ="wx_c_avatar") +@TableName(value ="wx_c_author") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @@ -22,27 +22,25 @@ public class WxCVideoTable extends TenantEntityWithoutFinalTenantId { @TableField(exist = false) private String currentTime; - @TableField(exist = false) - private ArrayList authorList; + private String expireTime; + + + @io.swagger.annotations.ApiModelProperty(value="数字人id",name="id") + private int id; + @io.swagger.annotations.ApiModelProperty(value="数字人名称",name="name") + private String name; + + @io.swagger.annotations.ApiModelProperty(value="数字人封面图片链接",name="image") + private String image; + @io.swagger.annotations.ApiModelProperty(value="数字人样例视频链接",name="demo") + private String demo; + @io.swagger.annotations.ApiModelProperty(value="数字人模板预处理信息文件链接",name="preInfo") + private String preInfo; + + - //public class Author extends TenantEntityWithoutFinalTenantId{ - @io.swagger.annotations.ApiModelProperty(value="数字人id",name="id") - private int id; - @io.swagger.annotations.ApiModelProperty(value="数字人名称",name="name") - private String name; - @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="权限过期时间",name="expire_time") - private Date expireTime; - - @io.swagger.annotations.ApiModelProperty(value="数字人封面图片链接",name="image") - private String image; - @io.swagger.annotations.ApiModelProperty(value="数字人样例视频链接",name="demo") - private String demo; - @io.swagger.annotations.ApiModelProperty(value="数字人模板预处理信息文件链接",name="preInfo") - private String preInfo; - // } } diff --git a/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java b/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java index bdeb2df..72600f2 100644 --- a/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/WxCVideoMapper.java @@ -5,8 +5,10 @@ import com.iformall.domain.po.WxCUserTags; import com.iformall.domain.po.WxCVideoTable; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface WxCVideoMapper extends CommonMapper { - WxCVideoTable findByUserName(@Param("username") String username); + List findByUserName(@Param("username") String username); } diff --git a/suimangService/src/main/java/com/iformall/service/WxCVideoService.java b/suimangService/src/main/java/com/iformall/service/WxCVideoService.java index bc84755..ec95ad8 100644 --- a/suimangService/src/main/java/com/iformall/service/WxCVideoService.java +++ b/suimangService/src/main/java/com/iformall/service/WxCVideoService.java @@ -1,9 +1,10 @@ package com.iformall.service; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxCVideoTable; public interface WxCVideoService { - WxCVideoTable findByUserName(String username); + ResultData findByUserName(String username); } 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 5dabc33..48e5f28 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/WxCVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/WxCVideoServiceImpl.java @@ -1,6 +1,9 @@ package com.iformall.service.impl; import cn.afterturn.easypoi.handler.inter.IExcelExportServer; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.iformall.common.ResultData; + import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCVideoTable; import com.iformall.domain.vo.WxCUserBasicInfoVo; @@ -13,9 +16,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -31,9 +32,31 @@ public class WxCVideoServiceImpl implements WxCVideoService,IExcelExportServer { @Autowired WxCVideoMapper wxCVideoMapper; @Override - public WxCVideoTable findByUserName(String username) { - WxCVideoTable TemplateVideo = wxCVideoMapper.findByUserName(username); - return TemplateVideo; + public ResultData findByUserName(String username) { + List TemplateVideo = wxCVideoMapper.findByUserName(username); + System.out.println("TemplateVideo = " + TemplateVideo); + Map resultMap = new HashMap(); + Map data = new HashMap(); + + data.put("username",username); + data.put("current_time",new Date(System.currentTimeMillis())); + //Map authorlist = new HashMap(); + List authorlist = new ArrayList(); + for (WxCVideoTable wxCVideoTable : TemplateVideo) { + Map avatar = new HashMap(); + avatar.put("avatar_id",wxCVideoTable.getId()); + avatar.put("avatar_name",wxCVideoTable.getName()); + avatar.put("avatar_image",wxCVideoTable.getImage()); + avatar.put("avatar_demo",wxCVideoTable.getDemo()); + avatar.put("avatar_preinfo",wxCVideoTable.getPreInfo()); + avatar.put("expire_time",wxCVideoTable.getExpireTime()); + authorlist.add(avatar); + resultMap.put("authorlist",authorlist); + } + + resultMap.put("data",data); + + return new ResultData(resultMap); } @Override diff --git a/suimangService/src/main/resources/mapper/WxCVideoMapper.xml b/suimangService/src/main/resources/mapper/WxCVideoMapper.xml index 2ab2ea5..2ae2a93 100644 --- a/suimangService/src/main/resources/mapper/WxCVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/WxCVideoMapper.xml @@ -7,21 +7,21 @@ - + + - + + + - \ No newline at end of file +