From d3d3857cda8b4307d8f03bf15ec9fb2c98c34b64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十二月 2024 09:58:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/MapDataUtils.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 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 f744fd9..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,25 +36,18 @@
}
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 coe) {
+ public static Double getVehicleWaveSafeDistance(Integer diameter, Double factor) {
if (Cools.isEmpty(diameter)) {
return 0.0D;
}
- coe = Optional.ofNullable(coe).orElse(1.0D);
- return diameter * coe;
+ factor = Optional.ofNullable(factor).orElse(1.0D);
+ return diameter * factor;
}
}
--
Gitblit v1.9.1