@@ -2,7 +2,11 @@ package com.iformall.domain.po.sm; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | |||||
import com.iformall.domain.po.base.TenantEntity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | |||||
import lombok.ToString; | |||||
import java.util.Date; | import java.util.Date; | ||||
import java.util.List; | import java.util.List; | ||||
@@ -10,8 +14,11 @@ import java.util.List; | |||||
/** | /** | ||||
* 声音表 | * 声音表 | ||||
*/ | */ | ||||
@TableName(value = "voice_info") | |||||
@Data | @Data | ||||
public class VoiceInfo { | |||||
@ToString(callSuper = true) | |||||
@EqualsAndHashCode(callSuper = true) | |||||
public class VoiceInfo extends TenantEntity { | |||||
/** | /** | ||||
* 主键ID | * 主键ID | ||||
*/ | */ | ||||
@@ -21,14 +28,6 @@ public class VoiceInfo { | |||||
*/ | */ | ||||
private Long languageId; | private Long languageId; | ||||
/** | /** | ||||
* 租户ID | |||||
*/ | |||||
private String tenantId; | |||||
/** | |||||
* 父租户ID | |||||
*/ | |||||
private String parentTenantId; | |||||
/** | |||||
* 性别 | * 性别 | ||||
*/ | */ | ||||
private Integer sex; | private Integer sex; | ||||
@@ -1,7 +1,11 @@ | |||||
package com.iformall.domain.po.sm; | package com.iformall.domain.po.sm; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | |||||
import com.iformall.domain.po.base.TenantEntity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | |||||
import lombok.ToString; | |||||
import java.util.Date; | import java.util.Date; | ||||
import java.util.Objects; | import java.util.Objects; | ||||
@@ -9,21 +13,16 @@ import java.util.Objects; | |||||
/** | /** | ||||
* 语种表 | * 语种表 | ||||
*/ | */ | ||||
@TableName(value = "voice_language") | |||||
@Data | @Data | ||||
public class VoiceLanguage { | |||||
@ToString(callSuper = true) | |||||
@EqualsAndHashCode(callSuper = true) | |||||
public class VoiceLanguage extends TenantEntity { | |||||
/** | /** | ||||
* 主键ID | * 主键ID | ||||
*/ | */ | ||||
private Long id; | private Long id; | ||||
/** | |||||
* 租户ID | |||||
*/ | |||||
private String tenantId; | |||||
/** | |||||
* 父租户ID | |||||
*/ | |||||
private String parentTenantId; | |||||
/** | /** | ||||
* 国家code | * 国家code | ||||
*/ | */ | ||||
@@ -43,7 +42,7 @@ public class VoiceLanguage { | |||||
/** | /** | ||||
* | * | ||||
*/ | */ | ||||
private String Cname; | |||||
private String chineseName; | |||||
/** | /** | ||||
* 图片 | * 图片 | ||||
*/ | */ | ||||
@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param; | |||||
import java.util.HashSet; | import java.util.HashSet; | ||||
public interface VoiceLanguageMapper extends CommonMapper<VoiceLanguage, String> { | |||||
public interface VoiceLanguageMapper extends CommonMapper<VoiceLanguage, Long> { | |||||
void saveBatch(@Param("set") HashSet<VoiceLanguage> set); | void saveBatch(@Param("set") HashSet<VoiceLanguage> set); | ||||
} | } | ||||
@@ -20,7 +20,7 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService { | |||||
@Override | @Override | ||||
public List<VoiceLanguage> voiceTotal() { | public List<VoiceLanguage> voiceTotal() { | ||||
List<VoiceLanguage> languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper<VoiceLanguage>().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg, VoiceLanguage::getCname)); | |||||
List<VoiceLanguage> languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper<VoiceLanguage>().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName)); | |||||
return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; | return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; | ||||
} | } | ||||
} | } |