From c8ee79c321923f9cd4620c5eef41d409cdc06e2e Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Thu, 27 Nov 2025 20:12:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BigScreenController.java | 32 +++++++++++++------ .../service/impl/IotCommonServiceImpl.java | 4 +-- .../common/constant/enums/PollutionEnum.java | 27 ++++++++++++---- 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index d741c21..f764364 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -1005,6 +1005,7 @@ public class BigScreenController { List tpList = new ArrayList<>(); List tnList = new ArrayList<>(); List noList = new ArrayList<>(); + List codList = new ArrayList<>(); CommonDataTrans tpent = new CommonDataTrans(); tpent.setName(PollutionEnum.dataWaterTp.getDescription()); @@ -1022,24 +1023,35 @@ public class BigScreenController { tnent.setDataDateTime(transdataOrientwaterVo.getDataDateTime()); tnent.setSurvItem(PollutionEnum.dataWaterTn.getCode()); - CommonDataTrans noent = new CommonDataTrans(); - noent.setName(PollutionEnum.dataWaterNo.getDescription()); - noent.setUnit(PollutionEnum.dataWaterNo.getUnit()); - noent.setColor(PollutionEnum.dataWaterNo.getColor()); - noent.setStationName(survStationInfo.getStationName()); - noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime()); - noent.setSurvItem(PollutionEnum.dataWaterNo.getCode()); +// CommonDataTrans noent = new CommonDataTrans(); +// noent.setName(PollutionEnum.dataWaterNo.getDescription()); +// noent.setUnit(PollutionEnum.dataWaterNo.getUnit()); +// noent.setColor(PollutionEnum.dataWaterNo.getColor()); +// noent.setStationName(survStationInfo.getStationName()); +// noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime()); +// noent.setSurvItem(PollutionEnum.dataWaterNo.getCode()); + + CommonDataTrans codent = new CommonDataTrans(); + codent.setName(PollutionEnum.dataWaterCod.getDescription()); + codent.setUnit(PollutionEnum.dataWaterCod.getUnit()); + codent.setColor(PollutionEnum.dataWaterCod.getColor()); + codent.setStationName(survStationInfo.getStationName()); + codent.setDataDateTime(transdataOrientwaterVo.getDataDateTime()); + codent.setSurvItem(PollutionEnum.dataWaterCod.getCode()); tpent.setValue(transdataOrientwaterVo.getDataWaterTp()); tnent.setValue(transdataOrientwaterVo.getDataWaterTn()); - noent.setValue(transdataOrientwaterVo.getDataWaterNo()); +// noent.setValue(transdataOrientwaterVo.getDataWaterNo()); + codent.setValue(transdataOrientwaterVo.getDataWaterCod()); tpList.add(tpent); tnList.add(tnent); - noList.add(noent); +// noList.add(noent); + codList.add(codent); List listFinal = new ArrayList<>(); listFinal.addAll(tnList); listFinal.addAll(tpList); - listFinal.addAll(noList); +// listFinal.addAll(noList); + listFinal.addAll(codList); returnArrs = JSONArray.parseArray(JSONObject.toJSONString(listFinal)); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java index 77f52a2..8664035 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java @@ -1312,8 +1312,8 @@ public class IotCommonServiceImpl { } maps.put(ScreenIndexSummaryEnum.TNSummry.getDesc(),avgTN); maps.put(ScreenIndexSummaryEnum.TPSummry.getDesc(),avgTP); - maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO); -// maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD); +// maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO); + maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD); // maps.put(ScreenIndexSummaryEnum.NHSummry.getDesc(),avgNH); screenIndexSummaryDetailVo.setDatas(maps); diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java index 14a0fee..65875ff 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java @@ -2,6 +2,8 @@ package org.jeecg.common.constant.enums; import com.alibaba.fastjson.JSONObject; +import java.util.HashMap; +import java.util.Map; import java.util.Random; public enum PollutionEnum { @@ -150,8 +152,13 @@ public enum PollutionEnum { */ private String iconName; - private static final Random RANDOM = new Random(); - private static int colorIndex = 0; + private static final Map ORDINAL_MAP = new HashMap<>(); + + static { + for (int i = 0; i < values().length; i++) { + ORDINAL_MAP.put(values()[i], i); + } + } private static class PaletteData { static final String[] COLORS = { @@ -177,6 +184,8 @@ public enum PollutionEnum { "#90A4AE", "#7986CB", "#4DB6AC", "#DCE775", "#FFD54F", "#FFB74D", "#E57373", "#BA68C8", "#64B5F6", "#81C784" }; + int index = 0; + } PollutionEnum(String code, String description, String unit, String icon, String type, String color, String mobileIcon, String bsIcon, String iconName) { @@ -187,7 +196,7 @@ public enum PollutionEnum { this.unit = unit; this.icon = icon; this.type = type; - this.color = palette[randomIndex]; + this.color = color; this.mobileIcon = mobileIcon; this.bsIcon = bsIcon; this.iconName = iconName; @@ -268,9 +277,11 @@ public enum PollutionEnum { public static PollutionEnum catchMessage(String msg) { PollutionEnum result = null; - + String[] palette = PaletteData.COLORS; for (PollutionEnum s : values()) { if (s.description.equals(msg)) { + int arrs = ORDINAL_MAP.get(s); + s.color = palette[arrs]; result = s; break; } @@ -286,9 +297,11 @@ public enum PollutionEnum { public static PollutionEnum catchPollution(String survItem) { PollutionEnum result = null; - + String[] palette = PaletteData.COLORS; for (PollutionEnum s : values()) { if (s.code.equals(survItem)) { + int arrs = ORDINAL_MAP.get(s); + s.color = palette[arrs]; result = s; break; } @@ -301,13 +314,15 @@ public enum PollutionEnum { } public JSONObject getJsonStr() { + int arrs = ORDINAL_MAP.get(this); + String[] palette = PaletteData.COLORS; JSONObject job = new JSONObject(); job.put("code", this.code); job.put("description", this.description); job.put("unit", this.unit); job.put("type", this.type); job.put("icon", this.icon); - job.put("color", this.color); + job.put("color", palette[arrs]); job.put("mobileIcon", this.mobileIcon); job.put("bsIcon", this.bsIcon); job.put("iconName", this.iconName);