no message

bus-biz/src/main/java/bus/mapper/BCourseBusMapper.java

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.page.BCourseBusPageDto;
+import bus.model.vo.BCourseBusVo;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:56:32
+ **/
+@Mapper
+public interface BCourseBusMapper extends BaseMapper<BCourseBusPo> {
+
+    List<BCourseBusVo> list(BCourseBusPageDto dto);
+}

bus-biz/src/main/java/bus/mapper/BCourseInfoMapper.java

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.page.BCourseInfoPageDto;
+import bus.model.vo.BCourseInfoVo;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:53:49
+ **/
+@Mapper
+public interface BCourseInfoMapper extends BaseMapper<BCourseInfoPo> {
+
+    List<BCourseInfoVo> list(BCourseInfoPageDto dto);
+}

bus-biz/src/main/java/bus/mapper/BCourseStationMapper.java

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.page.BCourseStationPageDto;
+import bus.model.vo.BCourseStationVo;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:54:59
+ **/
+@Mapper
+public interface BCourseStationMapper extends BaseMapper<BCourseStationPo> {
+
+    List<BCourseStationVo> list(BCourseStationPageDto dto);
+}

bus-biz/src/main/java/bus/mapper/BCourseTimeMapper.java

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.page.BCourseTimePageDto;
+import bus.model.vo.BCourseTimeVo;
+import bus.model.po.*;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:55:46
+ **/
+@Mapper
+public interface BCourseTimeMapper extends BaseMapper<BCourseTimePo> {
+
+    List<BCourseTimeVo> list(BCourseTimePageDto dto);
+}

bus-biz/src/main/java/bus/service/BBusInfoService.java

@@ -1,7 +1,11 @@
 package bus.service;
 
 import bus.model.dto.BBusInfoDto;
+import bus.model.dto.BBusTrackInfoDto;
+import bus.model.dto.BBusTrackTreeDto;
 import bus.model.dto.page.BBusInfoPageDto;
+import bus.model.po.BBusInfoPo;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -11,7 +15,7 @@ import java.util.List;
  * @Author: zy
  * @Date: 2025-03-01 10:04:08
  **/
