no message

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

@@ -1,6 +1,8 @@
 package bus.mapper;
 
 import bus.model.dto.BCoursePrePageDto;
+import bus.model.dto.req.BCourseUserPrePageDto;
+import bus.model.dto.req.BCourseUserPreReqDto;
 import bus.model.vo.BCoursePreVo;
 import bus.model.po.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,4 +19,6 @@ import java.util.List;
 public interface BCoursePreMapper extends BaseMapper<BCoursePrePo> {
 
     List<BCoursePreVo> list(BCoursePrePageDto dto);
+
+    List<BCourseUserPrePageDto> getPreUserNum(BCourseUserPreReqDto reqDto);
 }

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

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.BPreBusPageDto;
+import bus.model.vo.BPreBusVo;
+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-20 08:41:56
+ **/
+@Mapper
+public interface BPreBusMapper extends BaseMapper<BPreBusPo> {
+
+    List<BPreBusVo> list(BPreBusPageDto dto);
+}

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

@@ -1,10 +1,10 @@
 package bus.mapper;
 
 import bus.model.dto.BUserPreCountVo;
-import bus.model.dto.BUserPrePageDto;
 import bus.model.dto.BUserPreStatDto;
 import bus.model.vo.BUserPreVo;
 import bus.model.po.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import java.util.List;
@@ -18,7 +18,6 @@ import java.util.List;
 @Mapper
 public interface BUserPreMapper extends BaseMapper<BUserPrePo> {
 
-    List<BUserPreVo> list(BUserPrePageDto dto);
 
     List<BUserPreCountVo> countByDateAndType(BUserPreStatDto dto);
 }

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

@@ -1,7 +1,10 @@
 package bus.service;
 
 import bus.model.dto.*;
+import bus.model.dto.req.BCourseUserPrePageDto;
+import bus.model.dto.req.BCourseUserPreReqDto;
 import bus.model.dto.req.BUserPreDetailDto;
