任务提交 修正站点信息下一次测试时间

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BerthingTimeConfigMapper.java

@@ -31,7 +31,7 @@ public interface BerthingTimeConfigMapper {
      * @param wlevel 主键
      * @return 实例对象
      */
-    BerthingTimeConfig queryByWlevel(Double wlevel);
+    BerthingTimeConfig queryByWlevel(@Param("wlevel") Double wlevel, @Param("siteId") Long siteId);
 
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ReportDataServiceImpl.java

@@ -77,12 +77,13 @@ public class ReportDataServiceImpl implements ReportDataService {
             throw new BaseException("站点不存在");
         }
         siteRealTimeDTO.setSiteName(siteInfo.getSiteName());
+        siteRealTimeDTO.setSiteId(siteId);
         //查询状态
         TaskResult taskResult = taskResultMapper.queryBySiteIdOne(siteId);
         if (taskResult == null){
             siteRealTimeDTO.setSiteStatus(null);
             siteRealTimeDTO.setNextTime(null);
-        }else {
+        } else {
             siteRealTimeDTO.setSiteStatus(taskResult.getStatus()==0?"1":"0");
             //计算下次测量时间 取当前水位匹配测流时间策略
             WaterLevel waterLevel = waterLevelMapper.queryBySiteId(siteId);
@@ -90,7 +91,7 @@ public class ReportDataServiceImpl implements ReportDataService {
                 siteRealTimeDTO.setNextTime(null);
             }else {
                 //查询测流时间策略
-                BerthingTimeConfig berthingTimeConfig = berthingTimeConfigMapper.queryByWlevel(waterLevel.getWaterlevel());
+                BerthingTimeConfig berthingTimeConfig = berthingTimeConfigMapper.queryByWlevel(waterLevel.getWaterlevel(),siteId);
                 if (berthingTimeConfig == null){
                     siteRealTimeDTO.setNextTime(null);
                 }else {
@@ -108,9 +109,9 @@ public class ReportDataServiceImpl implements ReportDataService {
                             .findFirst()
                             .orElse(null);
                     if (nextTimeSlot != null) {
-                        System.out.println("下一个时间是: " + nextTimeSlot.format(DateTimeFormatter.ofPattern("HH:mm")));
+                        siteRealTimeDTO.setNextTime(nextTimeSlot.format(DateTimeFormatter.ofPattern("HH:mm")));
                     } else {
-                        System.out.println("没有找到下一个时间，所有时间都已过去");
+                        siteRealTimeDTO.setNextTime(timeSlots.get(0).toString());
                     }
                 }
 

ruoyi-system/src/main/resources/mapper/BerthingTimeConfigMapper.xml

@@ -32,7 +32,7 @@
         where #{wlevel} - wlevel = (
         SELECT MIN(#{wlevel} -t.wlevel)
         FROM berthing_time_config AS t
-        WHERE #{wlevel} > t.wlevel )
+        WHERE #{wlevel} > t.wlevel and site_id = #{siteId})
     </select>