From ec3f65fe749626aba0627bb3a51dbd26e0c4905b Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Tue, 25 Nov 2025 11:01:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=9F=E8=AE=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/appmana/controller/BigScreenController.java | 2 +- .../appmana/service/impl/IotCommonP2ServiceImpl.java | 2 +- .../modules/appmana/service/impl/IotCommonServiceImpl.java | 5 ++++- .../java/org/jeecg/common/iot/common/VOSurvElement.java | 6 ++++++ 4 files changed, 12 insertions(+), 3 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 774cdf6..7378c3a 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 @@ -1127,7 +1127,7 @@ public class BigScreenController { //增加设备位置 List deployTypes = new ArrayList<>(); - deployTypes.add(PollutionConstants.CAMERA); +// deployTypes.add(PollutionConstants.CAMERA); deployTypes.add(PollutionConstants.AIR_SURV); deployTypes.add(PollutionConstants.SOIL_SURV); List deploys = deployService.getDeviceListByStation(null,deployTypes); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java index d5dfcb1..f26a49b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java @@ -420,7 +420,7 @@ public class IotCommonP2ServiceImpl { voIntegrateStatistic.setTableIndex(voSurvIntegrateResult.getIndexs()); voIntegrateStatistic.setTableData(voSurvIntegrateTotals); voIntegrateStatistic.setTableData2(commonService.transToArr(voSurvIntegrateResult.getHeaders(),voSurvIntegrateTotals)); - voIntegrateStatistic.setRealTimeData(voSurvIntegrateResult.getLiveData()); + voIntegrateStatistic.setRealTimeData(nowItegrate.getLiveData()); return voIntegrateStatistic; } 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 4d75a9e..77f52a2 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 @@ -581,8 +581,11 @@ public class IotCommonServiceImpl { } } VOSurvElement voSurvElement = new VOSurvElement(); - voSurvElement.setEleDesc(itemFinalName+"("+pollutionEnum.getUnit()+")"); + voSurvElement.setEleDesc(itemFinalName); + voSurvElement.setEleUnit(pollutionEnum.getUnit()); voSurvElement.setEleField(s); + voSurvElement.setEleIcon(iconFinalName); + voSurvElement.setEleIconPath(bsIcon); eleList.add(voSurvElement); } } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvElement.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvElement.java index d77d4ce..b538771 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvElement.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvElement.java @@ -12,4 +12,10 @@ public class VOSurvElement { private String eleField; @ApiModelProperty("元素中文") private String eleDesc; + @ApiModelProperty("元素单位") + private String eleUnit; + @ApiModelProperty("图标") + private String eleIcon; + @ApiModelProperty("元素单位") + private String eleIconPath; }