+import bus.model.dto.req.PreBusStatusDto;
 import bus.model.vo.BCoursePreVo;
 import bus.model.po.BCoursePrePo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -21,7 +24,7 @@ public interface BCoursePreService extends IService<BCoursePrePo> {
      * 预约时刻详情
      * @return
      */
-    BCoursePreTypeDto getDetailPre(String type);
+    BCoursePreTypeDto getDetailPre(String type,String courseId);
 
 
     /**
@@ -43,6 +46,9 @@ public interface BCoursePreService extends IService<BCoursePrePo> {
     void cancelPre(String preId,String Type);
 
 
+    List<BCourseUserPrePageDto> getPreUserNum(BCourseUserPreReqDto reqDto);
+
+   void selectBusFc(PreBusStatusDto preBusStatusDto);
     /**
      * 详情
      * @param id

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

@@ -0,0 +1,52 @@
+package bus.service;
+
+import bus.model.dto.BPreBusDto;
+import bus.model.dto.BPreBusPageDto;
+import bus.model.vo.BPreBusVo;
+import bus.model.po.BPreBusPo;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-20 08:41:56
+ **/
+public interface BPreBusService {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    BPreBusPo getDetailById(String id);
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    void save(BPreBusDto dto);
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    List<BPreBusVo> list(BPreBusPageDto dto);
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    void update(BPreBusDto dto);
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    void delete(String id);
+}

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

@@ -22,31 +22,5 @@ public interface BUserPreService {
      */
     BUserPrePo getDetailById(String id);
 
-	/**
-     * 保存
-     * @param dto
-     * @return
-     */
-    void save(BUserPreDto dto);
-
-    /**
-    * 列表
-    * @param dto
-    * @return
-    */
-    List<BUserPreVo> list(BUserPrePageDto dto);
-
-	/**
-     * 修改
-     * @param dto
-     * @return
-     */
-    void update(BUserPreDto dto);
 
-	/**
-     * 删除
-     * @param id
-     * @return
-     */
-    void delete(String id);
 }

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-17 23:24:43
+* @Date: 2025-03-20 08:41:56
 **/
 public interface CommonService {
 

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

@@ -1,19 +1,26 @@
 package bus.service.impl;
 
+import bus.mapper.BPreBusMapper;
 import bus.mapper.BUserPreMapper;
 import bus.mapper.WChatUserMapper;
 import bus.model.SnowflakeUtil;
 import bus.model.dto.*;
+import bus.model.dto.req.BCourseUserPrePageDto;
+import bus.model.dto.req.BCourseUserPreReqDto;
 import bus.model.dto.req.BUserPreDetailDto;
+import bus.model.dto.req.PreBusStatusDto;
+import bus.model.po.BPreBusPo;
 import bus.model.po.BUserPrePo;
 import bus.model.po.WChatUserPo;
 import bus.model.vo.BCoursePreVo;
 import bus.model.po.BCoursePrePo;
 import bus.mapper.BCoursePreMapper;
 
+import bus.model.vo.BUserPreVo;
 import bus.service.BCoursePreService;
 import bus.service.BUserPreService;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -43,15 +50,18 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
     @Autowired
     private BUserPreMapper bUserPreMapper;
     @Autowired
+    private BPreBusMapper bPreBusMapper;
+    @Autowired
     private WChatUserMapper wChatUserMapper;
     @Resource
     private SnowflakeUtil snowflakeUtil;
 
     @Override
-    public BCoursePreTypeDto getDetailPre(String type) {
+    public BCoursePreTypeDto getDetailPre(String type,String courseId) {
         ExtInfo extInfo = CurrentUserHolder.get();
         String userId = extInfo.getUserId();
         QueryWrapper<BCoursePrePo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("course_id", courseId);
         List<BCoursePrePo> list = this.bCoursePreMapper.selectList(queryWrapper);
         Map<String,List<BCoursePrePo>> map = list.stream().collect(Collectors.groupingBy(BCoursePrePo::getType, Collectors.toList()));
         BCoursePreTypeDto typeDto = new BCoursePreTypeDto();
@@ -71,6 +81,7 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
         statDto.setStartDate(DateUtil.parse(today, "yyyy-MM-dd"));
         statDto.setEndDate(DateUtil.parse(sunday, "yyyy-MM-dd"));
         statDto.setType(type);
+        statDto.setType(courseId);
         // 查询各时间段预约数量
         List<BUserPreCountVo> bUserPreCountVos = bUserPreMapper.countByDateAndType(statDto);
         Map<String,BUserPreCountVo> s = bUserPreCountVos.stream().collect(Collectors.toMap(BUserPreCountVo::getPreId, a->a));
@@ -156,6 +167,7 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
         BUserPrePo po = new BUserPrePo();
         po.setCourseId(bCoursePrePo.getCourseId());
         po.setPreId(dto.getPreId());
+        po.setPreTime(bCoursePrePo.getPreTime());
         po.setPreDate(DateUtil.parse(today, "yyyy-MM-dd"));
         po.setType(dto.getType());
         po.setUserId(extInfo.getUserId());
@@ -167,6 +179,29 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
         po.setCreatorName(extInfo.getUserName());
         po.setUpdaterName(extInfo.getUserName());
         bUserPreMapper.insert(po);
+        //首次保存预约状态表
+        QueryWrapper<BPreBusPo> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("pre_id",dto.getPreId());
+        queryWrapper1.eq("pre_time",po.getPreTime());
+        queryWrapper1.eq("pre_date",today);
+        List<BPreBusPo> list = bPreBusMapper.selectList(queryWrapper1);
+        if(CollectionUtil.isEmpty(list)) {
+            BPreBusPo bPreBusPo = new BPreBusPo();
+            bPreBusPo.setPreDate(po.getPreDate());
+            bPreBusPo.setPreId(dto.getPreId());
+            bPreBusPo.setPreTime(po.getPreTime());
+            bPreBusPo.setId(snowflakeUtil.snowflakeId());
+            bPreBusPo.setPreStatus("0");
+            bPreBusPo.setCreateTime(new Date());
+            bPreBusPo.setUpdateTime(new Date());
+            bPreBusPo.setCreatorId(extInfo.getUserId());
+            bPreBusPo.setUpdaterId(extInfo.getUserId());
+            bPreBusPo.setCreatorName(extInfo.getUserName());
+            bPreBusPo.setUpdaterName(extInfo.getUserName());
+            bPreBusMapper.insert(bPreBusPo);
+        }
+
+
     }
 
     @Override
@@ -188,6 +223,24 @@ public class BCoursePreServiceImpl extends ServiceImpl<BCoursePreMapper, BCourse
 
     }
 
+    @Override
+    public List<BCourseUserPrePageDto> getPreUserNum(BCourseUserPreReqDto reqDto) {
+        List<BCourseUserPrePageDto> preUserNum = bCoursePreMapper.getPreUserNum(reqDto);
+        return preUserNum;
+    }
+
+    @Override
+    public void selectBusFc(PreBusStatusDto preBusStatusDto) {
+        ExtInfo extInfo = CurrentUserHolder.get();
+        String preBusId = preBusStatusDto.getPreBusId();
+        BPreBusPo bPreBusPo = bPreBusMapper.selectById(preBusId);
+        bPreBusPo.setBusId(preBusStatusDto.getBusId());
+        bPreBusPo.setPreStatus(preBusStatusDto.getPreStatus());
+        bPreBusPo.setUpdaterId(extInfo.getUserId());
+        bPreBusPo.setUpdateTime(new Date());
+        bPreBusMapper.updateById(bPreBusPo);
+    }
+
     /**
      * 详情
      * @param id

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

@@ -0,0 +1,81 @@
+package bus.service.impl;
+
+import bus.model.dto.BPreBusDto;
+import bus.model.dto.BPreBusPageDto;
+import bus.model.vo.BPreBusVo;
+import bus.model.po.BPreBusPo;
+import bus.mapper.BPreBusMapper;
+
+import bus.service.BPreBusService;
+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-20 08:41:56
+ **/
+@Service
+public class BPreBusServiceImpl implements BPreBusService {
+
+    @Autowired
+    private BPreBusMapper bPreBusMapper;
+
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    public BPreBusPo getDetailById(String id){
+        return this.bPreBusMapper.selectById(id);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BPreBusDto dto){
+        BPreBusPo po = new BPreBusPo();
+        BeanUtils.copyProperties(dto,po);
+		this.bPreBusMapper.insert(po);
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BPreBusVo> list(BPreBusPageDto dto){
+        return this.bPreBusMapper.list(dto);
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @Override
+    public void update(BPreBusDto dto){
+        BPreBusPo po = new BPreBusPo();
+        BeanUtils.copyProperties(dto,po);
+		bPreBusMapper.updateById(po);
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Override
+    public void delete(String id){
+		bPreBusMapper.deleteById(id);
+    }
+}

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

@@ -34,48 +34,4 @@ public class BUserPreServiceImpl implements BUserPreService {
     public BUserPrePo getDetailById(String id){
         return this.bUserPreMapper.selectById(id);
     }
-
-	/**
-     * 保存
-     * @param dto
-     * @return
-     */
-    @Override
-	public void save(BUserPreDto dto){
-        BUserPrePo po = new BUserPrePo();
-        BeanUtils.copyProperties(dto,po);
-		this.bUserPreMapper.insert(po);
-    }
-
-    /**
-    * 列表
-    * @param dto
-    * @return
-    */
-    @Override
-    public List<BUserPreVo> list(BUserPrePageDto dto){
-        return this.bUserPreMapper.list(dto);
-    }
-
-	/**
-     * 修改
-     * @param dto
-     * @return
-     */
-    @Override
-    public void update(BUserPreDto dto){
-        BUserPrePo po = new BUserPrePo();
-        BeanUtils.copyProperties(dto,po);
-		bUserPreMapper.updateById(po);
-    }
-
-    /**
-     * 删除
-     * @param id
-     * @return
-     */
-    @Override
-    public void delete(String id){
-		bUserPreMapper.deleteById(id);
-    }
 }

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-17 23:24:43
+* @Date: 2025-03-20 08:41:56
 **/
 @Service
 @Transactional

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

@@ -20,4 +20,32 @@
    b_course_pre
  </select>
 
+  <select id="getPreUserNum" resultType="bus.model.dto.req.BCourseUserPrePageDto"
+          parameterType="bus.model.dto.req.BCourseUserPreReqDto">
+    SELECT
+      a.id as preId,
+      count(a.id) as userNum,
+      a.course_id as courseId,
+      a.pre_time as preTime,
+      b.pre_date as preDate,
+      c.course_name as courseName,
+      d.bus_code as busCode,
+      d.pre_status as preStatus,
+      d.id as preBusId
+
+    FROM
+      b_course_pre a
+        JOIN
+      b_user_pre b ON a.course_id = b.course_id AND a.id = b.pre_id
+        JOIN
+      b_course_info c ON c.id = a.course_id
+        left join b_pre_bus d on a.id = d.pre_id
+    WHERE
+      a.is_delete = 0
+      <if test="courseId != null and courseId != ''">
+        and a.course_id = #{courseId}
+      </if>
+    GROUP BY  a.id asc
+  </select>
+
 </mapper>

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

@@ -0,0 +1,25 @@
+<?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.BPreBusMapper">
+
+ <select id="list" parameterType="bus.model.dto.BPreBusPageDto" resultType="bus.model.vo.BPreBusVo">
+   select
+   id,
+   pre_id,
+   pre_date,
+   pre_time,
+   bus_id,
+   pre_status,
+   bus_code,
+   create_time,
+   update_time,
+   creator_id,
+   updater_id,
+   creator_name,
+   updater_name,
+   is_delete
+   from
+   b_pre_bus
+ </select>
+
+</mapper>

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

@@ -2,25 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="bus.mapper.BUserPreMapper">
 
- <select id="list" parameterType="bus.model.dto.BUserPrePageDto" resultType="bus.model.vo.BUserPreVo">
-   select
-   id,
-   course_id,
-   pre_id,
-   pre_date,
-   remark,
-   type,
-   create_time,
-   update_time,
-   creator_id,
-   updater_id,
-   creator_name,
-   updater_name,
-   is_delete
-   from
-   b_user_pre
- </select>
-
      <select id="countByDateAndType" resultType="bus.model.dto.BUserPreCountVo">
         SELECT
             pre_id,
@@ -31,6 +12,7 @@
                 is_delete= 0
                 and pre_date &gt;= #{startDate}
                 AND pre_date &lt;= #{endDate}
+                AND course_id = #{courseId}
                 <if test="type != null and type != ''">
                     AND type = #{type}
                 </if>

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

@@ -20,8 +20,8 @@ public class CodeGenerateTest {
 	public void codeGenerate(){
 		GenerateConfig generateConfig = new GenerateConfig();
 		//设置输出目录
-		CodeGenerator.baseOutputDir="/Users/zhou/work/";
-		//CodeGenerator.baseOutputDir="E:\\selfWork";
+		//CodeGenerator.baseOutputDir="/Users/zhou/work/";
+		CodeGenerator.baseOutputDir="E:\\selfWork";
 		//设置项目信息
 		ProjectInfo projectInfo = new ProjectInfo();
 		//1表示多模块0表示单模块
@@ -38,8 +38,8 @@ public class CodeGenerateTest {
 		//设置生成的表
 		List<TableInfo> tables = new ArrayList<>();
 		TableInfo tableInfo = new TableInfo();
-		tableInfo.setTableName("b_user_pre");
-		tableInfo.setTableAlias("BUserPre");
+		tableInfo.setTableName("b_pre_bus");
+		tableInfo.setTableAlias("BPreBus");
 		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-17 23:24:43
+* @Date: 2025-03-20 08:41:56
 **/
 @Data
 public class BaseEntity {

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

@@ -0,0 +1,44 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-20 08:41:56
+**/
+@Data
+public class BPreBusDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("预约时刻id")
+    private String preId;
+    @ApiModelProperty("预约日期")
+    private Date preDate;
+    @ApiModelProperty("预约时间")
+    private String preTime;
+    @ApiModelProperty("车辆id")
+    private String busId;
+    @ApiModelProperty("预约状态 0未发车 1已发车，2取消预约")
+    private String preStatus;
+    @ApiModelProperty("车牌")
+    private String busCode;
+    @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/BPreBusPageDto.java

@@ -0,0 +1,45 @@
+package bus.model.dto;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Date;
+import java.util.Date;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-20 08:41:56
+**/
+@Data
+public class BPreBusPageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("预约时刻id")
+    private String preId;
+    @ApiModelProperty("预约日期")
+    private Date preDate;
+    @ApiModelProperty("预约时间")
+    private String preTime;
+    @ApiModelProperty("车辆id")
+    private String busId;
+    @ApiModelProperty("预约状态 0未发车 1已发车，2取消预约")
+    private String preStatus;
+    @ApiModelProperty("车牌")
+    private String busCode;
+    @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/BUserPreStatDto.java

@@ -14,4 +14,6 @@ public class BUserPreStatDto {
      //0当日 1周6 2周日
     private String type;
 
+    private String  courseId;
+
 }

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-17 23:24:43
+* @Date: 2025-03-20 08:41:56
 **/
 @ApiModel(description = "账户登陆请求实体")
 @Data

bus-common/src/main/java/bus/model/dto/req/BCourseUserPrePageDto.java

@@ -27,4 +27,10 @@ public class BCourseUserPrePageDto  {
     private Date preDate;
     @ApiModelProperty("预约人数")
     private Integer userNum;
+    @ApiModelProperty("预约状态 0未发车 1已发车 2预约取消")
+    private Integer preStatus;
+    @ApiModelProperty("车牌号")
+    private String busCode;
+    @ApiModelProperty("预约时刻发车id")
+    private String preBusId;
 }

bus-common/src/main/java/bus/model/dto/req/BCourseUserPreReqDto.java

@@ -0,0 +1,21 @@
+package bus.model.dto.req;
+
+import bus.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-17 21:07:13
+**/
+@Data
+public class BCourseUserPreReqDto  extends BaseEntity {
+
+    @ApiModelProperty("路线id")
+    private String courseId;
+
+}

bus-common/src/main/java/bus/model/dto/req/PreBusStatusDto.java

@@ -0,0 +1,16 @@
+package bus.model.dto.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PreBusStatusDto {
+   @ApiModelProperty("预约时刻发车id")
+    private String preBusId;
+    @ApiModelProperty("0未发车 1已发车 2预约取消")
+    private String preStatus;
+    @ApiModelProperty("车牌号")
+    private String busCode;
+    @ApiModelProperty("车辆id")
+    private String busId;
+}

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

@@ -0,0 +1,36 @@
+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;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-20 08:41:56
+**/
+@Data
+@TableName("b_pre_bus")
+public class BPreBusPo{
+    @TableId
+    private String id;
+    private String preId;
+    private Date preDate;
+    private String preTime;
+    private String busId;
+    private String preStatus;
+    private String busCode;
+    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/BUserPrePo.java

@@ -22,6 +22,7 @@ public class BUserPrePo{
     private String courseId;
     //预约时刻id
     private String preId;
+    private String preTime;
     private String userId;
     //预约日期
     private Date preDate;

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

@@ -0,0 +1,46 @@
+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;
+import java.util.Date;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-20 08:41:56
+**/
+@Data
+public class BPreBusVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("预约时刻id")
+    private String preId;
+    @ApiModelProperty("预约日期")
+    private Date preDate;
+    @ApiModelProperty("预约时间")
+    private String preTime;
+    @ApiModelProperty("车辆id")
+    private String busId;
+    @ApiModelProperty("预约状态 0未发车 1已发车，2取消预约")
+    private String preStatus;
+    @ApiModelProperty("车牌")
+    private String busCode;
+    @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/BCoursePreController.java

@@ -1,7 +1,10 @@
 package bus.controller.biz;
 
 import bus.model.dto.*;
+import bus.model.dto.req.BCourseUserPrePageDto;
+import bus.model.dto.req.BCourseUserPreReqDto;
 import bus.model.dto.req.BUserPreDetailDto;
+import bus.model.dto.req.PreBusStatusDto;
 import bus.service.BCourseInfoService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageSerializable;
@@ -41,8 +44,8 @@ public class BCoursePreController implements BaseController {
      */
      @ApiOperation("预约时刻详情")
      @GetMapping(value = "getDetailPre")
-     public BCoursePreTypeDto getDetailPre(@RequestParam String type){
-         return bCoursePreService.getDetailPre(type);
+     public BCoursePreTypeDto getDetailPre(@RequestParam String type,@RequestParam String courseId){
+         return bCoursePreService.getDetailPre(type,courseId);
      }
 
     /**
@@ -51,7 +54,7 @@ public class BCoursePreController implements BaseController {
      * @param preId
      * @return
      */
-    @ApiOperation("查询某路线时刻人")
+    @ApiOperation("查询某路线时刻的人员list")
     @GetMapping(value = "getPreUserByCourse")
     public List<BUserPreDetailDto> getPreUserByCourse(@RequestParam String courseId, @RequestParam String preId){
         return bCoursePreService.getPreUserByCourse(courseId,preId);
@@ -85,6 +88,24 @@ public class BCoursePreController implements BaseController {
         return "取消成功";
     }
 
+    @ApiOperation("路线时刻人数列表")
+    @PostMapping(value = "getPreUserNum")
+    PageSerializable<BCourseUserPrePageDto> getPreUserNum(@RequestBody BCourseUserPreReqDto reqDto){
+        return new PageSerializable<>(bCoursePreService.getPreUserNum(reqDto));
+    }
+
+    /**
+     *
+     * @param preBusStatusDto
+     */
+    @ApiOperation("选择发车")
+    @PostMapping(value = "selectBusFc")
+    public String selectBusFc(@RequestBody PreBusStatusDto preBusStatusDto) {
+    // Call the selectBusFc method of the bCoursePreService object, passing the preBusStatusDto object as an argument
+        bCoursePreService.selectBusFc(preBusStatusDto);
+        return "选择发车成功";
+    }
+
 
 //    /**
 //     * 详情

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

@@ -0,0 +1,95 @@
+package bus.controller.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.BPreBusDto;
+import bus.model.dto.BPreBusPageDto;
+import bus.model.vo.BPreBusVo;
+import bus.service.BPreBusService;
+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-20 08:41:56
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "bPreBus接口")
+@RequestMapping(value="/bPreBus")
+public class BPreBusController implements BaseController {
+
+    @Autowired
+    private BPreBusService bPreBusService;
+
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("详情")
+    @GetMapping(value = "getDetailById")
+    public BPreBusVo getDetailById(@RequestParam String id){
+        return doSingle(bPreBusService.getDetailById(id),BPreBusVo::new);
+    }
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @ApiOperation("保存")
+    @PostMapping(value = "save")
+    public String save(@RequestBody BPreBusDto dto){
+		bPreBusService.save(dto);
+        return "保存成功";
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @ApiOperation("列表")
+    @PostMapping(value = "list")
+    public PageSerializable<BPreBusVo> list(@RequestBody BPreBusPageDto dto){
+       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+       return new PageSerializable<>(bPreBusService.list(dto));
+    }
+
+	/**
+     * 修改
+     * @param dto
+     * @return
+     */
+    @ApiOperation("修改")
+    @PostMapping(value = "update")
+    public String update(@RequestBody BPreBusDto dto){
+		bPreBusService.update(dto);
+        return "修改成功";
+    }
+
+	/**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation("删除")
+    @GetMapping(value = "deleteById")
+    public String deleteById(@RequestParam String id){
+		bPreBusService.delete(id);
+        return "删除成功";
+    }
+
+}

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

@@ -44,52 +44,6 @@ public class BUserPreController implements BaseController {
         return doSingle(bUserPreService.getDetailById(id),BUserPreVo::new);
     }
 
-	/**
-     * 保存
-     * @param dto
-     * @return
-     */
-    @ApiOperation("保存")
-    @PostMapping(value = "save")
-    public String save(@RequestBody BUserPreDto dto){
-		bUserPreService.save(dto);
-        return "保存成功";
-    }
-
-    /**
-    * 列表
-    * @param dto
-    * @return
-    */
-    @ApiOperation("列表")
-    @PostMapping(value = "list")
-    public PageSerializable<BUserPreVo> list(@RequestBody BUserPrePageDto dto){
-       PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
-       return new PageSerializable<>(bUserPreService.list(dto));
-    }
-
-	/**
-     * 修改
-     * @param dto
-     * @return
-     */
-    @ApiOperation("修改")
-    @PostMapping(value = "update")
-    public String update(@RequestBody BUserPreDto dto){
-		bUserPreService.update(dto);
-        return "修改成功";
-    }
 
-	/**
-     * 删除
-     * @param id
-     * @return
-     */
-    @ApiOperation("删除")
-    @GetMapping(value = "deleteById")
-    public String deleteById(@RequestParam String id){
-		bUserPreService.delete(id);
-        return "删除成功";
-    }
 
 }

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-17 23:24:41
+* @Date: 2025-03-20 08:41:56
 **/
 @RestController
 @RequestMapping("/common")