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

流量计增加加入各类接口

This commit is contained in:
zhangyue 2026-07-29 18:07:22 +08:00
parent a80e45bf32
commit 75f5c732ab
2 changed files with 5 additions and 1 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

@ -1053,7 +1053,7 @@ public class BigScreenController {
ent.setIds(deploy.getId()); ent.setIds(deploy.getId());
ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline()); ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline());
if(DeviceDeployEnum.FLOWMETER.getType().equals(deploy.getDeployType())){ if(DeviceDeployEnum.FLOWMETER.getType().equals(deploy.getDeployType())){
ent.setType("soil"); ent.setType(DeviceDeployEnum.SURV_SOIL.getType());
} }
returnList.add(ent); returnList.add(ent);
} }

4
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
View File

@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.PollutionConstants; import org.jeecg.common.constant.PollutionConstants;
import org.jeecg.common.constant.enums.DeviceDeployEnum;
import org.jeecg.common.entity.*; import org.jeecg.common.entity.*;
import org.jeecg.common.util.R; import org.jeecg.common.util.R;
import org.jeecg.common.vo.*; import org.jeecg.common.vo.*;
@ -589,6 +590,9 @@ public class SurvStationInfoController {
ent.setMapIcon(deploy.getMapIcon()); ent.setMapIcon(deploy.getMapIcon());
ent.setIds(deploy.getId()); ent.setIds(deploy.getId());
ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline()); ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline());
if(DeviceDeployEnum.FLOWMETER.getType().equals(deploy.getDeployType())){
ent.setType(DeviceDeployEnum.SURV_SOIL.getType());
}
returnList.add(ent); returnList.add(ent);
} }
} }