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; } }