From 2b67ed2da39eba5824cfee7950e03be2c1a256ec Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 20 十月 2025 13:17:04 +0800
Subject: [PATCH] 新增数据上传准东
---
src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java
index 0160f18..2a772bb 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java
@@ -21,7 +21,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.Period;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -160,7 +162,7 @@
}
@Override
- public ResultVO<SPIDataRespDTO> getSPIData(SPIDataReqBO spiDataReqBO) {
+ public ResultVO<TroubleData> getSPIData(SPIDataReqBO spiDataReqBO) {
ResultVO resultVO = new ResultVO<>();
resultVO.setCode("200");
@@ -178,19 +180,18 @@
resultVO.setMsg("key不正确");
return resultVO;
}
- if (ObjectUtils.isEmpty(spiDataReqBO.getStartTime())){
- spiDataReqBO.setStartTime(new Date(123, 3,1));
+ LocalDateTime startTime = LocalDate.now().withDayOfMonth(1).atStartOfDay();
+ for (int i = 0; i < 12; i++) {
+ startTime = startTime.minus(Period.ofMonths(1));
}
- if (ObjectUtils.isEmpty(spiDataReqBO.getEndTime())){
- spiDataReqBO.setEndTime(new Date());
- }
+ spiDataReqBO.setStartTime(startTime);
+ spiDataReqBO.setEndTime(LocalDateTime.now());
+
List<TroubleData> spiData = checkPointService.getSPIData(spiDataReqBO);
- SPIDataRespDTO spiDataRespDTO = new SPIDataRespDTO();
- spiDataRespDTO.setTroubleDataList(spiData);
- resultVO.setData(spiDataRespDTO);
+ resultVO.setData(spiData);
return resultVO;
}
--
Gitblit v1.9.2