no message

bus-biz/src/main/java/bus/service/impl/BCourseInfoServiceImpl.java

@@ -863,6 +863,7 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
         List<FindResultDto> result = CollectionUtil.newArrayList();
         QueryWrapper<BCourseInfoPo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like("course_name", name);
+        queryWrapper.eq("status", "0");
         List<BCourseInfoPo> list = bCourseInfoMapper.selectList(queryWrapper);
         if(CollectionUtil.isNotEmpty(list)) {
             for (BCourseInfoPo bCourseInfoPo : list) {
@@ -870,6 +871,11 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
                 dto2.setId(bCourseInfoPo.getId());
                 dto2.setName(bCourseInfoPo.getCourseName());
                 dto2.setType("0");
+                dto2.setFirstStationName(bCourseInfoPo.getFirstStationName());
+                dto2.setFirstStationId(bCourseInfoPo.getFirstStationId());
+                dto2.setLastStationName(bCourseInfoPo.getLastStationName());
+                dto2.setLastStationId(bCourseInfoPo.getLastStationId());
+                dto2.setFirstBusSpace(bCourseInfoPo.getFirstBusSpace());
                 result.add(dto2);
             }
         }
@@ -881,12 +887,16 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
         List<FindResultDto> result1 = CollectionUtil.newArrayList();
         QueryWrapper<BStationInfoPo> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.like("name", name);
+        queryWrapper2.eq("station_status", 0);
         List<BStationInfoPo> list2 = bStationInfoService.list(queryWrapper2);
         if(CollectionUtil.isNotEmpty(list2)) {
             for (BStationInfoPo bStationInfoPo : list2) {
                 FindResultDto dto = new FindResultDto();
                 dto.setId(bStationInfoPo.getId());
                 dto.setName(bStationInfoPo.getName());
+                dto.setDetailAddress(bStationInfoPo.getDetailAddress());
+                dto.setLatitude(bStationInfoPo.getLatitude());
+                dto.setLongitude(bStationInfoPo.getLongitude());
                 dto.setType("1");
                 result1.add(dto);
             }

bus-common/src/main/java/bus/model/dto/FindResultDto.java

@@ -3,10 +3,31 @@ package bus.model.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 public class FindResultDto {
     private String id;
     @ApiModelProperty(value = "类型 0路线 1标记点")
     private String type;
     private String name;
+    @ApiModelProperty("详细地址")
+    private String detailAddress;
+
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty("首个站点名称")
+    private String firstStationName;
+    @ApiModelProperty("首个站点id")
+    private String firstStationId;
+    @ApiModelProperty("最后站点名称")
+    private String lastStationName;
+    @ApiModelProperty("最后站点id")
+    private String lastStationId;
+    @ApiModelProperty("首次发车时间")
+    private String firstBusSpace;
 }