From 4a534c6583a69bf3443bf766700ce45065c5db15 Mon Sep 17 00:00:00 2001
From: zoujiangtao <z17779007624@163.com>
Date: Tue, 10 Dec 2024 15:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9=EF=BC=9A?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81BIP=E6=95=B0=E6=8D=AE=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E7=B1=BB=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=20=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=EF=BC=9A=E8=B0=83=E6=95=B4=E6=95=B4=E4=BD=93=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8E=A8=E9=80=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=82=B9?=
 =?UTF-8?q?=E6=B1=9F=E6=B6=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/shkd/sys/sys/mservice/ApiService.java   | 11 ++++++-----
 .../sys/sys/plugin/form/ApiMappingBillPlugin.java     |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java
index e39e5dd..a55b274 100644
--- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java
+++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java
@@ -177,7 +177,7 @@ public class ApiService {
                         new QFilter("shkd_targetsystem", QCP.equals, systemName)).toArray());
 
         // 组装请求体数据
-        String requestBody = assembleRequestBody(objects[0]);
+        String requestBody = assembleRequestBody(dynamic, objects[0]);
         logger.info("请求URL：{}\n组装请求body：{}", objects[0].getString("shkd_url"), requestBody);
 
         // 调用接口，获取响应数据
@@ -186,12 +186,13 @@ public class ApiService {
 
     /**
      * 组装请求体数据
-     * @param dynamic API映射单据数据对象
+     * @param dynamic 推送数据对象
+     * @param mapping API映射对象数据
      * @return
      */
-    public static String assembleRequestBody(DynamicObject dynamic) {
+    public static String assembleRequestBody(DynamicObject dynamic, DynamicObject mapping) {
         // 获取数据表信息
-        DynamicObjectCollection dynamicObjectCollection = dynamic.getDynamicObjectCollection("entryentity");
+        DynamicObjectCollection dynamicObjectCollection = mapping.getDynamicObjectCollection("entryentity");
 
         // 提取所有层级并存储在 Set 中
         Set<Integer> tiers = new HashSet<>();
@@ -214,7 +215,7 @@ public class ApiService {
         }
 
         // 获取组装body类型
-        String shkd_bodytype = dynamic.getString("shkd_bodytype");
+        String shkd_bodytype = mapping.getString("shkd_bodytype");
         if ("数组".equals(shkd_bodytype)) {
             JSONArray jsonArray = new JSONArray();
             JSONObject json = new JSONObject();
diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java
index 6e4f63e..651f764 100644
--- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java
+++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java
@@ -91,7 +91,7 @@ public class ApiMappingBillPlugin extends AbstractFormPlugin implements Plugin {
         CodeEdit codeEdit = this.getView().getControl("shkd_codeeditap");
 
         if ("shkd_generatejson".equals(itemKey)) {
-            String requestBody = ApiService.assembleRequestBody(dataEntity);
+            String requestBody = ApiService.assembleRequestBody(billObject, dataEntity);
             codeEdit.setText(format(requestBody));
         }