返回类方法调整

src/main/java/com/video/api/PlaybackRecordControllerAPI.java

@@ -29,6 +29,22 @@ public interface PlaybackRecordControllerAPI {
 //
     @PostMapping(value = "/tests")
     String test(HttpServletRequest request) throws Exception;
+
+    //成功信息
+    @GetMapping(value = "/testSuccess")
+    CommonResult success();
+
+    //成功信息有数据返回
+    @GetMapping(value = "/testSuccessValue")
+    CommonResult successValue();
+
+    //默认错误信息
+    @GetMapping(value = "/testFail")
+    CommonResult fail();
+
+    //自定义错误信息
+    @GetMapping(value = "/testFailValue")
+    CommonResult failValue();
 //
 //    @GetMapping("/video")
 //    void videoPreview(HttpServletRequest request, HttpServletResponse response) throws IOException, Exception;

src/main/java/com/video/api/SmsCodeControllerAPI.java

@@ -1,4 +1,9 @@
 package com.video.api;
 
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/api/sms-code")
+@Api(tags = {"SmsCodeControllerAPI"}, value = "短信验证码")
 public interface SmsCodeControllerAPI {
 }

src/main/java/com/video/controller/PlaybackRecordController.java

@@ -1,11 +1,15 @@
 package com.video.controller;
 
 import com.google.gson.Gson;
+import com.video.annotation.PassToken;
 import com.video.annotation.UserLoginCheck;
 import com.video.api.PlaybackRecordControllerAPI;
 
 
+import com.video.model.pojo.SmsCode;
 import com.video.model.pojo.resultData;
+import com.video.model.utils.CommonResult;
+import common.result.ResponseStatusEnum;
 import lombok.AllArgsConstructor;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -165,6 +169,34 @@ public class PlaybackRecordController implements PlaybackRecordControllerAPI {
         return "code=0000";
     }
 
+    @Override
+    @PassToken
+    public CommonResult success() {
+        return CommonResult.ok();
+    }
+
+    @Override
+    @PassToken
+    public CommonResult successValue() {
+        SmsCode result = new SmsCode();
+        result.setCode("测试");
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    @PassToken
+    public CommonResult fail() {
+        CommonResult result = CommonResult.fail();
+        return result;
+    }
+
+    @Override
+    @PassToken
+    public CommonResult failValue() {
+        CommonResult result = CommonResult.fail(Integer.toString(ResponseStatusEnum.SYSTEM_FILE_NOT_FOUND.getStatus()),ResponseStatusEnum.SYSTEM_FILE_NOT_FOUND.getMsg());
+        return result;
+    }
+
 //    public String upcar(){
 //        JSONObject resultjson = new JSONObject();
 //        Gson gson=new Gson();

src/main/java/com/video/controller/SendController.java

@@ -3,6 +3,8 @@ package com.video.controller;
 import com.tencentcloudapi.sms.v20210111.models.SendStatus;
 import com.video.annotation.PassToken;
 import com.video.api.SendControllerAPI;
+import com.video.model.utils.CommonResult;
+import common.result.Code;
 import common.utils.SendSms;
 import common.utils.ValidateCode;
 import io.swagger.annotations.Api;
@@ -23,7 +25,6 @@ public class SendController implements SendControllerAPI {
         String code=String.valueOf(vode);
         phone="+86"+phone;
         SendStatus[] ret = SendSms.sendSms(phone,code);
-
         return ret;
     }
 

src/main/java/com/video/controller/SmsCodeController.java

@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-04-20
  */
 @RestController
-@RequestMapping("/api/sms-code")
 public class SmsCodeController implements SmsCodeControllerAPI {
 
 }

src/main/java/com/video/model/utils/CommonResult.java

@@ -27,18 +27,16 @@ public class CommonResult<T> extends BaseResult implements Serializable {
 
     private T data;
 
-    public CommonResult(Code code, T data) {
-        this.status = code.getStatus();
-        this.msg = code.getMsg();
-        this.success = code.getSuccess();
-        this.data = data;
-    }
-
-
     private static final long serialVersionUID = 3616484754899974346L;
 
+
     public static CommonResult ok() {
-        return ok("1", "执行成功");
+        return ok(Integer.toString(ResponseStatusEnum.SUCCESS.getStatus()), ResponseStatusEnum.SUCCESS.getMsg());
+    }
+
+    public static <T> CommonResult<T> ok(T data) {
+        CommonResult<T> result = new CommonResult<T>(data);
+        return result;
     }
 
     public static <T> CommonResult<T> ok(String code, String msg) {
@@ -46,17 +44,50 @@ public class CommonResult<T> extends BaseResult implements Serializable {
     }
 
     public static CommonResult fail() {
-        return fail("-1", "执行失败");
+        return fail(Integer.toString(ResponseStatusEnum.FAILED.getStatus()), ResponseStatusEnum.FAILED.getMsg());
     }
 
     public static CommonResult fail(String code, String msg) {
         return baseCreate(code, msg, false);
     }
 
+    public CommonResult() {}
+
+    /**
+     * 用Code自定义返回信息
+     * 并把数据返回
+     */
+    public CommonResult(Code code, T data) {
+        this.status = code.getStatus();
+        this.msg = code.getMsg();
+        this.success = code.getSuccess();
+        this.data = data;
+    }
+
+    /**
+     * 成功的返回信息
+     */
+    public CommonResult(T data) {
+        this.setCode(Integer.toString(ResponseStatusEnum.SUCCESS.status()));
+        this.setMessage(ResponseStatusEnum.SUCCESS.msg());
+        this.setSuccess(ResponseStatusEnum.SUCCESS.success());
+        this.setData(data);
+    }
+
+
 
-    public CommonResult() {
+    /**
+     * 自定义错误返回信息
+     * @param EnumCode 枚举错误信息
+     * @return
+     */
+    public CommonResult(ResponseStatusEnum EnumCode) {
+        this.setCode(Integer.toString(EnumCode.status()));
+        this.setMessage(EnumCode.msg());
+        this.setSuccess(EnumCode.success());
     }
 
+
     private static <T> CommonResult<T> baseCreate(String code, String msg, boolean success) {
         CommonResult result = new CommonResult();
         result.setCode(code);
@@ -65,13 +96,6 @@ public class CommonResult<T> extends BaseResult implements Serializable {
         return result;
     }
 
-    public CommonResult(T data) {
-        this.setCode(Integer.toString(ResponseStatusEnum.SUCCESS.status()));
-        this.setMessage(ResponseStatusEnum.SUCCESS.msg());
-        this.setSuccess(ResponseStatusEnum.SUCCESS.success());
-        this.setData(data);
-    }
-
     public static CommonResult resultValue(ResponseStatusEnum responseStatus) {
         return new CommonResult(responseStatus);
     }
@@ -86,17 +110,10 @@ public class CommonResult<T> extends BaseResult implements Serializable {
         return new CommonResult(ResponseStatusEnum.FAILED, map);
     }
 
-    public CommonResult(ResponseStatusEnum responseStatus, T data) {
-        this.setCode(Integer.toString(responseStatus.status()));
-        this.setMessage(responseStatus.msg());
-        this.setSuccess(responseStatus.success());
-        this.setData(data);
-    }
-
     /**
      * 错误返回，直接返回错误的消息
      *
-     * @param msg
+     * @param msg 提示信息
      * @return
      */
     public static CommonResult errorMsg(String msg) {

src/main/java/common/exception/EmsExceptionHandler.java

@@ -1,6 +1,7 @@
 package common.exception;
 
 import com.fasterxml.jackson.core.JsonParseException;
+import com.video.model.pojo.SmsCode;
 import com.video.model.utils.CommonResult;
 import common.result.ResponseStatusEnum;
 import org.mybatis.spring.MyBatisSystemException;