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 747a216..b12ba7e 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 @@ -63,6 +63,7 @@ public class AiVideoServiceImpl implements AiVideoService { SaveServiceVideoRecordDTO saveServiceVideoRecordDTO = SaveServiceVideoRecordDTO.builder() .serviceId(serviceId) .videoTime(String.valueOf(video.getDuration())) + .videoUrl(video.getUrl()) .build(); serviceVideoRecordService.saveServiceVideoRecord(saveServiceVideoRecordDTO); } diff --git a/open-api/src/main/java/com/iformall/vo/PageServiceVedioRecordVO.java b/open-api/src/main/java/com/iformall/vo/PageServiceVedioRecordVO.java index bb681bd..f851df4 100644 --- a/open-api/src/main/java/com/iformall/vo/PageServiceVedioRecordVO.java +++ b/open-api/src/main/java/com/iformall/vo/PageServiceVedioRecordVO.java @@ -14,6 +14,8 @@ public class PageServiceVedioRecordVO { private Long serviceId; @ApiModelProperty("视频时长") private String videoTime; + @ApiModelProperty("视频链接") + private String videoUrl; @ApiModelProperty("创建时间") private Date createDate; @@ -23,6 +25,7 @@ public class PageServiceVedioRecordVO { vo.setServiceId(serviceVideoRecord.getServiceId()); vo.setVideoTime(serviceVideoRecord.getVideoTime()); vo.setCreateDate(serviceVideoRecord.getCreateTime()); + vo.setVideoUrl(serviceVideoRecord.getVideoUrl()); return vo; } } diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java index e63b813..1ddcc77 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java @@ -16,6 +16,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.sm.PersonMould; import com.iformall.domain.po.sm.ServiceInfo; +import com.iformall.domain.po.sm.ServiceVideoRecord; import com.iformall.enums.EnumProject; import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumYesOrNo; @@ -24,6 +25,8 @@ import com.iformall.exception.BizException; import com.iformall.service.MallUserInfoService; import com.iformall.service.sm.PersonMouldService; import com.iformall.service.sm.ServiceInfoService; +import com.iformall.service.sm.ServiceVideoRecordService; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -46,6 +49,9 @@ public class ServiceInfoController extends MallUserInfoBaseController{ @Autowired private PersonMouldService personMouldService; + + @Autowired + private ServiceVideoRecordService serviceVideoRecordService; @ApiVersion(group = SwaggerConstant.V_1_0_0) @ApiOperation("分页查询合作商") @@ -149,11 +155,26 @@ public class ServiceInfoController extends MallUserInfoBaseController{ } @ApiVersion(group = SwaggerConstant.V_1_0_0) - @ApiOperation("设置关联模板") - @PostMapping("/current") + @ApiOperation("当前") + @GetMapping("/current") public ResultData currentInfo() { MallUserInfo user = this.getUser(); ServiceInfo si = serviceInfoService.getServiceInfoByMallUserInfo(user.getId()); return new ResultData(si); } + + @ApiVersion(group = SwaggerConstant.V_1_0_0) + @ApiOperation("当前") + @GetMapping("/currentVideoRecords") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData currentVideoRecords(Integer pageNum, Integer pageSize) { + MallUserInfo user = this.getUser(); + ServiceInfo si = serviceInfoService.getServiceInfoByMallUserInfo(user.getId()); + ServiceVideoRecord svr = new ServiceVideoRecord(); + svr.setServiceId(si.getId()); + PageInfo personMouldPage = serviceVideoRecordService.listAsPage(svr, pageNum, pageSize); + return new ResultData(personMouldPage); + } } diff --git a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql index 281e7d3..df8bb1f 100644 --- a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql +++ b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql @@ -43,3 +43,7 @@ CREATE TABLE `service_person_mould` ( UNIQUE KEY `id_UNIQUE` (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='接入方关联模板'; +ALTER TABLE `service_video_record` +ADD COLUMN video_url varchar(300) COMMENT '视频链接'; + + diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceVideoRecordDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceVideoRecordDTO.java index bfdc40b..60ea913 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceVideoRecordDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceVideoRecordDTO.java @@ -21,6 +21,8 @@ public class SaveServiceVideoRecordDTO { private Long serviceId; @ApiModelProperty("视频时长") private String videoTime; + @ApiModelProperty("视频链接") + private String videoUrl; public static ServiceVideoRecord mapping(SaveServiceVideoRecordDTO dto) { ServiceVideoRecord serviceVideoRecord = new ServiceVideoRecord(); @@ -29,6 +31,7 @@ public class SaveServiceVideoRecordDTO { serviceVideoRecord.setUpdateTime(new Date()); serviceVideoRecord.setServiceId(dto.getServiceId()); serviceVideoRecord.setVideoTime(dto.getVideoTime()); + serviceVideoRecord.setVideoUrl(dto.getVideoUrl()); return serviceVideoRecord; } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java index 25b9991..82db0c0 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java @@ -40,4 +40,10 @@ public class ServiceVideoRecord extends BaseEntity{ */ @TableField("video_time") private String videoTime; + + /** + * 视频链接 + */ + @TableField("video_url") + private String videoUrl; }