数据

ruoyi-admin/src/main/java/com/ruoyi/web/controller/PredictController.java

@@ -354,9 +354,13 @@ public class PredictController {
     public List<StationInfoMin2> latestStation(@RequestParam(value = "stationId", required = false) String stationId,
                                                @RequestParam(value = "beginTime", required = false) String beginTime,
                                                @RequestParam(value = "endTime", required = false) String endTime) {
+        QueryWrapper<StationInfoMin2> wrapper = new QueryWrapper<>();
+        wrapper.select("max(record_date) record_date").eq("station_id", stationId);
+        StationInfoMin2 one = stationInfoMin2Service.getOne(wrapper);
 
         DateTime begin = DateUtil.parse(beginTime);
-        DateTime middle = DateUtil.parse("2024-11-07");
+        //DateTime middle = DateUtil.parse("2024-11-07");
+        DateTime middle = DateUtil.date(one.getRecordDate());
         DateTime end = DateUtil.parse(endTime);
         QueryWrapper<StationInfoMin2> minWrapper = new QueryWrapper<>();
         minWrapper.lambda().eq(StationInfoMin2::getStationId, stationId).between(StationInfoMin2::getRecordDate, begin, middle)
@@ -384,8 +388,13 @@ public class PredictController {
                                                @RequestParam(value = "beginTime", required = false) String beginTime,
                                                @RequestParam(value = "endTime", required = false) String endTime) {
 
+        QueryWrapper<ProjectInfoMin2> wrapper = new QueryWrapper<>();
+        wrapper.select("max(record_date) record_date").eq("project_id", projectId);
+        ProjectInfoMin2 one = projectInfoMin2Service.getOne(wrapper);
+        DateTime middle = DateUtil.date(one.getRecordDate());
+
         DateTime begin = DateUtil.parse(beginTime);
-        DateTime middle = DateUtil.parse("2024-11-07");
+        //DateTime middle = DateUtil.parse("2024-11-07");
         DateTime end = DateUtil.parse(endTime);
         QueryWrapper<ProjectInfoMin2> minWrapper = new QueryWrapper<>();
         minWrapper.lambda().eq(ProjectInfoMin2::getProjectId, projectId).between(ProjectInfoMin2::getRecordDate, begin, middle)