diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java index 9b2372c..21c70c5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java @@ -59,9 +59,20 @@ public class BigScreenControllerP2 { @PostMapping(value = "/survItemSummary") public Result survItemSummary(@RequestBody VOBigScreenSurvQ voBigScreenSurvQ) { PollutionEnum pollutionEnum = PollutionEnum.catchPollution(voBigScreenSurvQ.getSurvItem()); + SurvDeviceDeploy deploy = null; + if(StringUtils.isNotBlank(voBigScreenSurvQ.getStationCode())){ + deploy = survDeviceDeployService.getOne(Wrappers.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.lambdaQuery() + .like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType()) + .last("limit 1")); + } - SurvDeviceDeploy deploy = survDeviceDeployService.getOne(Wrappers.lambdaQuery() - .eq(SurvDeviceDeploy::getStationCode,voBigScreenSurvQ.getStationCode()).like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType()).last("limit 1")); Assert.notNull(deploy, "无效的设备"); LocalDateTime startDateTime = null; LocalDateTime endDateTime = null; diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java index e26b24d..2e63c24 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java @@ -7,6 +7,8 @@ import lombok.Data; public class VOBigScreenSurvQ { @ApiModelProperty("站点编号") private String stationCode; + @ApiModelProperty("设备ID") + private String deployId; @ApiModelProperty("检测项的变量名") private String survItem; @ApiModelProperty("开始时间")