common-dependencies、biz-customer | 修改 | 返回参数调整

mt
2024年11月11日15:52:42

@@ -9,6 +9,7 @@ import com.fedex.connect.customer.service.biz.IConsignmentService;
 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
   * @Author Szl
@@ -47,4 +48,17 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
         //如果不存在直接返回
         return ResponseVo.succ(null);
     }
+
+    /**
+      * @Author mt
+      * @Description 运单提交
+      * @Date 2024/11/11
+      * @param files
+      * @param consignmentBo
+      * @param user
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
+      */
+    public ResponseVo submitConsignment(MultipartFile[] files,ConsignmentBo consignmentBo,User user){
+        return null;
+    }
 }

@@ -8,6 +8,7 @@ import com.fedex.connect.common.model.biz.Consignment;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.bo.ConsignmentBo;
 import com.fedex.connect.customer.data.dto.ConsignmentAddDto;
+import com.fedex.connect.customer.enums.ResponseCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

 package com.fedex.connect.common.dependencies.common;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
 import com.fedex.connect.common.dependencies.exception.OpErrorException;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
@@ -18,12 +17,10 @@ public class BasicController {
         try {
             user = CurrentUserInfo.getUser();
         } catch (Exception e) {
-            ResponseVo rsVo = ResponseVo.fail(BaseResponseCode.TOKEN_FORMAT_ERROR.getCode(),localeMessageUtil.getMessage(BaseResponseCode.TOKEN_FORMAT_ERROR.getMsg()),null);
-            throw new OpErrorException(rsVo.getCode(),rsVo.getMsg(),e);
+            throw new OpErrorException(BaseResponseCode.TOKEN_FORMAT_ERROR.getCode(),localeMessageUtil.getMessage(BaseResponseCode.TOKEN_FORMAT_ERROR.getMsg()),e);
         }
         if (user == null) {
-            ResponseVo rsVo = ResponseVo.fail(BaseResponseCode.TOKEN_FORMAT_ERROR.getCode(),localeMessageUtil.getMessage(BaseResponseCode.OVERDUE_TOKEN_CODE.getMsg()),null);
-            throw new OpErrorException(rsVo.getCode(),rsVo.getMsg());
+            throw new OpErrorException(BaseResponseCode.OVERDUE_TOKEN_CODE.getCode(),localeMessageUtil.getMessage(BaseResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
         }
         return user;
     }

@@ -42,4 +42,12 @@ public interface BaseConstants {
         //用户录入原产国全称
         String USER_INPUT_ORIGIN_COUNTRY = "userInputOriginCountry";
     }
+
+    //异常枚举字段
+    interface RESPONSE_CODE_KEYS{
+        //code
+        String CODE = "code";
+        //描述
+        String MSG = "msg";
+    }
 }
\ No newline at end of file

+package com.fedex.connect.common.dependencies.data.bo;
+
+import lombok.Data;
+
+/**
+  * @Author mt
+  * @Description 做反射使用，因为各模块的reponseCode不一致所以建一个通用的接受数据使用
+  * @Date 2024/11/11
+  */
+@Data
+public class ResponseCodeBo {
+    /**
+      * @Author mt
+      * @Description 编码
+      * @Date 2024/11/11
+      */
+    Integer code;
+    /**
+      * @Author mt
+      * @Description 编码描述
+      * @Date 2024/11/11
+      */
+    String msg;
+    /**
+      * @Author mt
+      * @Description 国际化描述
+      * @Date 2024/11/11
+      */
+    String errMsg;
+}

 package com.fedex.connect.common.dependencies.date.vo;
 
-import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
-
-import javax.servlet.http.HttpServletResponse;
+import com.fedex.connect.common.dependencies.contants.DigitConstants;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
   * @Author Szl
   * @Description 类说明 响应结果vo
   * @Date 2024/10/30
   */
+@Data
 public class ResponseVo<T> {
-
-    private int code = HttpServletResponse.SC_BAD_REQUEST;;
-    private String msg;
+    @ApiModelProperty("成功标识(0#否,1#是)")
     private boolean success;
+    @ApiModelProperty("状态码")
+    private Integer code;
+    @ApiModelProperty("状态描述")
+    private String msg;
+    @ApiModelProperty("返回数据结构")
     private T data;
 
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public T getData() {
-        return data;
+    public ResponseVo(){
+        this.success = true;
+        this.code = DigitConstants.DIGIT_TWO_HUNDRED;
+        this.msg = "";
+        this.data = null;
     }
 
-    public void setData(T data) {
+    public ResponseVo(T data){
+        this.success = true;
+        this.code = DigitConstants.DIGIT_TWO_HUNDRED;
+        this.msg = "";
         this.data = data;
     }
 
-    public static ResponseVo succ(Object data, String message) {
-        return succ(BaseResponseCode.SUCCESS_CODE.getCode(), message, data);
-    }
-
-    public static ResponseVo succ(Object data) {
-        return succ(BaseResponseCode.SUCCESS_CODE.getCode(), "SUCCESS", data);
-    }
-
-    public static ResponseVo succ(int code, String msg, Object data) {
-        ResponseVo r = new ResponseVo();
-        r.setCode(code);
-        r.setMsg(msg);
-        r.setSuccess(true);
-        r.setData(data);
-        return r;
-    }
-
-    public static ResponseVo fail(String msg) {
-        return fail(BaseResponseCode.FAIL_CODE.getCode(), msg,null);
-    }
-
-    public static ResponseVo fail(int code, String msg, Object data) {
-        ResponseVo r = new ResponseVo();
-        r.setCode(code);
-        r.setMsg(msg);
-        r.setSuccess(false);
-        r.setData(data);
-        return r;
-    }
-
-    public static ResponseVo fail(BaseResponseCode resultCode) {
-        return fail(resultCode.getCode(), resultCode.getMsg(), null);
+    public ResponseVo(String message){
+        this.success = true;
+        this.code = DigitConstants.DIGIT_TWO_HUNDRED;
+        this.msg = message;
+        this.data = null;
     }
 
-    public static ResponseVo fail(BaseResponseCode resultCode, Object data) {
-        return fail(resultCode.getCode(), resultCode.getMsg(), data);
+    public ResponseVo(String code,String message){
+        this.success = true;
+        this.code = DigitConstants.DIGIT_TWO_HUNDRED;
+        this.msg = message;
+        this.data = null;
     }
 }

+package com.fedex.connect.common.dependencies.util;
+
+import com.fedex.connect.common.dependencies.contants.BaseConstants;
+import com.fedex.connect.common.dependencies.data.bo.ResponseCodeBo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.dependencies.exception.OpErrorException;
+import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+  * @Author mt
+  * @Description 返回响应错误的工具类
+  * @Date 2024/11/11
+  */
+@Slf4j
+@Component
+public class ResponseUtils {
+    @Autowired
+    LocaleMessageUtil localeMessageUtil;
+
+    /**
+      * @Author mt
+      * @Description 传入用于ErrorCodeEnum枚举对象，返回错误响应
+      * @Date 2024/11/11
+      * @param codeEnum
+      * @return void
+      */
+    public void fail(T codeEnum) {
+        ResponseCodeBo responseCodeBo = this.ref(codeEnum);
+        log.error(responseCodeBo.getErrMsg());
+        throw new OpErrorException(responseCodeBo.getCode(), responseCodeBo.getErrMsg());
+    }
+
+    public void fail(T codeEnum,Throwable e) {
+        ResponseCodeBo responseCodeBo = this.ref(codeEnum);
+        log.error(responseCodeBo.getErrMsg());
+        throw new OpErrorException(responseCodeBo.getCode(), responseCodeBo.getErrMsg(),e);
+    }
+
+    public ResponseVo success() {
+        return new ResponseVo<>();
+    }
+
+    public ResponseVo success(T data) {
+        return new ResponseVo<>(data);
+    }
+
+    public String msg(String msg){
+        String message = localeMessageUtil.getMessage(msg);
+        return message;
+    }
+
+    private ResponseCodeBo ref(T obj){
+        ResponseCodeBo responseCodeBo = new ResponseCodeBo();
+        try {
+            Object codeObj = AssignmentFieldUtils.getFieldValue(obj, BaseConstants.RESPONSE_CODE_KEYS.CODE);
+            Object msgObj = AssignmentFieldUtils.getFieldValue(obj, BaseConstants.RESPONSE_CODE_KEYS.MSG);
+            Integer code = Integer.valueOf(String.valueOf(codeObj));
+            String msg = String.valueOf(msgObj);
+            String errMsg = this.msg(msg);
+            responseCodeBo.setCode(code);
+            responseCodeBo.setMsg(msg);
+            responseCodeBo.setErrMsg(errMsg);
+        }catch(Exception ex){
+            log.error("AssignmentField error : ",ex);
+        }
+        return responseCodeBo;
+    }
+}