From df6f5bd0e68d792d25086636dcb8f897cc4b2512 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Thu, 22 Jun 2023 17:55:29 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=AC=A1=E6=95=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxUserGrantController.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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); From 5fbc563684f9119a6fb65c6f1bd56a2e60e2c252 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Sun, 25 Jun 2023 14:37:07 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=80=A7=E5=88=AB?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java index 46fb919..7fc31e9 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java @@ -31,7 +31,7 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { @Override public List chooseType(Long id) { - List voiceInfos = voiceMapper.selectList(new LambdaQueryWrapper().eq(VoiceInfo::getLanguageId, id).orderByAsc(VoiceInfo::getDisplayName).select(VoiceInfo::getId, VoiceInfo::getDisplayName, VoiceInfo::getStyleList)); + List voiceInfos = voiceMapper.selectList(new LambdaQueryWrapper().eq(VoiceInfo::getLanguageId, id).orderByAsc(VoiceInfo::getDisplayName).select(VoiceInfo::getId, VoiceInfo::getDisplayName, VoiceInfo::getStyleList,VoiceInfo::getSex)); voiceInfos.forEach(x -> { if (StringUtils.isNotEmpty(x.getStyleList())) { List strings = JSON.parseArray(x.getStyleList(), String.class); From c1ae1f0ad2f950e24201e8fbcb23aa73dccbfbd0 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 09:34:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/sm/VoiceLanguage.java | 21 +++++-------------- .../sm/impl/VoiceLanguageServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 17 deletions(-) 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..f1196b8 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 @@ -10,7 +10,7 @@ import java.util.Objects; * 语种表 */ @Data -public class VoiceLanguage implements Comparable { +public class VoiceLanguage { /** * 主键ID @@ -40,6 +40,10 @@ public class VoiceLanguage implements Comparable { * */ private String name; + /** + * + */ + private String Cname; /** * 图片 */ @@ -57,19 +61,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/service/sm/impl/VoiceLanguageServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java index 0b436dd..8990593 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).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg, VoiceLanguage::getCname)); return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; } } From 875c8bc7c9538b0f386bc81011b0a69603b9afa1 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 09:59:08 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/sm/VoiceInfo.java | 17 ++++++++--------- .../iformall/domain/po/sm/VoiceLanguage.java | 19 +++++++++---------- .../iformall/mapper/VoiceLanguageMapper.java | 2 +- .../sm/impl/VoiceLanguageServiceImpl.java | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) 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 f1196b8..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 { +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class VoiceLanguage extends TenantEntity { /** * 主键ID */ private Long id; - /** - * 租户ID - */ - private String tenantId; - /** - * 父租户ID - */ - private String parentTenantId; /** * 国家code */ @@ -43,7 +42,7 @@ public class VoiceLanguage { /** * */ - private String Cname; + private String chineseName; /** * 图片 */ 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 8990593..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, VoiceLanguage::getCname)); + List languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName)); return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; } } From 4422b2008cb8966bd6aad4e2d7fa4d3850c73e59 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 13:59:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/PhotoSpeakVideoController.java | 7 +++++++ .../com/iformall/controller/VoiceMaterialController.java | 5 ++++- .../main/java/com/iformall/enums/EnumMouldSendType.java | 2 ++ .../src/main/java/com/iformall/enums/EnumVoiceFrom.java | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) 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/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java b/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java index 235b7fb..86602d3 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java @@ -11,6 +11,8 @@ public enum EnumMouldSendType { auto(1,"系统免费"), // buy(2, "系统收费"), build(3, "用户自建"), + RECODING(4,"录音"), + FROM_UPD(5,"用户上传"), ; public static EnumMouldSendType getEnum(Integer code) { diff --git a/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java b/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java index b2f0b43..9c6f2ae 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java @@ -8,6 +8,7 @@ public enum EnumVoiceFrom { FROM_MOULD(1, "模板"), FROM_UPD(2,"用户上传"), MUSIC(3,"音乐"), + RECODING(4,"录音"), ; public static EnumVoiceFrom getEnum(Integer code) { From cb8f74bceebd2556da0545c1bab810d1575df29f Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 14:02:56 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/enums/EnumMouldSendType.java | 2 -- .../src/main/java/com/iformall/enums/EnumVoiceFrom.java | 1 - 2 files changed, 3 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java b/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java index 86602d3..235b7fb 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumMouldSendType.java @@ -11,8 +11,6 @@ public enum EnumMouldSendType { auto(1,"系统免费"), // buy(2, "系统收费"), build(3, "用户自建"), - RECODING(4,"录音"), - FROM_UPD(5,"用户上传"), ; public static EnumMouldSendType getEnum(Integer code) { diff --git a/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java b/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java index 9c6f2ae..b2f0b43 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumVoiceFrom.java @@ -8,7 +8,6 @@ public enum EnumVoiceFrom { FROM_MOULD(1, "模板"), FROM_UPD(2,"用户上传"), MUSIC(3,"音乐"), - RECODING(4,"录音"), ; public static EnumVoiceFrom getEnum(Integer code) { From 5fc75b1a1e57f0b0e6264abb7e41214c5abc5828 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 14:04:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/sm/VoiceMaterial.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; + } From 778ee17f7d0e5876a77e48ba162a09ab051e59d4 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 14:10:16 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V202306271409_voice_material.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 suimangAdmin/src/main/resources/db/migration/V202306271409_voice_material.sql 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