From 77d58298d00c11ade8862ca8acb0fdef5a45322e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 21 三月 2025 17:39:38 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/server/progressTrack/service/NetWorkDiagramService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/server/progressTrack/service/NetWorkDiagramService.java b/src/main/java/com/example/server/progressTrack/service/NetWorkDiagramService.java
index eeb3f99..78a5b2a 100644
--- a/src/main/java/com/example/server/progressTrack/service/NetWorkDiagramService.java
+++ b/src/main/java/com/example/server/progressTrack/service/NetWorkDiagramService.java
@@ -79,8 +79,8 @@
//鐘舵�佸垎涓猴細涓撲笟銆佸凡鍚姩/杩涜涓紙娴呯伆锛夈�佷复鏈燂紙榛勮壊锛夈�佸凡閫炬湡锛堢孩鑹诧級銆佸凡瀹屾垚锛堟祬缁胯壊锛夈�佽秴鏈熷畬鎴愶紙娣辩豢鑹诧級
enum StatusEnum {zy, jxz, lq, yq, zcwc, cqwc}
- String[] fillColorArr = {"#e5e5e5", "#A9A9A9", "yellow", "#FF0000", "#90EE90", "#006400"};
- String[] fontColorArr = {"#e5e5e5", "#A9A9A9", "yellow", "#FF0000", "#90EE90", "#006400"};
+ String[] fillColorArr = {"#e5e5e5", "#3498DB", "#F1C40F", "#E74C3C", "#2ECC71", "#006400"};
+ String[] fontColorArr = {"#e5e5e5", "#3498DB", "#F1C40F", "#E74C3C", "#2ECC71", "#006400"};
InitParamDto initParamDto = new InitParamDto();
ResultDataDto resultDataDto = new ResultDataDto();
@@ -136,7 +136,7 @@
) {
JSONObject jsonObject = dialgramJsonArray.getJSONObject(i);
String shape = jsonObject.get("shape").toString();
- StatusEnum status = StatusEnum.jxz;//StatusEnum.wqd;
+ StatusEnum status = StatusEnum.jxz;
if (shape.equals("custom-text")) {
JsonUtils2.setJsonValueByPath(jsonObject, "attrs/body/fill".split("/"), fillColorArr[StatusEnum.zy.ordinal()]);
JsonUtils2.setJsonValueByPath(jsonObject, "attrs/text/fill".split("/"), fontColorArr[StatusEnum.zy.ordinal()]);
@@ -1066,7 +1066,7 @@
JSONObject jsonObject = modelJsonArray.getJSONObject(i);
if (jsonObject.get("shape").equals("custom-circle")) {
Object nodeMarker = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/text/text".split("/"));
- if ("涓撲笟".equals(nodeMarker)) {
+ /* if ("涓撲笟".equals(nodeMarker)) {
fillColorArr[StatusEnum.zy.ordinal()] = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/body/fill".split("/")).toString();
fontColorArr[StatusEnum.zy.ordinal()] = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/text/fill".split("/")).toString();
}
@@ -1089,7 +1089,7 @@
if ("瓒呮湡瀹屾垚".equals(nodeMarker)) {
fillColorArr[StatusEnum.cqwc.ordinal()] = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/body/fill".split("/")).toString();
fontColorArr[StatusEnum.cqwc.ordinal()] = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/text/fill".split("/")).toString();
- }
+ }*/
if ("闃舵鍚嶇О".equals(nodeMarker)) {
networkDiagramPetsDto.getCirclePet().setJson(jsonObject.toString());
int width = Convert.toInt(JsonUtils2.getJsonValueByPath(jsonObject, "size/width".split("/")).toString());
@@ -1305,7 +1305,7 @@
for (int i = 0; i < jsonArray.size(); i++) {
String shapeValue = jsonArray.getJSONObject(i).get("shape").toString();
String idValue = jsonArray.getJSONObject(i).get("id").toString();
- StatusEnum status = StatusEnum.jxz;//StatusEnum.wqd;
+ StatusEnum status = StatusEnum.jxz;
if (!shapeValue.equals("edge")) {
status = statusMap.get(Long.parseLong(idValue));
if ("1888761224410202114".equals(idValue)) {
@@ -1451,14 +1451,13 @@
public Object createInsertVertex(mxGraph graph, JSONObject jsonObject, Integer defX, Integer defY, StatusEnum status) {
Object parent = graph.getDefaultParent();
-
String shapeValue = jsonObject.get("shape").toString();
Object graphObject = null;
switch (shapeValue) {
case "custom-circle":
case "custom-circle1":
String text = (String) JsonUtils2.getJsonValueByPath(jsonObject, "attrs/text/text".split("/"));
- String title = (String) JsonUtils2.getJsonValueByPath(jsonObject, "attrs/title/text".split("/"));
+ //String title = (String) JsonUtils2.getJsonValueByPath(jsonObject, "attrs/title/text".split("/"));
String idValue = jsonObject.get("id").toString();
Integer x = (Integer) JsonUtils2.getJsonValueByPath(jsonObject, "position/x".split("/")) + defX;
--
Gitblit v1.9.1