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

调整统计接口

This commit is contained in:
zy 2025-11-25 11:01:44 +08:00
parent f2565d7430
commit ec3f65fe74
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1127,7 +1127,7 @@ public class BigScreenController {
//增加设备位置 //增加设备位置
List<String> deployTypes = new ArrayList<>(); List<String> deployTypes = new ArrayList<>();
deployTypes.add(PollutionConstants.CAMERA); // deployTypes.add(PollutionConstants.CAMERA);
deployTypes.add(PollutionConstants.AIR_SURV); deployTypes.add(PollutionConstants.AIR_SURV);
deployTypes.add(PollutionConstants.SOIL_SURV); deployTypes.add(PollutionConstants.SOIL_SURV);
List<SurvDeviceDeploy> deploys = deployService.getDeviceListByStation(null,deployTypes); List<SurvDeviceDeploy> deploys = deployService.getDeviceListByStation(null,deployTypes);

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

@ -420,7 +420,7 @@ public class IotCommonP2ServiceImpl {
voIntegrateStatistic.setTableIndex(voSurvIntegrateResult.getIndexs()); voIntegrateStatistic.setTableIndex(voSurvIntegrateResult.getIndexs());
voIntegrateStatistic.setTableData(voSurvIntegrateTotals); voIntegrateStatistic.setTableData(voSurvIntegrateTotals);
voIntegrateStatistic.setTableData2(commonService.transToArr(voSurvIntegrateResult.getHeaders(),voSurvIntegrateTotals)); voIntegrateStatistic.setTableData2(commonService.transToArr(voSurvIntegrateResult.getHeaders(),voSurvIntegrateTotals));
voIntegrateStatistic.setRealTimeData(voSurvIntegrateResult.getLiveData()); voIntegrateStatistic.setRealTimeData(nowItegrate.getLiveData());
return voIntegrateStatistic; return voIntegrateStatistic;
} }

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

@ -581,8 +581,11 @@ public class IotCommonServiceImpl {
} }
} }
VOSurvElement voSurvElement = new VOSurvElement(); VOSurvElement voSurvElement = new VOSurvElement();
voSurvElement.setEleDesc(itemFinalName+"("+pollutionEnum.getUnit()+")"); voSurvElement.setEleDesc(itemFinalName);
voSurvElement.setEleUnit(pollutionEnum.getUnit());
voSurvElement.setEleField(s); voSurvElement.setEleField(s);
voSurvElement.setEleIcon(iconFinalName);
voSurvElement.setEleIconPath(bsIcon);
eleList.add(voSurvElement); eleList.add(voSurvElement);
} }
} }

6
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvElement.java
View File

@ -12,4 +12,10 @@ public class VOSurvElement {
private String eleField; private String eleField;
@ApiModelProperty("元素中文") @ApiModelProperty("元素中文")
private String eleDesc; private String eleDesc;
@ApiModelProperty("元素单位")
private String eleUnit;
@ApiModelProperty("图标")
private String eleIcon;
@ApiModelProperty("元素单位")
private String eleIconPath;
} }