From a46f9e397d5973e1ff9be3bb89357e2c50919900 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 13 十二月 2024 14:58:46 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/MapDataUtils.java | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/MapDataUtils.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/MapDataUtils.java index 8449992..8afc00d 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/MapDataUtils.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/MapDataUtils.java @@ -1,12 +1,10 @@ package com.zy.acs.manager.common.utils; import com.alibaba.fastjson.JSON; +import com.zy.acs.common.utils.GsonUtils; import com.zy.acs.framework.common.Cools; -import com.zy.acs.manager.core.service.astart.WaveNodeType; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import java.util.*; /** * Created by vincent on 8/7/2024 @@ -38,17 +36,10 @@ } public static String generateWaveNode(String originStr, String waveNode) { - List<String> waveNodeList; - if (originStr.equals(WaveNodeType.ENABLE.val)) { - waveNodeList = new ArrayList<>(); - waveNodeList.add(waveNode); - } else { - waveNodeList = JSON.parseArray(originStr, String.class); - if (!waveNodeList.contains(waveNode)) { - waveNodeList.add(waveNode); - } - } - return JSON.toJSONString(waveNodeList); + List<String> originNode = GsonUtils.fromJsonToList(originStr, String.class); + Set<String> set = new HashSet<>(originNode); + set.add(waveNode); + return GsonUtils.toJson(set); } public static Double getVehicleWaveSafeDistance(Integer diameter, Double factor) { -- Gitblit v1.9.1