diff --git a/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java b/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java index 67746fd..b2eb658 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java @@ -7,10 +7,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.sm.MouldPatch; import com.iformall.domain.po.sm.MouldPatchSign; import com.iformall.domain.po.sm.UserMouldVideo; -import com.iformall.enums.EnumColour; -import com.iformall.enums.EnumMouldPatchType; -import com.iformall.enums.EnumMouldSendType; -import com.iformall.enums.EnumaMouldPatchStatus; +import com.iformall.enums.*; import com.iformall.language.LanguageDetect; import com.iformall.service.sm.MouldPatchService; import com.iformall.service.sm.MouldPatchSignService; @@ -74,14 +71,22 @@ public class MouldPatchController extends BaseController { if (record == null || StringUtils.isBlank(record.getPaperwork())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - LanguageDetect.detect(record.getPaperwork()); + String detect = LanguageDetect.detect(record.getPaperwork()); + if(StringUtils.isBlank(detect)){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"语种识别失败"); + } + EnumLanguages anEnum = EnumLanguages.getEnum(detect); + if(anEnum == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"暂不支持该语种"); + } MouldPatch mouldPatch = new MouldPatch(); mouldPatch.setType(EnumMouldPatchType.voice_mould.getCode()); mouldPatch.setSendType(EnumMouldSendType.auto.getCode()); mouldPatch.setStatus(EnumaMouldPatchStatus.put_on.getCode()); - + mouldPatch.setLanguages(anEnum.getCode()); mouldPatch.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); - return new ResultData(); + final PageInfo page = mouldPatchService.cListAsPage(mouldPatch, pageNum, pageSize); + return new ResultData(page); } } diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserInviteCodeController.java b/suimangCApi/src/main/java/com/iformall/controller/UserInviteCodeController.java index a40a67f..9af651f 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserInviteCodeController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserInviteCodeController.java @@ -67,7 +67,7 @@ public class UserInviteCodeController extends BaseController { inviteCode = userInviteCodeService.selectOne(inviteCode); if(inviteCode == null){ inviteCode = new UserInviteCode(); - inviteCode.setStatus(EnumYesOrNo.YES.getCode()); + inviteCode.setStatus(EnumYesOrNo.NO.getCode()); } return new ResultData(inviteCode); } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java index cfd0b8a..5e6e4ce 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java @@ -60,6 +60,9 @@ public class MouldPatch extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="EnumColour",name="colour") private Integer colour; + @io.swagger.annotations.ApiModelProperty(value="EnumLanguages",name="languages") + private Integer languages; + @TableField(exist = false) private String colourStr; diff --git a/suimangService/src/main/java/com/iformall/enums/EnumLanguages.java b/suimangService/src/main/java/com/iformall/enums/EnumLanguages.java new file mode 100644 index 0000000..f1e89b6 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/enums/EnumLanguages.java @@ -0,0 +1,75 @@ +package com.iformall.enums; + +/** + * 语种 + */ +public enum EnumLanguages { + + en_US(1, "en", "英语"), + zh_CN(2, "zh-cn","汉语"), + fr_FR(3, "fr","法语"), + de_DE(4, "de","德语"), + ja_JP(5, "ja","日语"), + ko_KR(6, "ko","韩语"), + mn_MN(7, "mn","蒙古语"), + ru_RU(8, "ru","俄语"), + es_ES(9, "es","西班牙语"), + th_TH(10, "th","泰语"), + + ; + + private EnumLanguages(Integer code, String languages, String message) { + this.code = code; + this.languages = languages; + this.message = message; + } + + private Integer code; + private String languages; + private String message; + + public static EnumLanguages getEnum(Integer code) { + for (EnumLanguages value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + public static EnumLanguages getEnum(String languages) { + for (EnumLanguages value : values()) { + if (value.getLanguages().equals(languages)) { + return value; + } + } + return null; + } + + + + public String getLanguages() { + return languages; + } + + public void setLanguages(String languages) { + this.languages = languages; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + +}