From 956d84fff5517aaa89fa7cdcb7060d80ac8ddcca Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 7 Nov 2023 10:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/echarts/json/LineGenerator.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/LineGenerator.java b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/LineGenerator.java
index 249c68980..32e94ff5c 100644
--- a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/LineGenerator.java
+++ b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/LineGenerator.java
@@ -2,7 +2,10 @@ package com.njcn.echarts.json;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.json.ObjectMapper;
 import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import com.njcn.echarts.pojo.bo.TolerateData;
 import com.njcn.echarts.pojo.constant.PicCommonData;
 import org.icepear.echarts.Option;
@@ -585,10 +588,8 @@ public class LineGenerator {
                 .setData(limit);
         list.add(proportion2);
         SeriesOption[] seriesOptions = list.stream().toArray(SeriesOption[]::new);
-        persistentTimeOption.setSeries(new SeriesOption[]{proportion2, proportion2});
-        System.out.println(persistentTimeOption.toString());
-        String s = new Gson().toJson(persistentTimeOption);
-        return ENGINE.renderJsonOption(persistentTimeOption);
+        persistentTimeOption.setSeries(seriesOptions);
+        return  JSONUtil.parseObj(persistentTimeOption).toString();
     }