瀏覽代碼

fix

master
winter 1 年之前
父節點
當前提交
cd277575e0
共有 4 個檔案被更改,包括 32 行新增4 行删除
  1. +2
    -2
      suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java
  2. +18
    -0
      suimangService/src/main/java/com/iformall/common/Result.java
  3. +11
    -1
      suimangService/src/main/java/com/iformall/common/ResultData.java
  4. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java

+ 2
- 2
suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java 查看文件

@@ -201,7 +201,7 @@ public class VoiceMouldController extends BaseController {
PreviewVoiceVO pv = voiceInfoService.hyPreviewVoice(aiPreviewParam);
Double time = pv.getTime();//秒
if (time > 5*60 ) {
return new ResultData(ErrorCode.MEMBER_NO_POINTS.getCode(),"视频最大时长为300秒,当前时长为"+time+"秒");
return new ResultData(Result.ERROR,"视频最大时长为300秒,当前时长为"+time+"秒","video max times is 300 seconds. current is"+time+" seconds");
}
//如果用户未支付,则只能1分钟以内,如果已支付,则可以5分钟以内
ProductOrder po = new ProductOrder();
@@ -209,7 +209,7 @@ public class VoiceMouldController extends BaseController {
Integer paidCount = productOrderService.findPaidCount(po);
if (null == paidCount || paidCount <= 0 ) {
if (time > 60) {
return new ResultData(ErrorCode.MEMBER_NO_POINTS.getCode(),"视频最大时长为60秒,当前时长为"+time+"秒");
return new ResultData(ErrorCode.MEMBER_NO_POINTS.getCode(),"视频最大时长为60秒,当前时长为"+time+"秒","video max times is 60 seconds. current is"+time+" seconds");
}
}
return new ResultData(pv);


+ 18
- 0
suimangService/src/main/java/com/iformall/common/Result.java 查看文件

@@ -1,6 +1,9 @@
package com.iformall.common;

import java.util.HashMap;
import java.util.Map;

import com.iformall.enums.EnumLanguages;

/**
* @author chenkx
@@ -10,6 +13,7 @@ public class Result {

public int code;
public String message;
public Map<String,String> languageMessage = new HashMap<String,String>();
public static final int SUCCESS = 200;
public static final int ERROR = 500;
public static final int UNLOGIN = 701;
@@ -17,16 +21,30 @@ public class Result {
public Result() {
this.code = 200;
this.message = "success";
this.addLanguage(EnumLanguages.zh_CN, message);
}

public Result(int code, String message) {
this.code = code;
this.message = message;
this.addLanguage(EnumLanguages.zh_CN, message);
}
public Result(int code, String message,String enMessage) {
this.code = code;
this.message = message;
this.addLanguage(EnumLanguages.zh_CN, message).addLanguage(EnumLanguages.en_US, enMessage);
}

public Result(ErrorCode errorCode) {
this.code = errorCode.getCode();
this.message = errorCode.getMessage();
this.addLanguage(EnumLanguages.zh_CN, message);
}
public Result addLanguage(EnumLanguages language,String message) {
this.languageMessage.put(language.getLanguages(), message);
return this;
}

}

+ 11
- 1
suimangService/src/main/java/com/iformall/common/ResultData.java 查看文件

@@ -8,6 +8,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.iformall.enums.EnumLanguages;

/**
* @author chenkx
* @date 2018-01-05.
@@ -69,29 +71,37 @@ public class ResultData extends Result {
public ResultData(int code, String message) {
super(code, message);
}
public ResultData(int code, String message,String enMessage) {
super(code, message,enMessage);
}

public ResultData(int code, String message, Object data) {
this.code = code;
this.message = message;
this.data = data;
super.addLanguage(EnumLanguages.zh_CN, message);
}

public ResultData(ErrorCode errorCode, Object data) {
this.code = errorCode.getCode();
this.message = errorCode.getMessage();
this.data = data;
super.addLanguage(EnumLanguages.zh_CN, message);
}

public ResultData(ErrorCode errorCode) {
this.code = errorCode.getCode();
this.message = errorCode.getMessage();
super.addLanguage(EnumLanguages.zh_CN, message);
}

public HashMap<String, Object> toHashMap() {
HashMap<String, Object> map = new HashMap<>(3);
HashMap<String, Object> map = new HashMap<>(4);
map.put("code", this.code);
map.put("message", this.message);
map.put("data", data);
map.put("languageMessage", this.languageMessage);
return map;
}



+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java 查看文件

@@ -108,7 +108,7 @@ public class VoiceInfoServiceImpl implements VoiceInfoService {
VoiceInfo voiceInfo = voiceMapper.selectOne(new LambdaQueryWrapper<VoiceInfo>()
.eq(VoiceInfo::getIsDel, 0)
.eq(VoiceInfo::getId, aiPreviewParam.getVoice_id()));
voiceInfo = Optional.ofNullable(voiceInfo).orElseThrow(() -> new BizException(ErrorCode.MEMBER_NO_POINTS.getCode(), "声音信息不存在"));
voiceInfo = Optional.ofNullable(voiceInfo).orElseThrow(() -> new BizException(ErrorCode.SYS_SERVER_ERROR.getCode(), "声音信息不存在"));

AiPreviewParam param = new AiPreviewParam();
param.setGen_txt(aiPreviewParam.getGen_txt().replaceAll(Constant.text_pause,"[*]"));


Loading…
取消
儲存