任务提交 增加接口获取最后一次任务的停泊点

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

@@ -22,6 +22,15 @@ public interface BerthingPointConfigMapper {
      */
     BerthingPointConfig queryById(Long stopId);
 
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param siteId 主键
+     * @return 实例对象
+     */
+    BerthingPointConfig queryByPlanid(@Param("siteId")Long siteId, @Param("planid")Long planid);
+
     /**
      * 查询指定行数据
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ReportDataService.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.dto.SiteRealTimeDTO;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 public interface ReportDataService {
@@ -21,4 +23,8 @@ public interface ReportDataService {
     WaterLevel getWaterLevel(Long siteId);
 
     List<MeasureUpload> getMeasureLine (Long siteId);
+
+    BerthingPointConfig getPointConfig (Long siteId);
+
+
 }

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

@@ -17,7 +17,9 @@ import javax.annotation.Resource;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -56,6 +58,9 @@ public class ReportDataServiceImpl implements ReportDataService {
     @Resource
     private BerthingTimeConfigMapper berthingTimeConfigMapper;
 
+    @Resource
+    private BerthingPointConfigMapper berthingPointConfigMapper;
+
     @Override
     public CarPosition carLocation(Long siteId){
         return carPositionMapper.queryBysiteId(siteId);
@@ -153,9 +158,31 @@ public class ReportDataServiceImpl implements ReportDataService {
         return measureUploadMapper.queryBySiteIdTime(siteId,createTime);
     }
 
+    @Override
+    public BerthingPointConfig getPointConfig (Long siteId){
+        //先查询最后一次开测时间
+        TaskResult taskResult = taskResultMapper.queryBySiteIdOne(siteId);
+        if (taskResult == null){
+            return null;
+        } else {
+            Long planid = taskResult.getPlanid();
+            BerthingPointConfig berthingPointConfig = berthingPointConfigMapper.queryByPlanid(siteId, planid);
+            if (berthingPointConfig == null){
+                return null;
+            }
+            return berthingPointConfig;
+        }
+    }
+
+
+
+
     private static LocalTime parseTime(Object timeStr) {
         return LocalTime.parse(timeStr.toString(), DateTimeFormatter.ofPattern("HH:mm"));
     }
 
 
+
+
+
 }

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

@@ -25,6 +25,14 @@
         where stop_id = #{stopId}
     </select>
 
+    <!--查询单个-->
+    <select id="queryByPlanid" resultMap="BerthingPointConfigMap">
+        select
+            stop_id, id, site_id, planid, berthing_id, positions, create_time, status, is_del, wlevel, factors
+        from berthing_point_config
+        where site_id = #{siteId} and planid = #{planid}
+    </select>
+
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="BerthingPointConfigMap">
         select

waterAffairs-admin/src/main/java/com/ruoyi/web/controller/tool/ReportDataController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -72,6 +73,11 @@ public class ReportDataController {
         return R.ok(reportDataService.getMeasureLine(siteId));
     }
 
-
+    //垂线点对应流量图
+    @GetMapping(value = "/getPointConfig")
+    @ApiOperation("获取最后一次任务的停泊点信息")
+    public R<BerthingPointConfig> getPointConfig(Long siteId)  {
+        return R.ok(reportDataService.getPointConfig(siteId));
+    }
 
 }