-public interface BBusInfoService {
+public interface BBusInfoService extends IService<BBusInfoPo> {
 
 
     /**
@@ -48,4 +52,19 @@ public interface BBusInfoService {
      * @return
      */
     void delete(String id);
+
+
+    /**
+     * 获取车辆状态树型数据
+     * @return
+     */
+    List<BBusTrackTreeDto> getTreeList();
+
+
+    /**
+     * 根据车辆ID获取车辆追踪信息
+     * @return
+     */
+    BBusTrackInfoDto getTrackInfo(String busId);
+
 }

bus-biz/src/main/java/bus/service/BCourseBusService.java

@@ -0,0 +1,58 @@
+package bus.service;
+
+import bus.model.dto.BCourseBusDto;
+import bus.model.dto.page.BCourseBusPageDto;
+import bus.model.vo.BCourseBusVo;
+import bus.model.po.BCourseBusPo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:56:32
+ **/
+public interface BCourseBusService extends IService<BCourseBusPo> {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BCourseBusPo getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BCourseBusDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BCourseBusVo> list(BCourseBusPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BCourseBusDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+    /**
+     * 根据线路id删除
+     */
+    void deleteByCourseId(String courseId);
+}

bus-biz/src/main/java/bus/service/BCourseInfoService.java

@@ -0,0 +1,54 @@
+package bus.service;
+
+import bus.model.dto.BCourseInfoDto;
+import bus.model.dto.page.BCourseInfoPageDto;
+import bus.model.vo.BCourseInfoVo;
+import bus.model.po.BCourseInfoPo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:53:49
+ **/
+public interface BCourseInfoService extends IService<BCourseInfoPo> {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BCourseInfoDto getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BCourseInfoDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BCourseInfoVo> list(BCourseInfoPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BCourseInfoDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+}

bus-biz/src/main/java/bus/service/BCourseStationService.java

@@ -0,0 +1,59 @@
+package bus.service;
+
+import bus.model.dto.BCourseStationDto;
+import bus.model.dto.page.BCourseStationPageDto;
+import bus.model.vo.BCourseStationVo;
+import bus.model.po.BCourseStationPo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:54:59
+ **/
+public interface BCourseStationService extends IService<BCourseStationPo> {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BCourseStationPo getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BCourseStationDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BCourseStationVo> list(BCourseStationPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BCourseStationDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+
+    /**
+     * 根据线路id删除
+     */
+    void deleteByCourseId(String courseId);
+}

bus-biz/src/main/java/bus/service/BCourseTimeService.java

@@ -0,0 +1,59 @@
+package bus.service;
+
+import bus.model.dto.BCourseTimeDto;
+import bus.model.dto.page.BCourseTimePageDto;
+import bus.model.vo.BCourseTimeVo;
+import bus.model.po.BCourseTimePo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:55:46
+ **/
+public interface BCourseTimeService extends IService<BCourseTimePo> {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BCourseTimePo getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BCourseTimeDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BCourseTimeVo> list(BCourseTimePageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BCourseTimeDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+
+    /**
+     * 根据线路id删除
+     */
+    void deleteByCourseId(String courseId);
+}

bus-biz/src/main/java/bus/service/BStationInfoService.java

@@ -4,6 +4,8 @@ import bus.model.dto.BStationInfoDto;
 import bus.model.dto.BStationInfoPageDto;
 import bus.model.vo.BStationInfoVo;
 import bus.model.po.BStationInfoPo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.util.List;
 
 /**
@@ -12,7 +14,7 @@ import java.util.List;
  * @Author: zy
  * @Date: 2025-03-01 21:07:50
  **/
-public interface BStationInfoService {
+public interface BStationInfoService extends IService<BStationInfoPo> {
 
 
     /**

bus-biz/src/main/java/bus/service/CommonService.java

@@ -14,7 +14,7 @@ import java.util.List;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-01 21:07:50
+* @Date: 2025-03-02 19:56:32
 **/
 public interface CommonService {
 

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

@@ -2,6 +2,8 @@ package bus.service.impl;
 
 import bus.model.SnowflakeUtil;
 import bus.model.dto.BBusInfoDto;
+import bus.model.dto.BBusTrackInfoDto;
+import bus.model.dto.BBusTrackTreeDto;
 import bus.model.dto.page.BBusInfoPageDto;
 import bus.model.vo.BBusInfoVo;
 import bus.model.po.BBusInfoPo;
@@ -20,8 +22,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.BeanUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Program: bus
@@ -131,4 +136,58 @@ public class BBusInfoServiceImpl extends ServiceImpl<BBusInfoMapper,BBusInfoPo>
     public void delete(String id){
 		bBusInfoMapper.deleteById(id);
     }
+
+    /**
+     * 获取车辆状态树型数据
+     *
+     * @return
+     */
+    @Override
+    public List<BBusTrackTreeDto> getTreeList() {
+        // 查询所有未删除的车辆信息
+        List<BBusInfoPo> busList = this.bBusInfoMapper.selectList(
+                new QueryWrapper<BBusInfoPo>()
+                        .eq("is_delete", 0)
+        );
+        // 按状态分组
+        Map<String, List<BBusInfoPo>> busGroups = busList.stream()
+                .collect(Collectors.groupingBy(BBusInfoPo::getStatus));
+
+        // 构建树形结构
+        List<BBusTrackTreeDto> treeList = new ArrayList<>();
+
+        // 添加状态分组节点
+        busGroups.forEach((status, buses) -> {
+            BBusTrackTreeDto statusNode = new BBusTrackTreeDto();
+            statusNode.setStatus(status);
+            // 添加子节点（车辆）
+            List<BBusInfoDto> children = buses.stream()
+                    .map(bus -> {
+                        BBusInfoDto busNode = new BBusInfoDto();
+                        busNode.setId(bus.getId());
+                        busNode.setBusNo(bus.getBusNo());
+                        busNode.setBusName(bus.getBusName());
+                        busNode.setStatus(bus.getStatus());
+                        return busNode;
+                    })
+                    .collect(Collectors.toList());
+
+            statusNode.setList(children);
+            treeList.add(statusNode);
+        });
+
+        return treeList;
+    }
+
+    /**
+     * 根据车辆ID获取车辆追踪信息
+     *
+     * @param busId
+     * @return
+     */
+    @Override
+    public BBusTrackInfoDto getTrackInfo(String busId) {
+
+        return null;
+    }
 }

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

@@ -0,0 +1,95 @@
+package bus.service.impl;
+
+import bus.model.dto.BCourseBusDto;
+import bus.model.dto.page.BCourseBusPageDto;
+import bus.model.vo.BCourseBusVo;
+import bus.model.po.BCourseBusPo;
+import bus.mapper.BCourseBusMapper;
+
+import bus.service.BCourseBusService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:56:32
+ **/
+@Service
+public class BCourseBusServiceImpl extends ServiceImpl<BCourseBusMapper, BCourseBusPo> implements BCourseBusService {
+
+    @Autowired
+    private BCourseBusMapper bCourseBusMapper;
+
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BCourseBusPo getDetailById(String id){
+        return this.bCourseBusMapper.selectById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BCourseBusDto dto){
+        BCourseBusPo po = new BCourseBusPo();
+        BeanUtils.copyProperties(dto,po);
+		this.bCourseBusMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BCourseBusVo> list(BCourseBusPageDto dto){
+        return this.bCourseBusMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BCourseBusDto dto){
+        BCourseBusPo po = new BCourseBusPo();
+        BeanUtils.copyProperties(dto,po);
+		bCourseBusMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bCourseBusMapper.deleteById(id);
+    }
+
+    /**
+     * 根据线路id删除
+     *
+     * @param courseId
+     */
+    @Override
+    public void deleteByCourseId(String courseId) {
+        QueryWrapper<BCourseBusPo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("course_id", courseId);
+        bCourseBusMapper.delete(queryWrapper);
+    }
+}

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

@@ -0,0 +1,242 @@
+package bus.service.impl;
+
+import bus.model.SnowflakeUtil;
+import bus.model.dto.BCourseBusDto;
+import bus.model.dto.BCourseInfoDto;
+import bus.model.dto.BCourseStationDto;
+import bus.model.dto.BCourseTimeDto;
+import bus.model.dto.page.BCourseInfoPageDto;
+import bus.model.po.*;
+import bus.model.vo.BCourseInfoVo;
+import bus.mapper.BCourseInfoMapper;
+
+import bus.service.*;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.orcas.common.sso.model.ExtInfo;
+import com.orcas.iso.config.common.user.CurrentUserHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:53:49
+ **/
+@Service
+
+public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCourseInfoPo> implements BCourseInfoService {
+
+    @Autowired
+    private BCourseInfoMapper bCourseInfoMapper;
+    @Resource
+    private SnowflakeUtil snowflakeUtil;
+    @Resource
+    private BCourseTimeService bCourseTimeService;
+    @Resource
+    private BCourseStationService bCourseStationService;
+    @Resource
+    private BStationInfoService bStationInfoService;
+    @Resource
+    private BCourseBusService bCourseBusService;
+    @Resource
+    private BBusInfoService bBusInfoService;
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BCourseInfoDto getDetailById(String id){
+        BCourseInfoPo po = this.bCourseInfoMapper.selectById(id);
+        BCourseInfoDto bCourseInfoDto = BeanUtil.toBean(po, BCourseInfoDto.class);
+
+        QueryWrapper<BCourseTimePo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("course_id", id);
+        queryWrapper.orderByAsc("sort");
+        List<BCourseTimePo> list = bCourseTimeService.list(queryWrapper);
+        bCourseInfoDto.setBCourseTimeList(BeanUtil.copyToList(list, BCourseTimeDto.class));
+
+
+        QueryWrapper<BCourseStationPo> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("course_id", id);
+        queryWrapper1.orderByAsc("sort");
+        List<BCourseStationPo> list1 = bCourseStationService.list(queryWrapper1);
+        List<String> stationIds = list1.stream().map(BCourseStationPo::getStationId).collect(Collectors.toList());
+        QueryWrapper<BStationInfoPo> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.in("id", stationIds);
+        List<BStationInfoPo> list2 = bStationInfoService.list(queryWrapper2);
+        bCourseInfoDto.setBCourseStationList(BeanUtil.copyToList(list2, BCourseStationDto.class));
+
+        QueryWrapper<BCourseBusPo> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("course_id", id);
+        queryWrapper3.orderByAsc("sort");
+        List<BCourseBusPo> list3 = bCourseBusService.list(queryWrapper3);
+        List<String> busIds = list3.stream().map(BCourseBusPo::getBusId).collect(Collectors.toList());
+        QueryWrapper<BBusInfoPo> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.in("id", busIds);
+        List<BBusInfoPo> list4 = bBusInfoService.list(queryWrapper4);
+        bCourseInfoDto.setBCourseBusList(BeanUtil.copyToList(list4, BCourseBusDto.class));
+        return bCourseInfoDto;
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+	public void save(BCourseInfoDto dto){
+        BCourseInfoPo po = BeanUtil.toBean(dto, BCourseInfoPo.class);
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setId(snowflakeUtil.snowflakeId());
+        po.setCreateTime(new Date());
+        po.setUpdateTime(new Date());
+        po.setCreatorId(extInfo.getUserId());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setCreatorName(extInfo.getUserName());
+        po.setUpdaterName(extInfo.getUserName());
+        //处理时刻
+        List<BCourseTimeDto> bCourseTimeList = dto.getBCourseTimeList();
+        List<BCourseTimePo> bCourseTimePoList = BeanUtil.copyToList(bCourseTimeList, BCourseTimePo.class);
+        bCourseTimePoList.forEach(bCourseTimePo -> {
+            bCourseTimePo.setId(snowflakeUtil.snowflakeId());
+            bCourseTimePo.setCourseId(po.getId());
+            bCourseTimePo.setCreateTime(new Date());
+            bCourseTimePo.setUpdateTime(new Date());
+            bCourseTimePo.setCreatorId(extInfo.getUserId());
+            bCourseTimePo.setUpdaterId(extInfo.getUserId());
+            bCourseTimePo.setCreatorName(extInfo.getUserName());
+            bCourseTimePo.setUpdaterName(extInfo.getUserName());
+        });
+        bCourseTimeService.saveBatch(bCourseTimePoList);
+        //处理标志点
+        List<BCourseStationDto> bCourseStationList = dto.getBCourseStationList();
+        List<BCourseStationPo> bCourseStationPoList = BeanUtil.copyToList(bCourseStationList, BCourseStationPo.class);
+        bCourseStationPoList.forEach(bCourseStationPo -> {
+            bCourseStationPo.setId(snowflakeUtil.snowflakeId());
+            bCourseStationPo.setCourseId(po.getId());
+            bCourseStationPo.setCreateTime(new Date());
+            bCourseStationPo.setUpdateTime(new Date());
+            bCourseStationPo.setCreatorId(extInfo.getUserId());
+            bCourseStationPo.setUpdaterId(extInfo.getUserId());
+            bCourseStationPo.setCreatorName(extInfo.getUserName());
+            bCourseStationPo.setUpdaterName(extInfo.getUserName());
+        });
+        bCourseStationService.saveBatch(bCourseStationPoList);
+        //处理车辆
+        List<BCourseBusDto> bCourseBusList = dto.getBCourseBusList();
+        List<BCourseBusPo> bCourseBusPoList = BeanUtil.copyToList(bCourseBusList, BCourseBusPo.class);
+        bCourseBusPoList.forEach(bCourseBusPo -> {
+            bCourseBusPo.setId(snowflakeUtil.snowflakeId());
+            bCourseBusPo.setCourseId(po.getId());
+            bCourseBusPo.setCreateTime(new Date());
+            bCourseBusPo.setUpdateTime(new Date());
+            bCourseBusPo.setCreatorId(extInfo.getUserId());
+            bCourseBusPo.setUpdaterId(extInfo.getUserId());
+            bCourseBusPo.setCreatorName(extInfo.getUserName());
+            bCourseBusPo.setUpdaterName(extInfo.getUserName());
+        });
+        this.bCourseInfoMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BCourseInfoVo> list(BCourseInfoPageDto dto){
+        return this.bCourseInfoMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BCourseInfoDto dto){
+        BCourseInfoPo po = BeanUtil.toBean(dto, BCourseInfoPo.class);
+        ExtInfo extInfo = CurrentUserHolder.get();
+        po.setUpdateTime(new Date());
+        po.setUpdaterId(extInfo.getUserId());
+        po.setUpdaterName(extInfo.getUserName());
+        //处理时刻
+        bCourseTimeService.deleteByCourseId(po.getId());
+        List<BCourseTimeDto> bCourseTimeList = dto.getBCourseTimeList();
+        List<BCourseTimePo> bCourseTimePoList = BeanUtil.copyToList(bCourseTimeList, BCourseTimePo.class);
+        bCourseTimePoList.forEach(bCourseTimePo -> {
+            bCourseTimePo.setId(snowflakeUtil.snowflakeId());
+            bCourseTimePo.setCourseId(po.getId());
+            bCourseTimePo.setCreateTime(new Date());
+            bCourseTimePo.setUpdateTime(new Date());
+            bCourseTimePo.setCreatorId(extInfo.getUserId());
+            bCourseTimePo.setUpdaterId(extInfo.getUserId());
+            bCourseTimePo.setCreatorName(extInfo.getUserName());
+            bCourseTimePo.setUpdaterName(extInfo.getUserName());
+        });
+        bCourseTimeService.saveBatch(bCourseTimePoList);
+        //处理标志点
+        bCourseStationService.deleteByCourseId(po.getId());
+        List<BCourseStationDto> bCourseStationList = dto.getBCourseStationList();
+        List<BCourseStationPo> bCourseStationPoList = BeanUtil.copyToList(bCourseStationList, BCourseStationPo.class);
+        bCourseStationPoList.forEach(bCourseStationPo -> {
+            bCourseStationPo.setId(snowflakeUtil.snowflakeId());
+            bCourseStationPo.setCourseId(po.getId());
+            bCourseStationPo.setCreateTime(new Date());
+            bCourseStationPo.setUpdateTime(new Date());
+            bCourseStationPo.setCreatorId(extInfo.getUserId());
+            bCourseStationPo.setUpdaterId(extInfo.getUserId());
+            bCourseStationPo.setCreatorName(extInfo.getUserName());
+            bCourseStationPo.setUpdaterName(extInfo.getUserName());
+        });
+        bCourseStationService.saveBatch(bCourseStationPoList);
+        //处理车辆
+        bCourseBusService.deleteByCourseId(po.getId());
+        List<BCourseBusDto> bCourseBusList = dto.getBCourseBusList();
+        List<BCourseBusPo> bCourseBusPoList = BeanUtil.copyToList(bCourseBusList, BCourseBusPo.class);
+        bCourseBusPoList.forEach(bCourseBusPo -> {
+            bCourseBusPo.setId(snowflakeUtil.snowflakeId());
+            bCourseBusPo.setCourseId(po.getId());
+            bCourseBusPo.setCreateTime(new Date());
+            bCourseBusPo.setUpdateTime(new Date());
+            bCourseBusPo.setCreatorId(extInfo.getUserId());
+            bCourseBusPo.setUpdaterId(extInfo.getUserId());
+            bCourseBusPo.setCreatorName(extInfo.getUserName());
+            bCourseBusPo.setUpdaterName(extInfo.getUserName());
+        });
+        bCourseBusService.saveBatch(bCourseBusPoList);
+        this.bCourseInfoMapper.insert(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String id){
+        QueryWrapper<BCourseTimePo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("course_id", id);
+        bCourseTimeService.remove(queryWrapper);
+        QueryWrapper<BCourseStationPo> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("course_id", id);
+        bCourseStationService.remove(queryWrapper1);
+        QueryWrapper<BCourseBusPo> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("course_id", id);
+        bCourseBusService.remove(queryWrapper2);
+		bCourseInfoMapper.deleteById(id);
+    }
+}

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

@@ -0,0 +1,95 @@
+package bus.service.impl;
+
+import bus.model.dto.BCourseStationDto;
+import bus.model.dto.page.BCourseStationPageDto;
+import bus.model.vo.BCourseStationVo;
+import bus.model.po.BCourseStationPo;
+import bus.mapper.BCourseStationMapper;
+
+import bus.service.BCourseStationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:54:59
+ **/
+@Service
+public class BCourseStationServiceImpl extends ServiceImpl<BCourseStationMapper, BCourseStationPo> implements BCourseStationService {
+
+    @Autowired
+    private BCourseStationMapper bCourseStationMapper;
+
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BCourseStationPo getDetailById(String id){
+        return this.bCourseStationMapper.selectById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BCourseStationDto dto){
+        BCourseStationPo po = new BCourseStationPo();
+        BeanUtils.copyProperties(dto,po);
+		this.bCourseStationMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BCourseStationVo> list(BCourseStationPageDto dto){
+        return this.bCourseStationMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BCourseStationDto dto){
+        BCourseStationPo po = new BCourseStationPo();
+        BeanUtils.copyProperties(dto,po);
+		bCourseStationMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bCourseStationMapper.deleteById(id);
+    }
+
+    /**
+     * 根据线路id删除
+     *
+     * @param courseId
+     */
+    @Override
+    public void deleteByCourseId(String courseId) {
+        QueryWrapper<BCourseStationPo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("course_id", courseId);
+        bCourseStationMapper.delete(queryWrapper);
+    }
+}

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

@@ -0,0 +1,95 @@
+package bus.service.impl;
+
+import bus.model.dto.BCourseTimeDto;
+import bus.model.dto.page.BCourseTimePageDto;
+import bus.model.vo.BCourseTimeVo;
+import bus.model.po.BCourseTimePo;
+import bus.mapper.BCourseTimeMapper;
+
+import bus.service.BCourseTimeService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:55:46
+ **/
+@Service
+public class BCourseTimeServiceImpl extends ServiceImpl<BCourseTimeMapper, BCourseTimePo> implements BCourseTimeService {
+
+    @Autowired
+    private BCourseTimeMapper bCourseTimeMapper;
+
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BCourseTimePo getDetailById(String id){
+        return this.bCourseTimeMapper.selectById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BCourseTimeDto dto){
+        BCourseTimePo po = new BCourseTimePo();
+        BeanUtils.copyProperties(dto,po);
+		this.bCourseTimeMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BCourseTimeVo> list(BCourseTimePageDto dto){
+        return this.bCourseTimeMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BCourseTimeDto dto){
+        BCourseTimePo po = new BCourseTimePo();
+        BeanUtils.copyProperties(dto,po);
+		bCourseTimeMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bCourseTimeMapper.deleteById(id);
+    }
+
+    /**
+     * 根据线路id删除
+     *
+     * @param courseId
+     */
+    @Override
+    public void deleteByCourseId(String courseId) {
+        QueryWrapper<BCourseTimePo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("course_id", courseId);
+        bCourseTimeMapper.delete(queryWrapper);
+    }
+}

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

@@ -10,7 +10,9 @@ import bus.mapper.BStationInfoMapper;
 
 import bus.service.BStationInfoService;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.orcas.common.sso.model.ExtInfo;
 import com.orcas.iso.config.common.user.CurrentUserHolder;
 import com.qzwisdom.qzframework.core.tool.exception.BusinessException;
@@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.BeanUtils;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -29,7 +32,7 @@ import java.util.List;
  * @Date: 2025-03-01 21:07:50
  **/
 @Service
-public class BStationInfoServiceImpl implements BStationInfoService {
+public class BStationInfoServiceImpl extends ServiceImpl<BStationInfoMapper, BStationInfoPo> implements BStationInfoService {
 
     @Autowired
     private BStationInfoMapper bStationInfoMapper;
@@ -45,6 +48,9 @@ public class BStationInfoServiceImpl implements BStationInfoService {
     public BStationInfoDto getDetailById(String id){
         BStationInfoPo bStationInfoPo = this.bStationInfoMapper.selectById(id);
         BStationInfoDto bStationInfoDto = BeanUtil.toBean(bStationInfoPo, BStationInfoDto.class);
+        if (bStationInfoPo.getPicUrl() != null) {
+            bStationInfoDto.setPicUrlList(Arrays.asList(bStationInfoPo.getPicUrl().split(",")));
+        }
         return bStationInfoDto;
     }
 
@@ -61,10 +67,14 @@ public class BStationInfoServiceImpl implements BStationInfoService {
                         .eq("name", dto.getName())
         );
         if (existingBus != null) {
-            throw new BusinessException("站点名称已存在");
+            throw new BusinessException("标志点名称已存在");
         }
         BStationInfoPo po = new BStationInfoPo();
         BeanUtils.copyProperties(dto,po);
+        List<String> picUrlList = dto.getPicUrlList();
+        if (picUrlList != null && picUrlList.size() > 0) {
+            po.setPicUrl(StrUtil.join(",", picUrlList));
+        }
         ExtInfo extInfo = CurrentUserHolder.get();
         po.setId(snowflakeUtil.snowflakeId());
         po.setCreateTime(new Date());
@@ -100,10 +110,14 @@ public class BStationInfoServiceImpl implements BStationInfoService {
                         .ne("id",dto.getId())
         );
         if (existingBus != null) {
-            throw new BusinessException("站点名称已存在");
+            throw new BusinessException("标志点名称已存在");
         }
         BStationInfoPo po = new BStationInfoPo();
         BeanUtils.copyProperties(dto,po);
+        List<String> picUrlList = dto.getPicUrlList();
+        if (picUrlList != null && picUrlList.size() > 0) {
+            po.setPicUrl(StrUtil.join(",", picUrlList));
+        }
         ExtInfo extInfo = CurrentUserHolder.get();
         po.setUpdateTime(new Date());
         po.setUpdaterId(extInfo.getUserId());

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

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-01 21:07:50
+* @Date: 2025-03-02 19:56:32
 **/
 @Service
 @Transactional

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

@@ -1,5 +1,6 @@
 package bus.service.impl;
 
+import bus.model.SnowflakeUtil;
 import bus.model.dto.CommonLoginDto;
 import bus.model.dto.WChatUserDto;
 import bus.model.dto.page.WChatUserPageDto;
@@ -11,6 +12,7 @@ import bus.service.CommonService;
 import bus.service.WChatUserService;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.jcraft.jsch.HASH;
 import com.orcas.common.sso.model.SsoUserAuthDto;
 import com.orcas.common.usercenter.entity.RoleEntity;
 import com.orcas.common.usercenter.entity.StaffEntity;
@@ -24,10 +26,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.BeanUtils;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Program: bus
@@ -52,99 +58,120 @@ public class WChatUserServiceImpl implements WChatUserService {
     private String organizeId;
     @Value("${orcas.creditCode}")
     private String creditCode;
+    @Value("${orcas.productId}")
+    private String productId;
     @Value("${orcas.productNo}")
     private String productNo;
+    @Resource
+    private SnowflakeUtil snowflakeUtil;
     @Override
     public SsoUserAuthDto wxLogin(HttpServletRequest request, HttpServletResponse response, WxLoginReq wxLoginReq) {
-        //http://58.221.153.58:48989/api-gateway/iso-server/usercenter/role/addRole
-//http://58.221.153.58:48989/api-gateway/iso-server/usercenter/role/assignStaffs
-        //http://58.221.153.58:48989/api-gateway/iso-server/usercenter/staff/addStaff
         //根据用户名称查询底座接口
         String mobile = wxLoginReq.getMobile();
+        String sub = "wx@" + StrUtil.sub(mobile, mobile.length() - 6, mobile.length());
         String wxName = wxLoginReq.getWxName();
         StaffEntity staffByUserName = staffClient.getStaffByUserName(mobile, organizeId);
-        if(staffByUserName == null){
+        if (staffByUserName == null) {
             //注册用户
             StaffRequest req = new StaffRequest();
             req.setPhone(mobile);
             req.setAccountName(mobile);
-            String sub = StrUtil.sub(mobile, mobile.length() - 6, mobile.length());
             req.setPassword(sub);
-            req.setStaffName(wxName);
+            req.setStaffName(mobile);
             req.setUnitOrganizeId(organizeId);
             req.setUniformCreditCode(creditCode);
             req.setIsAdmin(0);
-            StaffEntity staffEntity =  staffClient.addStaff(req);
-            List<RoleEntity> roleListByProId = (List<RoleEntity>)roleClient.getRoleListByProId(productNo);
-            //绑定角色
-            StaffBindRoleDto staffBindRoleDto = new StaffBindRoleDto();
-            staffBindRoleDto.setRoleIds(CollectionUtil.newArrayList(roleListByProId.get(0).getId()));
-            staffBindRoleDto.setProductNo(productNo);
-            staffBindRoleDto.setUnitOrganizeId(organizeId);
-            staffBindRoleDto.setStaffId(staffEntity.getId());
-            roleClient.staffBindRole(staffBindRoleDto);
+            staffByUserName = staffClient.addStaff(req);
         }
+        List<HashMap<String,Object>> roleListByProId = (List<HashMap<String,Object>>) roleClient.getRoleListByProId(productId);
+        List<String> filteredRoles = new ArrayList<>();
+        for (HashMap<String,Object> roleEntity : roleListByProId) {
+            if ("wx".equals(roleEntity.get("code"))) {
+                filteredRoles.add(roleEntity.get("id").toString());
+                break;
+            }
+        }
+        //绑定角色
+        StaffBindRoleDto staffBindRoleDto = new StaffBindRoleDto();
+        staffBindRoleDto.setRoleIds(filteredRoles);
+        staffBindRoleDto.setProductNo(productNo);
+        staffBindRoleDto.setUnitOrganizeId(organizeId);
+        staffBindRoleDto.setStaffId(staffByUserName.getId());
+        roleClient.staffBindRole(staffBindRoleDto);
         //登录
-        CommonLoginDto userLoginRequest= new CommonLoginDto();
+        CommonLoginDto userLoginRequest = new CommonLoginDto();
         userLoginRequest.setAccount(mobile);
-        userLoginRequest.setPassword(StrUtil.sub(mobile, mobile.length() - 6, mobile.length()));
-        SsoUserAuthDto ssoUserAuthDto = commonService.doLogin(request,response,userLoginRequest);
+        userLoginRequest.setPassword(sub);
+        SsoUserAuthDto ssoUserAuthDto = commonService.doLogin(request, response, userLoginRequest);
+        //保存数据库
+        WChatUserDto dto = new WChatUserDto();
+        dto.setMiniOpenId(dto.getMiniOpenId());
+        dto.setLastLoginTime(new Date());
+        dto.setWxName(wxName);
+        dto.setWxPhone(mobile);
+        save(dto);
         return ssoUserAuthDto;
     }
 
     /**
      * 详情
+     *
      * @param id
      * @return
      */
     @Override
-    public WChatUserPo getDetailById(String id){
+    public WChatUserPo getDetailById(String id) {
         return this.wChatUserMapper.selectById(id);
     }
 
-	/**
+    /**
      * 保存
+     *
      * @param dto
      * @return
      */
     @Override
-	public void save(WChatUserDto dto){
+    public void save(WChatUserDto dto) {
         WChatUserPo po = new WChatUserPo();
-        BeanUtils.copyProperties(dto,po);
+        BeanUtils.copyProperties(dto, po);
+        po.setId(snowflakeUtil.snowflakeId());
         po.setCreateTime(new Date());
         po.setUpdateTime(new Date());
-		this.wChatUserMapper.insert(po);
+        this.wChatUserMapper.insert(po);
     }
 
     /**
-    * 列表
-    * @param dto
-    * @return
-    */
+     * 列表
+     *
+     * @param dto
+     * @return
+     */
     @Override
-    public List<WChatUserDto> list(WChatUserPageDto dto){
+    public List<WChatUserDto> list(WChatUserPageDto dto) {
         return this.wChatUserMapper.list(dto);
     }
 
-	/**
+    /**
      * 修改
+     *
      * @param dto
      * @return
      */
     @Override
-    public void update(WChatUserDto dto){
+    public void update(WChatUserDto dto) {
         WChatUserPo po = new WChatUserPo();
-        BeanUtils.copyProperties(dto,po);
-		wChatUserMapper.updateById(po);
+        BeanUtils.copyProperties(dto, po);
+        wChatUserMapper.updateById(po);
     }
 
     /**
      * 删除
+     *
      * @param id
      * @return
      */
     @Override
-    public void delete(String id){
-		wChatUserMapper.deleteById(id);
+    public void delete(String id) {
+        wChatUserMapper.deleteById(id);
     }
 }

bus-biz/src/main/resources/mapper/BBusInfoMapper.xml

@@ -7,6 +7,7 @@
    id,
    bus_name,
    bus_no,
+   status,
    bus_url,
    driver_name,
    driver_phone
@@ -26,6 +27,9 @@
       <if test="driverPhone != null and driverPhone != ''">
         and driver_phone like concat('%',#{driverPhone},'%')
       </if>
+       <if test="status != null and status != ''">
+           and status = #{status}
+       </if>
    </where>
      order by create_time desc
  </select>

bus-biz/src/main/resources/mapper/BCourseBusMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="bus.mapper.BCourseBusMapper">
+
+ <select id="list" parameterType="bus.model.dto.page.BCourseBusPageDto" resultType="bus.model.vo.BCourseBusVo">
+   select
+   id,
+   course_id,
+   bus_id,
+   sort,
+   remark,
+   create_time,
+   update_time,
+   creator_id,
+   updater_id,
+   creator_name,
+   updater_name,
+   is_delete
+   from
+   b_course_bus
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BCourseInfoMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="bus.mapper.BCourseInfoMapper">
+
+ <select id="list" parameterType="bus.model.dto.page.BCourseInfoPageDto" resultType="bus.model.vo.BCourseInfoVo">
+     SELECT
+     a.id,
+     a.course_name,
+     a.course_code,
+     a.course_type,
+     COUNT(b.station_id) AS stationNum,
+     COUNT(c.bus_id) AS busNum,
+     (select si.`name` from b_course_station cs LEFT JOIN b_station_info si on cs.station_id = si.id where cs.is_delete = 0  order by cs.sort asc LIMIT 1) as firstStationName,
+     (select si.`name` from b_course_station cs LEFT JOIN b_station_info si on cs.station_id = si.id where cs.is_delete = 0  order by cs.sort DESC LIMIT 1) as lastStationName,
+     d.bus_space as busSpace,
+     a.status
+     from b_course_info a
+     LEFT JOIN
+     b_course_station b ON a.id = b.course_id AND b.is_delete = 0
+     LEFT JOIN
+     b_course_bus c ON a.id = c.course_id AND c.is_delete = 0
+     LEFT JOIN
+     b_course_time d ON a.id = c.course_id AND c.is_delete = 0 ORDER BY c.sort LIMIT 1
+   <where>
+        a.is_delete = 0
+       <if test="courseName != null and courseName != ''">
+           a.course_name like concat('%', #{courseName}, '%')
+       </if>
+       <if test="courseCode != null and courseCode != ''">
+           a.course_code like concat('%', #{courseCode}, '%')
+       </if>
+       <if test="courseType != null and courseType != ''">
+           a.course_type = #{courseType}
+       </if>
+       <if test="status != null and status != ''">
+           a.status = #{status}
+       </if>
+       <if test="id != null and id != ''">
+           a.id = #{id}
+       </if>
+   </where>
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BCourseStationMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="bus.mapper.BCourseStationMapper">
+
+ <select id="list" parameterType="bus.model.dto.page.BCourseStationPageDto" resultType="bus.model.vo.BCourseStationVo">
+   select
+   id,
+   course_id,
+   station_id,
+   sort,
+   type,
+   remark,
+   create_time,
+   update_time,
+   creator_id,
+   updater_id,
+   creator_name,
+   updater_name,
+   is_delete
+   from
+   b_course_station
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BCourseTimeMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="bus.mapper.BCourseTimeMapper">
+
+ <select id="list" parameterType="bus.model.dto.page.BCourseTimePageDto" resultType="bus.model.vo.BCourseTimeVo">
+   select
+   id,
+   course_id,
+   station_id,
+   sort,
+   type,
+   remark,
+   create_time,
+   update_time,
+   creator_id,
+   updater_id,
+   creator_name,
+   updater_name,
+   is_delete
+   from
+   b_course_time
+ </select>
+
+</mapper>

bus-biz/src/main/resources/mapper/BStationInfoMapper.xml

@@ -6,12 +6,14 @@
    select
    id,
    name,
-   station_level,
+   station_type,
    station_status,
    station_code,
    longitude,
    latitude,
    detail_address,
+   pic_url,
+   introduce,
    province,
    city,
    area

bus-boot/src/main/resources/bootstrap-dev.yaml

@@ -28,6 +28,7 @@ orcas:
   productName: 公交管理
   microNo: gjgl
   organizeId: 054b7e80-1f3b-457b-bffc-70b3b6e939cf
+  productId: e8193399-8da5-44e2-8976-d9c59e99a3d2
   creditCode: mrzz
   redis:
     host: 58.221.153.58
@@ -37,7 +38,7 @@ orcas:
     expire:
       minute: 30
   sso:
-    server: http://58.221.153.58:48989/api-gateway
+    server: http://58.221.153.58:48989/api-gateway/iso-server
     logout:
       path: /logout
     excluded:

bus-boot/src/test/java/bus/CodeGenerateTest.java

@@ -37,8 +37,8 @@ public class CodeGenerateTest {
 		//设置生成的表
 		List<TableInfo> tables = new ArrayList<>();
 		TableInfo tableInfo = new TableInfo();
-		tableInfo.setTableName("b_station_info");
-		tableInfo.setTableAlias("BStationInfo");
+		tableInfo.setTableName("b_course_bus");
+		tableInfo.setTableAlias("BCourseBus");
 		tables.add(tableInfo);
 		generateConfig.setTableInfos(tables);
 		//生成代码

bus-common/src/main/java/bus/model/BaseEntity.java

@@ -5,7 +5,7 @@ import lombok.Data;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-01 21:07:53
+* @Date: 2025-03-02 19:56:33
 **/
 @Data
 public class BaseEntity {

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

@@ -18,7 +18,7 @@ public class BBusInfoDto{
     @ApiModelProperty("id")
     private String id;
     @ApiModelProperty("车辆名称")
-    @NotBlank(message = "车辆名称不能为空")
+    //@NotBlank(message = "车辆名称不能为空")
     private String busName;
     @ApiModelProperty("车牌号")
     @NotBlank(message = "车牌号不能为空")
@@ -33,4 +33,8 @@ public class BBusInfoDto{
     @ApiModelProperty("驾驶员号码")
     @NotBlank(message = "驾驶员号码不能为空")
     private String driverPhone;
+    @ApiModelProperty("车辆状态 0禁用 1维护 2正常")
+    private String status;
+
+
 }

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

@@ -0,0 +1,41 @@
+package bus.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 09:44:24
+**/
+@Data
+public class BBusTrackInfoDto {
+    @ApiModelProperty("车辆id")
+    private String busId;
+    @ApiModelProperty("车牌号")
+    private String busNo;
+    @ApiModelProperty("线路名称")
+    private String courseName;
+    @ApiModelProperty("出发站点名称")
+    private String firstStationName;
+    @ApiModelProperty("最后站点名称")
+    private String lastStationName;
+    @ApiModelProperty("驾驶员姓名")
+    private String driverName;
+    @ApiModelProperty("驾驶员号码")
+    private String driverPhone;
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
+    @ApiModelProperty("详细地址")
+    private String detailAddress;
+
+    @ApiModelProperty("路线LIST")
+    List<BCourseNameInfoDto> bCourseNameInfoList;
+}

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

@@ -0,0 +1,21 @@
+package bus.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-01 09:44:24
+**/
+@Data
+public class BBusTrackTreeDto {
+    @ApiModelProperty("车辆状态 0禁用 1维护 2正常")
+    private String status;
+
+    List<BBusInfoDto> list;
+}

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

@@ -0,0 +1,24 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:56:33
+**/
+@Data
+public class BCourseBusDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("车辆id")
+    private String busId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,44 @@
+package bus.model.dto;
+
+import bus.model.po.BBusInfoPo;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+import java.util.List;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:53:50
+**/
+@Data
+public class BCourseInfoDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("线路名称")
+    private String courseName;
+    @ApiModelProperty("线路编号")
+    private String courseCode;
+    @ApiModelProperty("地图快照")
+    private String mapPicUrl;
+    @ApiModelProperty("线路类型 0单层专线，1闭环专线")
+    private String courseType;
+    @ApiModelProperty("票价类型 0固定票价 1参考票价")
+    private String ticketType;
+    @ApiModelProperty("票价")
+    private BigDecimal ticketAmount;
+    @ApiModelProperty("路线状态 0正常 1维护 2禁用")
+    private String status;
+
+    @ApiModelProperty("时刻LIST")
+    List<BCourseTimeDto> bCourseTimeList;
+
+    @ApiModelProperty("标志点LIST")
+    List<BCourseStationDto> bCourseStationList;
+
+    @ApiModelProperty("车辆LIST")
+    List<BCourseBusDto> bCourseBusList;
+}

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

@@ -0,0 +1,23 @@
+package bus.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:53:50
+**/
+@Data
+public class BCourseNameInfoDto {
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("线路名称")
+    private String courseName;
+    @ApiModelProperty("线路编号")
+    private String courseCode;
+}

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

@@ -0,0 +1,25 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:55:00
+**/
+@Data
+public class BCourseStationDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("标志点id")
+    private String stationId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("类型 0始发 1中途 2终点")
+    private String type;
+    @ApiModelProperty("备注")
+    private String remark;
+}

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

@@ -0,0 +1,25 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:55:47
+**/
+@Data
+public class BCourseTimeDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("发车时刻")
+    private String busSpace;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("类型 0始发 1中途 2终点")
+    private String type;
+    @ApiModelProperty("备注")
+    private String remark;
+}

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

@@ -6,6 +6,8 @@ import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
+
 /**
 * @Program: bus
 * @Description: 描述
@@ -14,16 +16,20 @@ import java.util.Date;
 **/
 @Data
 public class BStationInfoDto{
-    @ApiModelProperty("站台id")
+    @ApiModelProperty("id")
     private String id;
-    @ApiModelProperty("站台名称")
+    @ApiModelProperty("标志点名称")
     private String name;
-    @ApiModelProperty("站台层级 0主站点 1子站点")
-    private String stationLevel;
+    @ApiModelProperty("标志点类型")
+    private String stationType;
     @ApiModelProperty("状态 0正常 1维护 2禁用")
     private String stationStatus;
-    @ApiModelProperty("站点编号")
+    @ApiModelProperty("标志点编号")
     private String stationCode;
+    @ApiModelProperty("介绍")
+    private String introduce;
+    @ApiModelProperty("图片地址")
+    private List<String> picUrlList;
     @ApiModelProperty("经度")
     private BigDecimal longitude;
     @ApiModelProperty("纬度")

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

@@ -16,13 +16,13 @@ import java.util.Date;
 @Data
 public class BStationInfoPageDto extends BaseEntity{
 
-    @ApiModelProperty("站台名称")
+    @ApiModelProperty("标志点名称")
     private String name;
-    @ApiModelProperty("站台层级 0主站点 1子站点")
-    private String stationLevel;
+    @ApiModelProperty("标志点类型")
+    private String stationType;
     @ApiModelProperty("状态 0正常 1维护 2禁用")
     private String stationStatus;
-    @ApiModelProperty("站点编号")
+    @ApiModelProperty("标志点编号")
     private String stationCode;
     @ApiModelProperty("区")
     private String area;

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

@@ -8,7 +8,7 @@ import lombok.Data;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-01 21:07:53
+* @Date: 2025-03-02 19:56:33
 **/
 @ApiModel(description = "账户登陆请求实体")
 @Data

bus-common/src/main/java/bus/model/dto/page/BBusInfoPageDto.java

@@ -24,5 +24,7 @@ public class BBusInfoPageDto extends BaseEntity{
     private String driverName;
     @ApiModelProperty("驾驶员号码")
     private String driverPhone;
+    @ApiModelProperty("车辆状态 0禁用 1维护 2正常")
+    private String status;
 
 }

bus-common/src/main/java/bus/model/dto/page/BCourseBusPageDto.java

@@ -0,0 +1,40 @@
+package bus.model.dto.page;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:56:33
+**/
+@Data
+public class BCourseBusPageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("车辆id")
+    private String busId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/dto/page/BCourseInfoPageDto.java

@@ -0,0 +1,27 @@
+package bus.model.dto.page;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:53:50
+**/
+@Data
+public class BCourseInfoPageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("线路名称")
+    private String courseName;
+    @ApiModelProperty("线路编号")
+    private String courseCode;
+    @ApiModelProperty("线路类型 0单层专线，1闭环专线")
+    private String courseType;
+    @ApiModelProperty("路线状态 0正常 1维护 2禁用")
+    private String status;
+}

bus-common/src/main/java/bus/model/dto/page/BCourseStationPageDto.java

@@ -0,0 +1,42 @@
+package bus.model.dto.page;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:55:00
+**/
+@Data
+public class BCourseStationPageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("标志点id")
+    private String stationId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("类型 0始发 1中途 2终点")
+    private String type;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/dto/page/BCourseTimePageDto.java

@@ -0,0 +1,42 @@
+package bus.model.dto.page;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:55:47
+**/
+@Data
+public class BCourseTimePageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("发车时刻")
+    private String stationId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("类型 0始发 1中途 2终点")
+    private String type;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/po/BBusInfoPo.java

@@ -1,5 +1,7 @@
 package bus.model.po;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -21,6 +23,8 @@ public class BBusInfoPo{
     private String busNo;
     private String busUrl;
     private String busType;
+    @ApiModelProperty("车辆状态 0禁用 1维护 2正常")
+    private String status;
     private String driverName;
     private String driverPhone;
     private Date createTime;
@@ -29,5 +33,6 @@ public class BBusInfoPo{
     private String updaterId;
     private String creatorName;
     private String updaterName;
+    @TableLogic
     private Integer isDelete;
 }

bus-common/src/main/java/bus/model/po/BCourseBusPo.java

@@ -0,0 +1,33 @@
+package bus.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-02 19:56:33
+**/
+@Data
+@TableName("b_course_bus")
+public class BCourseBusPo{
+    @TableId
+    private String id;
+    private String courseId;
+    private String busId;
+    private Integer sort;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    @TableLogic
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/po/BCourseInfoPo.java

@@ -0,0 +1,39 @@
+package bus.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-02 19:53:50
+**/
+@Data
+@TableName("b_course_info")
+public class BCourseInfoPo{
+    @TableId
+    private String id;
+    private String courseName;
+    private String courseCode;
+    private String courseType;
+    @ApiModelProperty("地图快照")
+    private String mapPicUrl;
+    private String ticketType;
+    private BigDecimal ticketAmount;
+    private String status;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    @TableLogic
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/po/BCourseStationPo.java

@@ -0,0 +1,34 @@
+package bus.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-02 19:55:00
+**/
+@Data
+@TableName("b_course_station")
+public class BCourseStationPo{
+    @TableId
+    private String id;
+    private String courseId;
+    private String stationId;
+    private Integer sort;
+    private String type;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    @TableLogic
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/po/BCourseTimePo.java

@@ -0,0 +1,34 @@
+package bus.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-02 19:55:47
+**/
+@Data
+@TableName("b_course_time")
+public class BCourseTimePo{
+    @TableId
+    private String id;
+    private String courseId;
+    private String busSpace;
+    private Integer sort;
+    private String type;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    @TableLogic
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/po/BStationInfoPo.java

@@ -1,5 +1,6 @@
 package bus.model.po;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -20,9 +21,11 @@ public class BStationInfoPo{
     @TableId
     private String id;
     private String name;
-    private String stationLevel;
+    private String stationType;
     private String stationStatus;
     private String stationCode;
+    private String introduce;
+    private String picUrl;
     private BigDecimal longitude;
     private BigDecimal latitude;
     private String detailAddress;
@@ -35,5 +38,6 @@ public class BStationInfoPo{
     private String updaterId;
     private String creatorName;
     private String updaterName;
+    @TableLogic
     private Integer isDelete;
 }

bus-common/src/main/java/bus/model/vo/BCourseBusVo.java

@@ -0,0 +1,41 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:56:33
+**/
+@Data
+public class BCourseBusVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("车辆id")
+    private String busId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/vo/BCourseInfoVo.java

@@ -0,0 +1,39 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:53:50
+**/
+@Data
+public class BCourseInfoVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("线路名称")
+    private String courseName;
+    @ApiModelProperty("线路编号")
+    private String courseCode;
+    @ApiModelProperty("线路类型 0单层专线，1闭环专线")
+    private String courseType;
+    @ApiModelProperty("路线状态 0正常 1维护 2禁用")
+    private String status;
+    @ApiModelProperty("标志点数量")
+    private String stationNum;
+    @ApiModelProperty("车辆数量")
+    private String  busNum;
+    @ApiModelProperty("始发标志点")
+    private String firstStationName;
+    @ApiModelProperty("终点标志点")
+    private String lastStationName;
+    @ApiModelProperty("始发时间")
+    private String busSpace;
+
+}

bus-common/src/main/java/bus/model/vo/BCourseStationVo.java

@@ -0,0 +1,43 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:55:00
+**/
+@Data
+public class BCourseStationVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("标志点id")
+    private String stationId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("类型 0始发 1中途 2终点")
+    private String type;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-common/src/main/java/bus/model/vo/BCourseTimeVo.java

@@ -0,0 +1,43 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+import java.util.Date;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-02 19:55:47
+**/
+@Data
+public class BCourseTimeVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("发车时刻")
+    private String stationId;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("类型 0始发 1中途 2终点")
+    private String type;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("记录创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录更新时间")
+    private Date updateTime;
+    @ApiModelProperty("创建人id")
+    private String creatorId;
+    @ApiModelProperty("修改人id")
+    private String updaterId;
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+    @ApiModelProperty("修改人姓名")
+    private String updaterName;
+    @ApiModelProperty("是否删除")
+    private Integer isDelete;
+}

bus-web/src/main/java/bus/controller/biz/BBusInfoController.java

@@ -1,5 +1,7 @@
 package bus.controller.biz;
 
+import bus.model.dto.BBusTrackInfoDto;
+import bus.model.dto.BBusTrackTreeDto;
 import bus.model.dto.page.BBusInfoPageDto;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageSerializable;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 
 /**
@@ -93,4 +96,5 @@ public class BBusInfoController implements BaseController {
         return "删除成功";
     }
 
+
 }

bus-web/src/main/java/bus/controller/biz/BBusTrackController.java

@@ -0,0 +1,61 @@
+package bus.controller.biz;
+
+import bus.model.dto.BBusInfoDto;
+import bus.model.dto.BBusTrackInfoDto;
+import bus.model.dto.BBusTrackTreeDto;
+import bus.model.dto.page.BBusInfoPageDto;
+import bus.service.BBusInfoService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-01 10:04:08
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "车辆追踪接口")
+@RequestMapping(value="/bBusTrackInfo")
+public class BBusTrackController implements BaseController {
+
+    @Autowired
+    private BBusInfoService bBusInfoService;
+
+
+    /**
+     * 获取车辆状态树型数据
+     * @return
+     */
+    @ApiOperation("获取车辆状态树型数据")
+    @GetMapping(value = "getTreeList")
+    public List<BBusTrackTreeDto> getTreeList(){
+        List<BBusTrackTreeDto> treeList = bBusInfoService.getTreeList();
+        return treeList;
+    }
+
+
+    /**
+     * 根据车辆ID获取车辆追踪信息
+     * @return
+     */
+    @ApiOperation("根据车辆ID获取车辆追踪信息")
+    @GetMapping(value = "getTrackInfo")
+    public BBusTrackInfoDto getTrackInfo(@RequestParam String busId){
+        BBusTrackInfoDto trackInfo = bBusInfoService.getTrackInfo(busId);
+        return trackInfo;
+    }
+
+}

bus-web/src/main/java/bus/controller/biz/BCourseBusController.java

@@ -0,0 +1,95 @@
+//package bus.controller.biz;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageSerializable;
+//import bus.model.dto.BCourseBusDto;
+//import bus.model.dto.page.BCourseBusPageDto;
+//import bus.model.vo.BCourseBusVo;
+//import bus.service.BCourseBusService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+//
+//
+//
+///**
+// * @Program: bus
+// * @Description: 描述
+// * @Author: zy
+// * @Date: 2025-03-02 19:56:31
+// **/
+//@Slf4j
+//@CrossOrigin
+//@RestController
+//@Api(tags = "bCourseBus接口")
+//@RequestMapping(value="/bCourseBus")
+//public class BCourseBusController implements BaseController {
+//
+//    @Autowired
+//    private BCourseBusService bCourseBusService;
+//
+//
+//
+//    /**
+//     * 详情
+//     * @param id
+//     * @return
+//     */
+//    @ApiOperation("详情")
+//    @GetMapping(value = "getDetailById")
+//    public BCourseBusVo getDetailById(@RequestParam String id){
+//        return doSingle(bCourseBusService.getDetailById(id),BCourseBusVo::new);
+//    }
+//
+//	/**
+//     * 保存
+//     * @param dto
+//     * @return
+//     */
+//    @ApiOperation("保存")
+//    @PostMapping(value = "save")
+//    public String save(@RequestBody BCourseBusDto dto){
+//		bCourseBusService.save(dto);
+//        return "保存成功";
+//    }
+//
+//    /**
+//    * 列表
+//    * @param dto
+//    * @return
+//    */
+//    @ApiOperation("列表")
+//    @PostMapping(value = "list")
+//    public PageSerializable<BCourseBusVo> list(@RequestBody BCourseBusPageDto dto){
+//       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+//       return new PageSerializable<>(bCourseBusService.list(dto));
+//    }
+//
+//	/**
+//     * 修改
+//     * @param dto
+//     * @return
+//     */
+//    @ApiOperation("修改")
+//    @PostMapping(value = "update")
+//    public String update(@RequestBody BCourseBusDto dto){
+//		bCourseBusService.update(dto);
+//        return "修改成功";
+//    }
+//
+//	/**
+//     * 删除
+//     * @param id
+//     * @return
+//     */
+//    @ApiOperation("删除")
+//    @GetMapping(value = "deleteById")
+//    public String deleteById(@RequestParam String id){
+//		bCourseBusService.delete(id);
+//        return "删除成功";
+//    }
+//
+//}

bus-web/src/main/java/bus/controller/biz/BCourseInfoController.java

@@ -0,0 +1,95 @@
+package bus.controller.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.BCourseInfoDto;
+import bus.model.dto.page.BCourseInfoPageDto;
+import bus.model.vo.BCourseInfoVo;
+import bus.service.BCourseInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+
+
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-02 19:53:47
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "路线接口")
+@RequestMapping(value="/bCourseInfo")
+public class BCourseInfoController implements BaseController {
+
+    @Autowired
+    private BCourseInfoService bCourseInfoService;
+
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("详情")
+    @GetMapping(value = "getDetailById")
+    public BCourseInfoDto getDetailById(@RequestParam String id){
+        return bCourseInfoService.getDetailById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @ApiOperation("保存")
+    @PostMapping(value = "save")
+    public String save(@RequestBody BCourseInfoDto dto){
+		bCourseInfoService.save(dto);
+        return "保存成功";
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @ApiOperation("列表")
+    @PostMapping(value = "list")
+    public PageSerializable<BCourseInfoVo> list(@RequestBody BCourseInfoPageDto dto){
+       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+       return new PageSerializable<>(bCourseInfoService.list(dto));
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @ApiOperation("修改")
+    @PostMapping(value = "update")
+    public String update(@RequestBody BCourseInfoDto dto){
+		bCourseInfoService.update(dto);
+        return "修改成功";
+    }
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation("删除路线")
+    @GetMapping(value = "deleteById")
+    public String deleteById(@RequestParam String id){
+		bCourseInfoService.delete(id);
+        return "删除成功";
+    }
+
+}

bus-web/src/main/java/bus/controller/biz/BCourseStationController.java

@@ -0,0 +1,95 @@
+//package bus.controller.biz;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageSerializable;
+//import bus.model.dto.BCourseStationDto;
+//import bus.model.dto.page.BCourseStationPageDto;
+//import bus.model.vo.BCourseStationVo;
+//import bus.service.BCourseStationService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+//
+//
+//
+///**
+// * @Program: bus
+// * @Description: 描述
+// * @Author: zy
+// * @Date: 2025-03-02 19:54:58
+// **/
+//@Slf4j
+//@CrossOrigin
+//@RestController
+//@Api(tags = "bCourseStation接口")
+//@RequestMapping(value="/bCourseStation")
+//public class BCourseStationController implements BaseController {
+//
+//    @Autowired
+//    private BCourseStationService bCourseStationService;
+//
+//
+//
+//    /**
+//     * 详情
+//     * @param id
+//     * @return
+//     */
+//    @ApiOperation("详情")
+//    @GetMapping(value = "getDetailById")
+//    public BCourseStationVo getDetailById(@RequestParam String id){
+//        return doSingle(bCourseStationService.getDetailById(id),BCourseStationVo::new);
+//    }
+//
+//	/**
+//     * 保存
+//     * @param dto
+//     * @return
+//     */
+//    @ApiOperation("保存")
+//    @PostMapping(value = "save")
+//    public String save(@RequestBody BCourseStationDto dto){
+//		bCourseStationService.save(dto);
+//        return "保存成功";
+//    }
+//
+//    /**
+//    * 列表
+//    * @param dto
+//    * @return
+//    */
+//    @ApiOperation("列表")
+//    @PostMapping(value = "list")
+//    public PageSerializable<BCourseStationVo> list(@RequestBody BCourseStationPageDto dto){
+//       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+//       return new PageSerializable<>(bCourseStationService.list(dto));
+//    }
+//
+//	/**
+//     * 修改
+//     * @param dto
+//     * @return
+//     */
+//    @ApiOperation("修改")
+//    @PostMapping(value = "update")
+//    public String update(@RequestBody BCourseStationDto dto){
+//		bCourseStationService.update(dto);
+//        return "修改成功";
+//    }
+//
+//	/**
+//     * 删除
+//     * @param id
+//     * @return
+//     */
+//    @ApiOperation("删除")
+//    @GetMapping(value = "deleteById")
+//    public String deleteById(@RequestParam String id){
+//		bCourseStationService.delete(id);
+//        return "删除成功";
+//    }
+//
+//}

bus-web/src/main/java/bus/controller/biz/BCourseTimeController.java

@@ -0,0 +1,95 @@
+//package bus.controller.biz;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageSerializable;
+//import bus.model.dto.BCourseTimeDto;
+//import bus.model.dto.page.BCourseTimePageDto;
+//import bus.model.vo.BCourseTimeVo;
+//import bus.service.BCourseTimeService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
+//
+//
+//
+///**
+// * @Program: bus
+// * @Description: 描述
+// * @Author: zy
+// * @Date: 2025-03-02 19:55:45
+// **/
+//@Slf4j
+//@CrossOrigin
+//@RestController
+//@Api(tags = "bCourseTime接口")
+//@RequestMapping(value="/bCourseTime")
+//public class BCourseTimeController implements BaseController {
+//
+//    @Autowired
+//    private BCourseTimeService bCourseTimeService;
+//
+//
+//
+//    /**
+//     * 详情
+//     * @param id
+//     * @return
+//     */
+//    @ApiOperation("详情")
+//    @GetMapping(value = "getDetailById")
+//    public BCourseTimeVo getDetailById(@RequestParam String id){
+//        return doSingle(bCourseTimeService.getDetailById(id),BCourseTimeVo::new);
+//    }
+//
+//	/**
+//     * 保存
+//     * @param dto
+//     * @return
+//     */
+//    @ApiOperation("保存")
+//    @PostMapping(value = "save")
+//    public String save(@RequestBody BCourseTimeDto dto){
+//		bCourseTimeService.save(dto);
+//        return "保存成功";
+//    }
+//
+//    /**
+//    * 列表
+//    * @param dto
+//    * @return
+//    */
+//    @ApiOperation("列表")
+//    @PostMapping(value = "list")
+//    public PageSerializable<BCourseTimeVo> list(@RequestBody BCourseTimePageDto dto){
+//       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+//       return new PageSerializable<>(bCourseTimeService.list(dto));
+//    }
+//
+//	/**
+//     * 修改
+//     * @param dto
+//     * @return
+//     */
+//    @ApiOperation("修改")
+//    @PostMapping(value = "update")
+//    public String update(@RequestBody BCourseTimeDto dto){
+//		bCourseTimeService.update(dto);
+//        return "修改成功";
+//    }
+//
+//	/**
+//     * 删除
+//     * @param id
+//     * @return
+//     */
+//    @ApiOperation("删除")
+//    @GetMapping(value = "deleteById")
+//    public String deleteById(@RequestParam String id){
+//		bCourseTimeService.delete(id);
+//        return "删除成功";
+//    }
+//
+//}

bus-web/src/main/java/bus/controller/biz/BStationInfoController.java

@@ -24,7 +24,7 @@ import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
 @Slf4j
 @CrossOrigin
 @RestController
-@Api(tags = "站点管理接口")
+@Api(tags = "标志点管理接口")
 @RequestMapping(value="/bStationInfo")
 public class BStationInfoController implements BaseController {
 

bus-web/src/main/java/bus/controller/biz/CommonController.java

@@ -33,7 +33,7 @@ import java.util.Map;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-01 21:07:49
+* @Date: 2025-03-02 19:56:31
 **/
 @RestController
 @RequestMapping("/common")

bus-web/src/main/java/bus/controller/biz/WChatUserController.java

@@ -75,11 +75,11 @@ public class WChatUserController implements BaseController {
      * @param id
      * @return
      */
-    @ApiOperation("删除")
-    @GetMapping(value = "deleteById")
-    public String deleteById(@RequestParam String id){
-		wChatUserService.delete(id);
-        return "删除成功";
-    }
+//    @ApiOperation("删除")
+//    @GetMapping(value = "deleteById")
+//    public String deleteById(@RequestParam String id){
+//		wChatUserService.delete(id);
+//        return "删除成功";
+//    }
 
 }