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

增加设备接口

This commit is contained in:
zy 2025-11-26 17:25:13 +08:00
parent 6bdbd0f246
commit 1884303b99
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,4 +114,24 @@ public class SurvDeviceDeployController {
Result<VOIntegrateStatistic> job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam);
return R.ok(job.getResult());
}
/**
* 设备列表
*
* @return
*/
@ApiOperation(value="监测设备列表", notes="监测设备列表")
@GetMapping(value = "/survDeviceList")
@ApiLogin
public R<List<SurvDeviceDeploy>> survDeviceList(@RequestParam(name = "stationCode",required = false)String stationCode) {
List<String> deployTypes = new ArrayList<>();
deployTypes.add(PollutionConstants.AIR_SURV);
deployTypes.add(PollutionConstants.SOIL_SURV);
deployTypes.add(PollutionConstants.WATER_QULITY);
deployTypes.add(PollutionConstants.WATER_ORIENT);
deployTypes.add(PollutionConstants.WATER_LIVE);
List<SurvDeviceDeploy> deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes);
return R.ok(deploys);
}
}

12
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java
View File

@ -257,6 +257,9 @@ public class SurvDeviceDeploy implements Serializable {
@TableField(exist = false)
private Integer isOnline;
@TableField(exist = false)
private String fullDeviceName;
@TableField(exist = false)
private List<ScEquZhibiao> zhibiaos;
@ -305,7 +308,14 @@ public class SurvDeviceDeploy implements Serializable {
return protocolDetail;
}
// public Integer getIsOnline() {
public String getFullDeviceName() {
if(StringUtils.isNotBlank(this.stationName)){
return stationName+"-"+deployDes;
}
return deployDes;
}
// public Integer getIsOnline() {
// return Iotutils.checkIsOnline(tenantId, protocolCode, lastsyncTime, deployType);
// }
}