From caee3bbce3395cf2ff395f9a954bcff689fdbe43 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Tue, 28 Jul 2026 16:10:19 +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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 2d8b541..53b2e78 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 @@ -5,6 +5,7 @@ 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.DateParseUtils; import org.jeecg.common.util.R; import org.jeecg.common.vo.statistic.AlertSummaryVo; import org.jeecg.common.vo.statistic.SurvSummaryVo; @@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; + /** * @Description: surv_alert_record @@ -48,9 +51,10 @@ public class SurvAlertRecordController { String tenantId = TenantUtil.getCurTenant(null); survSummaryDTO.setTenantId(tenantId); if(StringUtils.isNotBlank(survSummaryDTO.getStartTime())){ - if(survSummaryDTO.getStartTime().equals(survSummaryDTO.getEndTime())){//开始时间与结束时间相同，则清空，避免查询到空数据 - survSummaryDTO.setStartTime(""); - survSummaryDTO.setEndTime(""); + if(survSummaryDTO.getStartTime().equals(survSummaryDTO.getEndTime())){ + LocalDateTime startTime = DateParseUtils.parseToLocalDateTime(survSummaryDTO.getStartTime()); + startTime=startTime.minusDays(30); + survSummaryDTO.setStartTime(DateParseUtils.formatLocalDateTime(startTime,"yyyy-MM-dd"));//开始时间改为结束时间的30天前 } } SurvSummaryVo survSummaryVo = zhAdminFeignClient.stationDeviceSummary(survSummaryDTO);