diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java index 5405873..2d8b541 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java @@ -3,6 +3,7 @@ package org.jeecg.system.applet.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.dto.SurvSummaryDTO; import org.jeecg.common.util.R; import org.jeecg.common.vo.statistic.AlertSummaryVo; @@ -46,6 +47,12 @@ public class SurvAlertRecordController { public R alertSummary(@RequestBody SurvSummaryDTO survSummaryDTO) { String tenantId = TenantUtil.getCurTenant(null); survSummaryDTO.setTenantId(tenantId); + if(StringUtils.isNotBlank(survSummaryDTO.getStartTime())){ + if(survSummaryDTO.getStartTime().equals(survSummaryDTO.getEndTime())){//开始时间与结束时间相同,则清空,避免查询到空数据 + survSummaryDTO.setStartTime(""); + survSummaryDTO.setEndTime(""); + } + } SurvSummaryVo survSummaryVo = zhAdminFeignClient.stationDeviceSummary(survSummaryDTO); return R.ok(survSummaryVo); }