租移动

src/main/java/com/yunhai/bschclassmanage/aspect/SysOperationLogAspect.java

@@ -9,6 +9,11 @@ import com.yunhai.bschclassmanage.utils.OtherUtil;
 import com.yunhai.bschclassmanage.utils.SensitiveDataUtil;
 import com.yunhai.bschclassmanage.utils.SyncLogRetryContext;
 import com.yunhai.bschclassmanage.utils.UserContext;
+import com.yunhai.platform.apistd.ApiResponse;
+import com.yunhai.platform.utils.exception.DException;
+import com.yunhai.platform.utils.exception.ErrorCode;
+import com.yunhai.platform.utils.exception.IErrorCode;
+import com.yunhai.platform.utils.http.ApiResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -70,11 +75,11 @@ public class SysOperationLogAspect {
         Object result = null;
         try {
             result = point.proceed();
-            entity.setStatusCode(200);
+            entity.setStatusCode(resolveSuccessCode(result));
             fillResponse(entity, result, DEFAULT_MAX_RESPONSE_SIZE);
             return result;
         } catch (Throwable e) {
-            entity.setStatusCode(500);
+            entity.setStatusCode(resolveErrorCode(e));
             entity.setErrorMsg(buildErrorMsg(e));
             throw e;
         } finally {
@@ -144,6 +149,35 @@ public class SysOperationLogAspect {
         }
     }
 
+    /**
+     * 成功路径：提取全局返回对象的业务状态码。
+     * - Controller 直接返回 ApiResponse / ApiResult 时取其 code；
+     * - 其余（普通对象 / void / null）由平台 ApiResponseAdvice 统一包装为 success，code = SUCCESS(0)。
+     */
+    private int resolveSuccessCode(Object result) {
+        if (result instanceof ApiResponse) {
+            return ((ApiResponse<?>) result).getCode();
+        }
+        if (result instanceof ApiResult) {
+            return ((ApiResult<?>) result).getCode();
+        }
+        return ErrorCode.SUCCESS.getCode();
+    }
+
+    /**
+     * 异常路径：从业务异常提取错误码，兜底 INTERNAL_SERVER_ERROR。
+     * DException.getCode() 返回 IErrorCode（可能为 null），需二次取 int code。
+     */
+    private int resolveErrorCode(Throwable e) {
+        if (e instanceof DException) {
+            IErrorCode ec = ((DException) e).getCode();
+            if (ec != null) {
+                return ec.getCode();
+            }
+        }
+        return ErrorCode.INTERNAL_SERVER_ERROR.getCode();
+    }
+
     private HttpServletRequest getRequest() {
         ServletRequestAttributes a = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         return a != null ? a.getRequest() : null;