From 707fe882db81a134a8c9fe4314c7a6a0b1c103e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 六月 2020 18:24:32 +0800
Subject: [PATCH] 初始化导入

---
 src/main/java/com/ks/tool/bkz/util/FirstOrderSubDataUtil.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ks/tool/bkz/util/FirstOrderSubDataUtil.java b/src/main/java/com/ks/tool/bkz/util/FirstOrderSubDataUtil.java
index cda1db5..b16c01a 100644
--- a/src/main/java/com/ks/tool/bkz/util/FirstOrderSubDataUtil.java
+++ b/src/main/java/com/ks/tool/bkz/util/FirstOrderSubDataUtil.java
@@ -4,7 +4,8 @@
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.ks.tool.bkz.dto.FirstOrderSubInfoDTO;
+import com.ks.tool.bkz.dto.FirstOrderSubParseResult;
+import com.ks.tool.bkz.entity.FirstOrderSubInfo;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -20,18 +21,24 @@
      * @param data
      * @return
      */
-    public static List<FirstOrderSubInfoDTO> parseOrderSubData(String data) {
+    public static FirstOrderSubParseResult parseOrderSubData(String data) {
+        data = data.trim().substring(data.indexOf("("));
+        if (data.endsWith(")"))
+            data = data.substring(0, data.length() - 1);
+
         JSONObject dataJSON = JSONObject.parseObject(data);
         JSONObject resultValue = dataJSON.getJSONObject("data").getJSONObject("resultValue");
 
         for (Iterator<String> its = resultValue.keySet().iterator(); its.hasNext(); ) {
             String key = its.next();
             if (NumberUtil.isNumeric(key)) {
-                JSONArray array = resultValue.getJSONObject(key).getJSONObject("data").getJSONArray("entity").getJSONObject(0).getJSONArray("model");
-                Type type = new TypeToken<List<FirstOrderSubInfoDTO>>() {
+                JSONObject entity = resultValue.getJSONObject(key).getJSONObject("data").getJSONArray("entity").getJSONObject(0);
+                boolean hasNextPage = entity.getBoolean("hasNextPage");
+                JSONArray array = entity.getJSONArray("model");
+                Type type = new TypeToken<List<FirstOrderSubInfo>>() {
                 }.getType();
-                List<FirstOrderSubInfoDTO> list = new Gson().fromJson(array.toString(), type);
-                return list;
+                List<FirstOrderSubInfo> list = new Gson().fromJson(array.toString(), type);
+                return new FirstOrderSubParseResult(hasNextPage, list);
             }
         }
         return null;
@@ -53,6 +60,7 @@
 
     /**
      * 鑾峰彇token
+     *
      * @param cookie
      * @return
      */

--
Gitblit v1.8.0