Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复后台设备检索

This commit is contained in:
zy 2025-11-27 20:12:07 +08:00
parent d42701c6ed
commit c8ee79c321
3 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
View File

@ -1005,6 +1005,7 @@ public class BigScreenController {
List<CommonDataTrans> tpList = new ArrayList<>(); List<CommonDataTrans> tpList = new ArrayList<>();
List<CommonDataTrans> tnList = new ArrayList<>(); List<CommonDataTrans> tnList = new ArrayList<>();
List<CommonDataTrans> noList = new ArrayList<>(); List<CommonDataTrans> noList = new ArrayList<>();
List<CommonDataTrans> codList = new ArrayList<>();
CommonDataTrans tpent = new CommonDataTrans(); CommonDataTrans tpent = new CommonDataTrans();
tpent.setName(PollutionEnum.dataWaterTp.getDescription()); tpent.setName(PollutionEnum.dataWaterTp.getDescription());
@ -1022,24 +1023,35 @@ public class BigScreenController {
tnent.setDataDateTime(transdataOrientwaterVo.getDataDateTime()); tnent.setDataDateTime(transdataOrientwaterVo.getDataDateTime());
tnent.setSurvItem(PollutionEnum.dataWaterTn.getCode()); tnent.setSurvItem(PollutionEnum.dataWaterTn.getCode());
CommonDataTrans noent = new CommonDataTrans(); // CommonDataTrans noent = new CommonDataTrans();
noent.setName(PollutionEnum.dataWaterNo.getDescription()); // noent.setName(PollutionEnum.dataWaterNo.getDescription());
noent.setUnit(PollutionEnum.dataWaterNo.getUnit()); // noent.setUnit(PollutionEnum.dataWaterNo.getUnit());
noent.setColor(PollutionEnum.dataWaterNo.getColor()); // noent.setColor(PollutionEnum.dataWaterNo.getColor());
noent.setStationName(survStationInfo.getStationName()); // noent.setStationName(survStationInfo.getStationName());
noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime()); // noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime());
noent.setSurvItem(PollutionEnum.dataWaterNo.getCode()); // 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()); tpent.setValue(transdataOrientwaterVo.getDataWaterTp());
tnent.setValue(transdataOrientwaterVo.getDataWaterTn()); tnent.setValue(transdataOrientwaterVo.getDataWaterTn());
noent.setValue(transdataOrientwaterVo.getDataWaterNo()); // noent.setValue(transdataOrientwaterVo.getDataWaterNo());
codent.setValue(transdataOrientwaterVo.getDataWaterCod());
tpList.add(tpent); tpList.add(tpent);
tnList.add(tnent); tnList.add(tnent);
noList.add(noent); // noList.add(noent);
codList.add(codent);
List<CommonDataTrans> listFinal = new ArrayList<>(); List<CommonDataTrans> listFinal = new ArrayList<>();
listFinal.addAll(tnList); listFinal.addAll(tnList);
listFinal.addAll(tpList); listFinal.addAll(tpList);
listFinal.addAll(noList); // listFinal.addAll(noList);
listFinal.addAll(codList);
returnArrs = JSONArray.parseArray(JSONObject.toJSONString(listFinal)); returnArrs = JSONArray.parseArray(JSONObject.toJSONString(listFinal));
} }

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java
View File

@ -1312,8 +1312,8 @@ public class IotCommonServiceImpl {
} }
maps.put(ScreenIndexSummaryEnum.TNSummry.getDesc(),avgTN); maps.put(ScreenIndexSummaryEnum.TNSummry.getDesc(),avgTN);
maps.put(ScreenIndexSummaryEnum.TPSummry.getDesc(),avgTP); maps.put(ScreenIndexSummaryEnum.TPSummry.getDesc(),avgTP);
maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO); // maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO);
// maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD); maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD);
// maps.put(ScreenIndexSummaryEnum.NHSummry.getDesc(),avgNH); // maps.put(ScreenIndexSummaryEnum.NHSummry.getDesc(),avgNH);
screenIndexSummaryDetailVo.setDatas(maps); screenIndexSummaryDetailVo.setDatas(maps);

27
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java
View File

@ -2,6 +2,8 @@ package org.jeecg.common.constant.enums;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import java.util.HashMap;
import java.util.Map;
import java.util.Random; import java.util.Random;
public enum PollutionEnum { public enum PollutionEnum {
@ -150,8 +152,13 @@ public enum PollutionEnum {
*/ */
private String iconName; private String iconName;
private static final Random RANDOM = new Random(); private static final Map<PollutionEnum, Integer> ORDINAL_MAP = new HashMap<>();
private static int colorIndex = 0;
static {
for (int i = 0; i < values().length; i++) {
ORDINAL_MAP.put(values()[i], i);
}
}
private static class PaletteData { private static class PaletteData {
static final String[] COLORS = { static final String[] COLORS = {
@ -177,6 +184,8 @@ public enum PollutionEnum {
"#90A4AE", "#7986CB", "#4DB6AC", "#DCE775", "#FFD54F", "#90A4AE", "#7986CB", "#4DB6AC", "#DCE775", "#FFD54F",
"#FFB74D", "#E57373", "#BA68C8", "#64B5F6", "#81C784" "#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) { 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.unit = unit;
this.icon = icon; this.icon = icon;
this.type = type; this.type = type;
this.color = palette[randomIndex]; this.color = color;
this.mobileIcon = mobileIcon; this.mobileIcon = mobileIcon;
this.bsIcon = bsIcon; this.bsIcon = bsIcon;
this.iconName = iconName; this.iconName = iconName;
@ -268,9 +277,11 @@ public enum PollutionEnum {
public static PollutionEnum catchMessage(String msg) { public static PollutionEnum catchMessage(String msg) {
PollutionEnum result = null; PollutionEnum result = null;
String[] palette = PaletteData.COLORS;
for (PollutionEnum s : values()) { for (PollutionEnum s : values()) {
if (s.description.equals(msg)) { if (s.description.equals(msg)) {
int arrs = ORDINAL_MAP.get(s);
s.color = palette[arrs];
result = s; result = s;
break; break;
} }
@ -286,9 +297,11 @@ public enum PollutionEnum {
public static PollutionEnum catchPollution(String survItem) { public static PollutionEnum catchPollution(String survItem) {
PollutionEnum result = null; PollutionEnum result = null;
String[] palette = PaletteData.COLORS;
for (PollutionEnum s : values()) { for (PollutionEnum s : values()) {
if (s.code.equals(survItem)) { if (s.code.equals(survItem)) {
int arrs = ORDINAL_MAP.get(s);
s.color = palette[arrs];
result = s; result = s;
break; break;
} }
@ -301,13 +314,15 @@ public enum PollutionEnum {
} }
public JSONObject getJsonStr() { public JSONObject getJsonStr() {
int arrs = ORDINAL_MAP.get(this);
String[] palette = PaletteData.COLORS;
JSONObject job = new JSONObject(); JSONObject job = new JSONObject();
job.put("code", this.code); job.put("code", this.code);
job.put("description", this.description); job.put("description", this.description);
job.put("unit", this.unit); job.put("unit", this.unit);
job.put("type", this.type); job.put("type", this.type);
job.put("icon", this.icon); job.put("icon", this.icon);
job.put("color", this.color); job.put("color", palette[arrs]);
job.put("mobileIcon", this.mobileIcon); job.put("mobileIcon", this.mobileIcon);
job.put("bsIcon", this.bsIcon); job.put("bsIcon", this.bsIcon);
job.put("iconName", this.iconName); job.put("iconName", this.iconName);