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 be74fd8..a2398b9 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 @@ -1053,7 +1053,7 @@ public class BigScreenController { ent.setIds(deploy.getId()); ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline()); if(DeviceDeployEnum.FLOWMETER.getType().equals(deploy.getDeployType())){ - ent.setType("soil"); + ent.setType(DeviceDeployEnum.SURV_SOIL.getType()); } returnList.add(ent); } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java index 548f00f..18a563b 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.constant.PollutionConstants; +import org.jeecg.common.constant.enums.DeviceDeployEnum; import org.jeecg.common.entity.*; import org.jeecg.common.util.R; import org.jeecg.common.vo.*; @@ -589,6 +590,9 @@ public class SurvStationInfoController { ent.setMapIcon(deploy.getMapIcon()); ent.setIds(deploy.getId()); ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline()); + if(DeviceDeployEnum.FLOWMETER.getType().equals(deploy.getDeployType())){ + ent.setType(DeviceDeployEnum.SURV_SOIL.getType()); + } returnList.add(ent); } }