no message

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

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.BUserPrePageDto;
+import bus.model.vo.BUserPreVo;
+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-17 23:24:43
+ **/
+@Mapper
+public interface BUserPreMapper extends BaseMapper<BUserPrePo> {
+
+    List<BUserPreVo> list(BUserPrePageDto dto);
+}

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

@@ -0,0 +1,52 @@
+package bus.service;
+
+import bus.model.dto.BUserPreDto;
+import bus.model.dto.BUserPrePageDto;
+import bus.model.vo.BUserPreVo;
+import bus.model.po.BUserPrePo;
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-17 23:24:43
+ **/
+public interface BUserPreService {
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    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 21:07:12
+* @Date: 2025-03-17 23:24:43
 **/
 public interface CommonService {
 

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

@@ -0,0 +1,81 @@
+package bus.service.impl;
+
+import bus.model.dto.BUserPreDto;
+import bus.model.dto.BUserPrePageDto;
+import bus.model.vo.BUserPreVo;
+import bus.model.po.BUserPrePo;
+import bus.mapper.BUserPreMapper;
+
+import bus.service.BUserPreService;
+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-17 23:24:43
+ **/
+@Service
+public class BUserPreServiceImpl implements BUserPreService {
+
+    @Autowired
+    private BUserPreMapper bUserPreMapper;
+
+
+	/**
+     * 详情
+     * @param id
+     * @return
+     */
+    @Override
+    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 21:07:12
+* @Date: 2025-03-17 23:24:43
 **/
 @Service
 @Transactional

bus-biz/src/main/resources/mapper/BUserPreMapper.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.BUserPreMapper">
+
+ <select id="list" parameterType="bus.model.dto.BUserPrePageDto" resultType="bus.model.vo.BUserPreVo">
+   select
+   id,
+   course_id,
+   pre_time,
+   pre_date,
+   remark,
+   type,
+   create_time,
+   update_time,
+   creator_id,
+   updater_id,
+   creator_name,
+   updater_name,
+   is_delete
+   from
+   b_user_pre
+ </select>
+
+</mapper>

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

@@ -38,8 +38,8 @@ public class CodeGenerateTest {
 		//设置生成的表
 		List<TableInfo> tables = new ArrayList<>();
 		TableInfo tableInfo = new TableInfo();
-		tableInfo.setTableName("b_course_pre");
-		tableInfo.setTableAlias("BCoursePre");
+		tableInfo.setTableName("b_user_pre");
+		tableInfo.setTableAlias("BUserPre");
 		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 21:07:13
+* @Date: 2025-03-17 23:24:43
 **/
 @Data
 public class BaseEntity {

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

@@ -22,5 +22,7 @@ public class BCoursePreDto{
     private Integer sort;
     @ApiModelProperty("备注")
     private String remark;
+    @ApiModelProperty("类型 0当前 1星期6 2星期天")
+    private String type;
 
 }

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

@@ -0,0 +1,42 @@
+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-17 23:24:43
+**/
+@Data
+public class BUserPreDto{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("预约时刻")
+    private String preTime;
+    @ApiModelProperty("预约日期")
+    private Date preDate;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("类型,0-当天 1-星期6 2-星期天")
+    private String type;
+    @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/BUserPrePageDto.java

@@ -0,0 +1,43 @@
+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-17 23:24:43
+**/
+@Data
+public class BUserPrePageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("预约时刻")
+    private String preTime;
+    @ApiModelProperty("预约日期")
+    private Date preDate;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("类型,0-当天 1-星期6 2-星期天")
+    private String type;
+    @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/CommonLoginDto.java

@@ -8,7 +8,7 @@ import lombok.Data;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-17 21:07:13
+* @Date: 2025-03-17 23:24:43
 **/
 @ApiModel(description = "账户登陆请求实体")
 @Data

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

@@ -20,6 +20,7 @@ public class BCoursePrePo{
     private String id;
     private String courseId;
     private String preTime;
+    private String type;
     private Integer sort;
     private String remark;
     private Date createTime;

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

@@ -0,0 +1,33 @@
+package bus.model.po;
+
+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-17 23:24:43
+**/
+@Data
+@TableName("b_user_pre")
+public class BUserPrePo{
+    @TableId
+    private String id;
+    private String courseId;
+    private String preTime;
+    private Date preDate;
+    private String remark;
+    private String type;
+    private Date createTime;
+    private Date updateTime;
+    private String creatorId;
+    private String updaterId;
+    private String creatorName;
+    private String updaterName;
+    private Integer isDelete;
+}

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

@@ -0,0 +1,44 @@
+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-17 23:24:43
+**/
+@Data
+public class BUserPreVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("路线id")
+    private String courseId;
+    @ApiModelProperty("预约时刻")
+    private String preTime;
+    @ApiModelProperty("预约日期")
+    private Date preDate;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("类型,0-当天 1-星期6 2-星期天")
+    private String type;
+    @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/BNoticeUserController.java

@@ -1,8 +1,5 @@
 package bus.controller.biz;
 
-import bus.model.BaseEntity;
-import bus.model.dto.BNoticeInfoDto;
-import bus.model.dto.page.BNoticeInfoPageDto;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageSerializable;
 import bus.model.dto.BNoticeUserDto;
@@ -16,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.qzwisdom.qzframework.core.tool.base.controller.BaseController;
 
-import java.util.List;
 
 
 /**
@@ -28,36 +24,23 @@ import java.util.List;
 @Slf4j
 @CrossOrigin
 @RestController
-@Api(tags = "公告用户接口")
+@Api(tags = "bNoticeUser接口")
 @RequestMapping(value="/bNoticeUser")
 public class BNoticeUserController implements BaseController {
 
     @Autowired
     private BNoticeUserService bNoticeUserService;
 
-    @ApiOperation("查看后已读")
+    @ApiOperation("添加通知用户")
     @PostMapping("/add")
     public void add(@RequestBody BNoticeUserDto dto) {
         bNoticeUserService.addNoticeUser(dto);
     }
 
-    @ApiOperation("一键已读")
+    @ApiOperation("批量添加通知用户")
     @PostMapping("/addAll")
     public void addAll() {
         bNoticeUserService.addNoticeUserAll();
     }
 
-    /**
-     * 查询 公告（包括是否已读）
-     * @return 公告列表，包含已读状态
-     */
-    @ApiOperation("小程序公告")
-    @PostMapping("/getNoticeInfoList")
-    public PageSerializable<BNoticeInfoDto> getNoticeInfoList(@RequestBody BaseEntity dto){
-        PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
-        List<BNoticeInfoDto> noticeInfoList = bNoticeUserService.getNoticeInfoList();
-        return new PageSerializable<>(noticeInfoList);
-    }
-
-
 }

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

@@ -0,0 +1,95 @@
+package bus.controller.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageSerializable;
+import bus.model.dto.BUserPreDto;
+import bus.model.dto.BUserPrePageDto;
+import bus.model.vo.BUserPreVo;
+import bus.service.BUserPreService;
+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-17 23:24:41
+ **/
+@Slf4j
+@CrossOrigin
+@RestController
+@Api(tags = "bUserPre接口")
+@RequestMapping(value="/bUserPre")
+public class BUserPreController implements BaseController {
+
+    @Autowired
+    private BUserPreService bUserPreService;
+
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("详情")
+    @GetMapping(value = "getDetailById")
+    public BUserPreVo getDetailById(@RequestParam String id){
+        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 21:07:11
+* @Date: 2025-03-17 23:24:41
 **/
 @RestController
 @RequestMapping("/common")