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

增加监测项目单个设备最近数据

This commit is contained in:
zy 2025-11-26 18:36:46 +08:00
parent aedc45bfa5
commit a0bad0f31e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,9 +59,20 @@ public class BigScreenControllerP2 {
@PostMapping(value = "/survItemSummary") @PostMapping(value = "/survItemSummary")
public Result<VOHisResult> survItemSummary(@RequestBody VOBigScreenSurvQ voBigScreenSurvQ) { public Result<VOHisResult> survItemSummary(@RequestBody VOBigScreenSurvQ voBigScreenSurvQ) {
PollutionEnum pollutionEnum = PollutionEnum.catchPollution(voBigScreenSurvQ.getSurvItem()); PollutionEnum pollutionEnum = PollutionEnum.catchPollution(voBigScreenSurvQ.getSurvItem());
SurvDeviceDeploy deploy = null;
if(StringUtils.isNotBlank(voBigScreenSurvQ.getStationCode())){
deploy = survDeviceDeployService.getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()
.eq(SurvDeviceDeploy::getStationCode,voBigScreenSurvQ.getStationCode())
.like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType())
.last("limit 1"));
} else if (StringUtils.isNotBlank(voBigScreenSurvQ.getDeployId())) {
deploy = survDeviceDeployService.getById(voBigScreenSurvQ.getDeployId());
}else {
deploy = survDeviceDeployService.getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()
.like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType())
.last("limit 1"));
}
SurvDeviceDeploy deploy = survDeviceDeployService.getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()
.eq(SurvDeviceDeploy::getStationCode,voBigScreenSurvQ.getStationCode()).like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType()).last("limit 1"));
Assert.notNull(deploy, "无效的设备"); Assert.notNull(deploy, "无效的设备");
LocalDateTime startDateTime = null; LocalDateTime startDateTime = null;
LocalDateTime endDateTime = null; LocalDateTime endDateTime = null;

2
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java
View File

@ -7,6 +7,8 @@ import lombok.Data;
public class VOBigScreenSurvQ { public class VOBigScreenSurvQ {
@ApiModelProperty("站点编号") @ApiModelProperty("站点编号")
private String stationCode; private String stationCode;
@ApiModelProperty("设备ID")
private String deployId;
@ApiModelProperty("检测项的变量名") @ApiModelProperty("检测项的变量名")
private String survItem; private String survItem;
@ApiModelProperty("开始时间") @ApiModelProperty("开始时间")