diff --git a/suimangAdmin/src/main/resources/db/migration/V202306271409_voice_material.sql b/suimangAdmin/src/main/resources/db/migration/V202306271409_voice_material.sql new file mode 100644 index 0000000..5886196 --- /dev/null +++ b/suimangAdmin/src/main/resources/db/migration/V202306271409_voice_material.sql @@ -0,0 +1,2 @@ +ALTER TABLE `mallink_suimang_test`.`voice_material` +ADD COLUMN `type` int NULL COMMENT '1-上传、2-录音' AFTER `type`; \ No newline at end of file diff --git a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java index 017ed2f..6796529 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -63,6 +63,9 @@ public class PhotoSpeakVideoController extends BaseController { @Autowired private MusicInfoService musicInfoService; + @Autowired + private VoiceMaterialService voiceMaterialService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -93,6 +96,10 @@ public class PhotoSpeakVideoController extends BaseController { VoiceInfo voiceInfo = voiceInfoService.getById(photoSpeakVideo.getVoiceMouldId()); photoSpeakVideo.setVoiceInfo(voiceInfo); } + if(photoSpeakVideo.getVoiceMaterialId() != null){ + VoiceMaterial voiceMaterial = voiceMaterialService.getById(photoSpeakVideo.getVoiceMaterialId()); + photoSpeakVideo.setVoiceMaterial(voiceMaterial); + } return new ResultData(photoSpeakVideo); } diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java index 29b5017..8fa90ec 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java @@ -69,7 +69,7 @@ public class VoiceMaterialController extends BaseController { public ResultData save(@RequestBody VoiceMaterial record) { logger.debug("[" + getIpAddr() + "] VoiceMaterialController::save"); if(record == null)record = new VoiceMaterial(); - record.setSendType(EnumMouldSendType.build.getCode()); +// record.setSendType(EnumMouldSendType.build.getCode()); record.setUserId(getMemberId()); if(StringUtils.isBlank(record.getVideoId())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"音频为空"); @@ -77,6 +77,9 @@ public class VoiceMaterialController extends BaseController { if(record.getTitle() == null){ record.setTitle("用户自建"); } + if(record.getSendType() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"上传音频类型不能为空"); + } record.setPrice(0); record.setSalePrice(0); record.setStatus(EnumaMouldPatchStatus.put_on.getCode()); diff --git a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index e331c12..6b3190d 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -366,11 +366,10 @@ public class WxUserGrantController extends BaseController { // if(isValidCode) { basicInfo = wxCUserBasicInfoService.register(getTenantInfo(),phone,password); - //TODO 用户 -// Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId()); -// if (!aBoolean){ -// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败"); -// } + Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId()); + if (!aBoolean){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败"); + } return new ResultData(); // } else { // return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND); @@ -416,11 +415,10 @@ public class WxUserGrantController extends BaseController { // if(isValidCode) { basicInfo = wxCUserBasicInfoService.registerEmail(getTenantInfo(),email,password); - //TODO 用户 -// Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId()); -// if (!aBoolean){ -// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败"); -// } + Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId()); + if (!aBoolean){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败"); + } return new ResultData(); // } else { // return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND); diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java index 15dc6b6..a1438a5 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java @@ -2,7 +2,11 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.Date; import java.util.List; @@ -10,8 +14,11 @@ import java.util.List; /** * 声音表 */ +@TableName(value = "voice_info") @Data -public class VoiceInfo { +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class VoiceInfo extends TenantEntity { /** * 主键ID */ @@ -21,14 +28,6 @@ public class VoiceInfo { */ private Long languageId; /** - * 租户ID - */ - private String tenantId; - /** - * 父租户ID - */ - private String parentTenantId; - /** * 性别 */ private Integer sex; diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java index ca5ef2d..d2799f7 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java @@ -1,7 +1,11 @@ package com.iformall.domain.po.sm; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.Date; import java.util.Objects; @@ -9,21 +13,16 @@ import java.util.Objects; /** * 语种表 */ +@TableName(value = "voice_language") @Data -public class VoiceLanguage implements Comparable { +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class VoiceLanguage extends TenantEntity { /** * 主键ID */ private Long id; - /** - * 租户ID - */ - private String tenantId; - /** - * 父租户ID - */ - private String parentTenantId; /** * 国家code */ @@ -40,6 +39,10 @@ public class VoiceLanguage implements Comparable { * */ private String name; + /** + * + */ + private String chineseName; /** * 图片 */ @@ -57,19 +60,4 @@ public class VoiceLanguage implements Comparable { */ private Integer isDel; - @Override - public int compareTo(Object obj) { - // 判断是否是学生类型 - if (obj instanceof VoiceLanguage) { - VoiceLanguage s = (VoiceLanguage) obj; - // 如果是学生类型,如果学号相等,则不加入Set - if (Objects.equals(s.getLanguage(), this.getLanguage()) && Objects.equals(s.getCountry(), this.getCountry())) { - return 0; - } else { - return 1; - } - } else { - return 0; - } - } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMaterial.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMaterial.java index 583cb97..06bb829 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMaterial.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMaterial.java @@ -118,5 +118,7 @@ public class VoiceMaterial extends TenantEntity { @TableField(exist = false) private List sendTypes; - + + private Integer type; + } diff --git a/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java b/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java index b8777a8..1d5e054 100644 --- a/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.HashSet; -public interface VoiceLanguageMapper extends CommonMapper { +public interface VoiceLanguageMapper extends CommonMapper { void saveBatch(@Param("set") HashSet set); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java index 0b436dd..d19a36d 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java @@ -20,7 +20,7 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService { @Override public List voiceTotal() { - List languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg)); + List languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName)); return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; } }