From e7543cfdd44727c33ccb762a35453abcf48f8cd5 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Tue, 28 Jul 2026 16:02:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E7=82=B9=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=A4=9A=E9=A1=B9=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applet/controller/SurvAlertRecordController.java | 7 +++++++ 1 file changed, 7 insertions(+) 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); }