From c3253952bd256b1d6dd5ffd1e823bad521364a0e Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 07 五月 2025 17:50:26 +0800
Subject: [PATCH] feat: 优化接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 19 ++++++++-----------
doc/广州非急救转运对接第三方接口文档(1).docx | 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java | 17 +++++++++++------
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderDelResultVo.java | 15 +++++++++++++++
4 files changed, 34 insertions(+), 17 deletions(-)
diff --git "a/doc/\345\271\277\345\267\236\351\235\236\346\200\245\346\225\221\350\275\254\350\277\220\345\257\271\346\216\245\347\254\254\344\270\211\346\226\271\346\216\245\345\217\243\346\226\207\346\241\243\0501\051.docx" "b/doc/\345\271\277\345\267\236\351\235\236\346\200\245\346\225\221\350\275\254\350\277\220\345\257\271\346\216\245\347\254\254\344\270\211\346\226\271\346\216\245\345\217\243\346\226\207\346\241\243\0501\051.docx"
new file mode 100644
index 0000000..3b92eda
--- /dev/null
+++ "b/doc/\345\271\277\345\267\236\351\235\236\346\200\245\346\225\221\350\275\254\350\277\220\345\257\271\346\216\245\347\254\254\344\270\211\346\226\271\346\216\245\345\217\243\346\226\207\346\241\243\0501\051.docx"
Binary files differ
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index 2ed5f28..64a46e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -8,9 +8,7 @@
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.core.domain.entity.ServiceOrderAppResultVo;
-import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
-import com.ruoyi.common.core.domain.entity.ServiceOrderDelVo;
+import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.utils.civilAviation.ServiceOrderUtil;
import com.ruoyi.system.domain.SysClientApp;
import com.ruoyi.system.service.ISysClientAppService;
@@ -30,7 +28,6 @@
import com.ruoyi.system.service.ITbOrdersService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.entity.OrderCancelVo;
/**
* ordersController
@@ -185,12 +182,12 @@
return AjaxResult.error("璁㈠崟鐘舵�佸凡鍙栨秷");
}
- SysClientApp scApp = clientAppService.selectSysClientAppByAppKey("appId1");
+ SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
- model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
+ model.setAppId(tbOrders.getAppId()); // 璁剧疆鍟嗘埛 APPID
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
@@ -240,9 +237,9 @@
@ApiImplicitParam(name = "thirdOrderNo", value = "绗笁鏂硅鍗曞彿", required = true, dataType = "String"),
@ApiImplicitParam(name = "reason", value = "鍙栨秷鍘熷洜", required = true, dataType = "String")
})
- @Anonymous
+ @Anonymous(needSign = true)
@PostMapping("/cancelOrder")
- public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo)
+ public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo,String appId)
{
try {
if (cancelVo == null || cancelVo.getOrderID() == null ||
@@ -250,7 +247,7 @@
return AjaxResult.error("蹇呰鍙傛暟涓嶈兘涓虹┖锛�");
}
- SysClientApp scApp = clientAppService.selectSysClientAppByAppId(1L);
+ SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(appId);
ServiceOrderDelVo model = new ServiceOrderDelVo();
model.setMethod("ServiceOrder_DEL"); // 璁剧疆鎺ュ彛鍚嶇О
@@ -258,7 +255,7 @@
model.setServiceOrdID(cancelVo.getThirdOrderNo()); // 璁剧疆绗笁鏂硅鍗曞彿
model.setDELRemarks(cancelVo.getReason()); // 璁剧疆鍙栨秷鍘熷洜
- ServiceOrderAppResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
+ ServiceOrderDelResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
if (result.getResult() == 1) {
// 鏇存柊鏈湴璁㈠崟鐘舵��
@@ -268,7 +265,7 @@
tbOrdersService.updateTbOrders(tbOrders);
return AjaxResult.success(result);
} else {
- return AjaxResult.error("鍙栨秷璁㈠崟澶辫触");
+ return AjaxResult.error("鍙栨秷璁㈠崟澶辫触",result);
}
} catch (Exception e) {
return AjaxResult.error("鍙栨秷璁㈠崟澶辫触:" + e.getMessage());
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderDelResultVo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderDelResultVo.java
new file mode 100644
index 0000000..6e91464
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderDelResultVo.java
@@ -0,0 +1,15 @@
+package com.ruoyi.common.core.domain.entity;
+
+import lombok.Data;
+
+/**
+ * 鏈嶅姟鍗曟帴鍙ｈ皟鐢ㄧ粨鏋�
+ */
+@Data
+public class ServiceOrderDelResultVo {
+ private String method;
+ private Integer result;
+ private String ServiceOrdID;
+ private Long errcode;
+ private String errmsg;
+}
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
index cf5f262..a41b868 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppResultVo;
+import com.ruoyi.common.core.domain.entity.ServiceOrderDelResultVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderDelVo;
import com.ruoyi.common.utils.http.HttpUtils;
import org.slf4j.Logger;
@@ -126,7 +127,7 @@
* @param model 鏈嶅姟璁㈠崟鍒犻櫎璇锋眰鍊煎璞�
* @return 鏈嶅姟璁㈠崟鍒犻櫎鎺ュ彛璋冪敤缁撴灉
*/
- public static ServiceOrderAppResultVo CancelServiceOrder(ServiceOrderDelVo model,String appSecret) {
+ public static ServiceOrderDelResultVo CancelServiceOrder(ServiceOrderDelVo model,String appSecret) {
if (addServiceOrederAPI.isEmpty()) {
// log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
return null;
@@ -144,10 +145,12 @@
try {
Object value = field.get(model);
if (value != null) {
- params.put(field.getName(), value.toString());
+ params.put(field.getName(),URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
}
} catch (IllegalAccessException e) {
// log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
}
}
@@ -166,9 +169,11 @@
}
// 灏嗗瓧娈靛悕棣栧瓧姣嶅ぇ鍐�
String fieldName = field.getName();
- formData.append(fieldName)
- .append("=")
- .append(URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
+ String capitalizedFieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+
+ formData.append(capitalizedFieldName)
+ .append("=")
+ .append(URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
}
} catch (Exception e) {
// log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
@@ -180,7 +185,7 @@
if (responseData != null && !responseData.isEmpty()) {
// log.info("鎺ュ彛鍝嶅簲: " + responseData);
try {
- return JSON.parseObject(responseData, ServiceOrderAppResultVo.class);
+ return JSON.parseObject(responseData, ServiceOrderDelResultVo.class);
} catch (Exception e) {
// log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
}
--
Gitblit v1.9.1