From e26b2f48c63d8b6a7757e1e8c4f04e006ccfbfe9 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 11:19:07 +0800
Subject: [PATCH] 修改异常抛出返回信息
---
src/main/java/com/zy/asrs/service/OrderService.java | 6 ++
src/main/java/com/zy/api/enums/OrderWkType.java | 22 +++++++----
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 5 ++
src/main/java/com/zy/common/config/CoolExceptionHandler.java | 51 ++++++++++++++++++++++++-
4 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/api/enums/OrderWkType.java b/src/main/java/com/zy/api/enums/OrderWkType.java
index d17d2a9..6843d1b 100644
--- a/src/main/java/com/zy/api/enums/OrderWkType.java
+++ b/src/main/java/com/zy/api/enums/OrderWkType.java
@@ -3,13 +3,16 @@
public enum OrderWkType {
// 璁㈠崟绫诲瀷
- ORDER_WK_PUR_IN("1", "閲囪喘鍏ュ簱"),
- ORDER_WK_TRANSFER_IN("2", "璋冩嫈鍏ュ簱"),
- ORDER_WK_SALE_IN("锛�", "閿�鍞��璐у叆搴�"),
- ORDER_WK_BAG_IN("锛�", "濂楀寘鍏ュ簱"),
- ORDER_WK_ORDER_OUT_EO("EO", "澶囪揣鎸囩ず娲惧伐鍗曪紙EO锛�"),
- ORDER_WK_ORDER_OUT_SO("SO", "澶囪揣鎸囩ず娲惧伐鍗曪紙SO锛�"),
- ORDER_WK_ORDER_OUT("14", "澶囪揣鍗�");
+ ORDER_WK_PUR_IN("0", "閲囪喘鍏ュ簱"),
+ ORDER_WK_TRANSFER_IN("1", "璋冩嫈鍏ュ簱"),
+ ORDER_WK_SALE_IN("2", "瀹㈡埛閫�璐�"),
+ ORDER_WK_BAG_IN("5", "绱㈣禂鍏ュ簱"),
+ ORDER_WK_SUPLUS_IN("7", "鎶ユ孩鍏ュ簱"),
+ ORDER_WK_PRO_UPDATE_IN("8", "浠跺彿鍙樻洿鍏ュ簱"),
+ ORDER_WK_MEGER_IN("K", "缁勫悎鎷嗛浂鍏ュ簱"),
+ ORDER_WK_ORDER_OUT_EO("11", "澶囪揣鎸囩ず娲惧伐鍗曪紙EO锛�"),
+ ORDER_WK_ORDER_OUT_SO("12", "澶囪揣鎸囩ず娲惧伐鍗曪紙SO锛�"),
+ ORDER_WK_ORDER_OUT("13", "澶囪揣鍗�");
OrderWkType(String val, String desc) {
this.val = val;
@@ -20,7 +23,10 @@
public String desc;
public static String getTypeVal(String val) {
- if (val.equals(OrderWkType.ORDER_WK_PUR_IN.val)) {
+ if (val.equals(OrderWkType.ORDER_WK_PUR_IN.val)
+ || val.equals(OrderWkType.ORDER_WK_SUPLUS_IN.val)
+ || val.equals(OrderWkType.ORDER_WK_MEGER_IN.val)
+ || val.equals(OrderWkType.ORDER_WK_PRO_UPDATE_IN.val)) {
return OrderType.ORDER_IN.type;
} else if (val.equals(OrderWkType.ORDER_WK_TRANSFER_IN.val)) {
return OrderType.ORDER_IN.type;
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index c401f48..67313e0 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -216,6 +216,9 @@
if (Objects.isNull(mats)) {
throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
}
+ if (Objects.isNull(mats.getPro_type())) {
+ throw new CoolException("闆朵欢绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", mats.getPro_komcode()));
if (!Objects.isNull(matnr)) {
// 璁㈠崟鏃堕棿
@@ -225,7 +228,7 @@
}
matnr.setMaktx(mats.getPro_name());
matnr.setSpecs(mats.getPro_size());
- matnr.setWeight(Double.parseDouble(mats.getPro_wet()));
+ matnr.setWeight(Objects.isNull(mats.getPro_wet()) ? 0.0 : Double.parseDouble(mats.getPro_wet()));
matnr.setSuppCode(mats.getPro_id());
matnr.setTagId(MatLocType.getTag(mats.getPro_type()));
matnr.setLocType(MatLocType.getTag(mats.getPro_type()));
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 667df16..256b861 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,7 +1,11 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.CheckOrder;
+import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
import java.util.List;
diff --git a/src/main/java/com/zy/common/config/CoolExceptionHandler.java b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
index b3968a3..a821d79 100644
--- a/src/main/java/com/zy/common/config/CoolExceptionHandler.java
+++ b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
@@ -6,6 +6,9 @@
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.method.HandlerMethod;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
/**
* Created by vincent on 2019-06-09
@@ -14,18 +17,35 @@
public class CoolExceptionHandler {
@ExceptionHandler(Exception.class)
- public R handlerException(HandlerMethod handler, Exception e) {
+ public Object handlerException(HandlerMethod handler, Exception e, HttpServletRequest request) {
e.printStackTrace();
+ if (useAlt(request)) {
+ return altError("500", "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
return R.error();
}
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
- public R handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
+ public Object handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e,
+ HttpServletRequest request) {
+ if (useAlt(request)) {
+ return altError("405", "HTTP鏂规硶涓嶆敮鎸�");
+ }
return R.error();
}
@ExceptionHandler(CoolException.class)
- public R handleRRException(CoolException e) {
+ public Object handleRRException(CoolException e, HttpServletRequest request) {
+ if (useAlt(request)) {
+ String[] split = e.getMessage().split("-");
+ String code = null;
+ String msg = e.getMessage();
+ if (split.length == 2 && String.valueOf(split[0]).length() < 3) {
+ code = split[0];
+ msg = split[1];
+ }
+ return altError(code, msg);
+ }
String[] split = e.getMessage().split("-");
if (split.length == 2) {
if (String.valueOf(split[0]).length() < 3) {
@@ -35,4 +55,29 @@
return R.error(e.getMessage());
}
+ private boolean useAlt(HttpServletRequest request) {
+ if (null == request) {
+ return false;
+ }
+ String header = request.getHeader("X-Response-Format");
+ if ("alt".equalsIgnoreCase(header)) {
+ return true;
+ }
+ String param = request.getParameter("responseFormat");
+ return "alt".equalsIgnoreCase(param);
+ }
+
+ private Map<String, Object> altError(String code, String message) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("success", false);
+ if (null != code) {
+ map.put("code", code);
+ } else {
+ map.put("code", "200");
+ }
+ map.put("message", "澶辫触");
+ map.put("returnMessage", message);
+ map.put("timestamp", System.currentTimeMillis());
+ return map;
+ }
}
--
Gitblit v1.9.1