From b89c0df6f99cff6a852306da467b053aa4f90df8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 一月 2024 13:47:23 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index a3eba1b..b92f758 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
+import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
@@ -10,6 +11,7 @@
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.HttpsUtil;
@@ -82,7 +84,7 @@
if(response!=null && response.getData()!=null && response.getData().getRecords()!=null){
list.addAll(response.getData().getRecords());
if(pageSize*page < response.getData().getTotal() ){
- hasLast =true;//杩樻湁涓嬩竴椤�
+ hasLast =false;//杩樻湁涓嬩竴椤�
}
page++;
}
@@ -102,12 +104,6 @@
System.out.println(JSONObject.toJSONString(param));
String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
if(StringUtils.isNotBlank(result)){
-// TypeReference typeReference =
-// new TypeReference<ERPApiResponse<ApproveInfoResponse>>(){};
-// ERPApiResponse<ApproveInfoResponse> response = JSONObject.parseObject(result, typeReference.getType());
-// if(response!=null && response.isSuccess()){
-// return response.getData();
-// }
TypeReference typeReference =
new TypeReference<ERPApiResponse<String>>(){};
ERPApiResponse<String> response = JSONObject.parseObject(result, typeReference.getType());
@@ -115,9 +111,9 @@
ApproveInfoResponse approveInfoResponse = new ApproveInfoResponse();
approveInfoResponse.setId(response.getData());
return approveInfoResponse;
+ }else if(response!=null && !response.isSuccess()){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMessage());
}
-
-
}
return null;
}
--
Gitblit v1.9.3