更新

src/main/java/com/taauav/app/service/impl/DriverServiceImpl.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.taauav.admin.entity.TauvDriver;
+import com.taauav.admin.entity.TauvDriverPoint;
+import com.taauav.admin.mapper.TauvDriverPointMapper;
 import com.taauav.admin.service.ISysCityService;
+import com.taauav.admin.service.ITauvDriverPointService;
 import com.taauav.app.mapper.DriverMapper;
 import com.taauav.app.query.DriverQuery;
 import com.taauav.app.service.IDriverService;
@@ -42,6 +45,8 @@ public class DriverServiceImpl extends ServiceImpl<DriverMapper, TauvDriver> imp
     @Autowired
     private ISysCityService cityService;
     @Autowired
+    private TauvDriverPointMapper driverPointMapper;
+    @Autowired
     private Response response;
 
     @Value("${server.IMAGE_URL}")
@@ -84,6 +89,14 @@ public class DriverServiceImpl extends ServiceImpl<DriverMapper, TauvDriver> imp
                 if (!StringUtils.isEmpty(item.getImgPath())) {
                     driverListVo.setImgPath(uploadUrl + item.getImgPath());
                 }
+
+                // 获取河道坐标
+                QueryWrapper<TauvDriverPoint> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("driver_id", item.getId());
+                queryWrapper1.eq("status", 1);
+                queryWrapper1.eq("mark", 1);
+                List<TauvDriverPoint> driverPointList = driverPointMapper.selectList(queryWrapper1);
+                driverListVo.setDriverPointList(driverPointList);
                 driverListVoList.add(driverListVo);
             });
         }

src/main/java/com/taauav/app/vo/DriverListVo.java

@@ -1,8 +1,11 @@
 package com.taauav.app.vo;
 
 import com.taauav.admin.entity.TauvDriver;
+import com.taauav.admin.entity.TauvDriverPoint;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 河湖列表Vo
  */
@@ -14,4 +17,9 @@ public class DriverListVo extends TauvDriver {
      */
     private String driverAreaName;
 
+    /**
+     * 河道坐标列表
+     */
+    private List<TauvDriverPoint> driverPointList;
+
 }