Browse Source

no message

zy 8 tháng trước cách đây
mục cha
commit
b20cc37b4e

+ 0 - 5
bus-biz/pom.xml

@@ -41,11 +41,6 @@
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.xuxueli</groupId>
-			<artifactId>xxl-job-core</artifactId>
-			<version>2.2.0</version>
-		</dependency>
 	</dependencies>
 
 </project>

+ 20 - 0
bus-biz/src/main/java/bus/mapper/BUserCourseMapper.java

@@ -0,0 +1,20 @@
+package bus.mapper;
+
+import bus.model.dto.BUserCoursePageDto;
+import bus.model.vo.BUserCourseVo;
+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-11 18:22:22
+ **/
+@Mapper
+public interface BUserCourseMapper extends BaseMapper<BUserCoursePo> {
+
+    List<BUserCourseVo> list(BUserCoursePageDto dto);
+}

+ 47 - 0
bus-biz/src/main/java/bus/service/BUserCourseService.java

@@ -0,0 +1,47 @@
+package bus.service;
+
+import bus.model.dto.BUserCourseDto;
+import bus.model.dto.BUserCoursePageDto;
+import bus.model.vo.BUserCourseVo;
+import bus.model.po.BUserCoursePo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-11 18:22:22
+ **/
+public interface BUserCourseService extends IService<BUserCoursePo> {
+
+
+	/**
+     * 收藏路线
+     * @param dto
+     * @return
+     */
+    void save(BUserCourseDto dto);
+
+    /**
+     * 顶置路线
+     * @param courseId
+     */
+    void topCourse(String courseId);
+
+    /**
+    * 我的路线
+    * @param dto
+    * @return
+    */
+    List<BUserCourseVo> list(BUserCoursePageDto dto);
+
+
+	/**
+     *  g根据路线id删除
+     * @param courseId
+     * @return
+     */
+    void delete(String courseId);
+}

+ 1 - 1
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-10 22:38:55
+* @Date: 2025-03-11 18:22:22
 **/
 public interface CommonService {
 

+ 84 - 0
bus-biz/src/main/java/bus/service/impl/BUserCourseServiceImpl.java

@@ -0,0 +1,84 @@
+package bus.service.impl;
+
+import bus.model.SnowflakeUtil;
+import bus.model.dto.BUserCourseDto;
+import bus.model.dto.BUserCoursePageDto;
+import bus.model.vo.BUserCourseVo;
+import bus.model.po.BUserCoursePo;
+import bus.mapper.BUserCourseMapper;
+
+import bus.service.BUserCourseService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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 javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * @Program: bus
+ * @Description: 描述
+ * @Author: zy
+ * @Date: 2025-03-11 18:22:22
+ **/
+@Service
+public class BUserCourseServiceImpl extends ServiceImpl<BUserCourseMapper,BUserCoursePo> implements BUserCourseService {
+
+    @Autowired
+    private BUserCourseMapper bUserCourseMapper;
+
+    @Resource
+    private SnowflakeUtil snowflakeUtil;
+
+	/**
+     * 保存
+     * @param dto
+     * @return
+     */
+    @Override
+	public void save(BUserCourseDto dto){
+        ExtInfo extInfo = CurrentUserHolder.get();
+        BUserCoursePo po = new BUserCoursePo();
+        po.setUserId(extInfo.getUserId());
+        po.setCourseId(dto.getCourseId());
+        po.setTop("0");
+        po.setTop(snowflakeUtil.snowflakeId());
+		this.bUserCourseMapper.insert(po);
+    }
+
+    @Override
+    public void topCourse(String courseId) {
+
+    }
+
+    /**
+    * 列表
+    * @param dto
+    * @return
+    */
+    @Override
+    public List<BUserCourseVo> list(BUserCoursePageDto dto){
+        return this.bUserCourseMapper.list(dto);
+    }
+
+
+    /**
+     *  g根据路线id删除
+     * @param courseId
+     * @return
+     */
+    @Override
+    public void delete(String courseId){
+
+    }
+
+
+}

+ 1 - 1
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-10 22:38:55
+* @Date: 2025-03-11 18:22:22
 **/
 @Service
 @Transactional

+ 14 - 0
bus-biz/src/main/resources/mapper/BUserCourseMapper.xml

@@ -0,0 +1,14 @@
+<?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.BUserCourseMapper">
+
+ <select id="list" parameterType="bus.model.dto.BUserCoursePageDto" resultType="bus.model.vo.BUserCourseVo">
+   select
+   id,
+   course_id,
+   user_id
+   from
+   b_user_course
+ </select>
+
+</mapper>

+ 4 - 3
bus-boot/src/test/java/bus/CodeGenerateTest.java

@@ -20,7 +20,8 @@ public class CodeGenerateTest {
 	public void codeGenerate(){
 		GenerateConfig generateConfig = new GenerateConfig();
 		//设置输出目录
-		CodeGenerator.baseOutputDir="/Users/zhou/work/";
+		//CodeGenerator.baseOutputDir="/Users/zhou/work/";
+		CodeGenerator.baseOutputDir="E:\\selfWork";
 		//设置项目信息
 		ProjectInfo projectInfo = new ProjectInfo();
 		//1表示多模块0表示单模块
@@ -37,8 +38,8 @@ public class CodeGenerateTest {
 		//设置生成的表
 		List<TableInfo> tables = new ArrayList<>();
 		TableInfo tableInfo = new TableInfo();
-		tableInfo.setTableName("b_notice_user");
-		tableInfo.setTableAlias("BNoticeUser");
+		tableInfo.setTableName("b_user_course");
+		tableInfo.setTableAlias("BUserCourse");
 		tables.add(tableInfo);
 		generateConfig.setTableInfos(tables);
 		//生成代码

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

@@ -5,7 +5,7 @@ import lombok.Data;
 * @Program: bus
 * @Description: 描述
 * @Author: zy
-* @Date: 2025-03-10 22:38:56
+* @Date: 2025-03-11 18:22:22
 **/
 @Data
 public class BaseEntity {

+ 15 - 0
bus-common/src/main/java/bus/model/dto/BUserCourseDto.java

@@ -0,0 +1,15 @@
+package bus.model.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-11 18:22:22
+**/
+@Data
+public class BUserCourseDto{
+    @ApiModelProperty("线路id")
+    private String courseId;
+}

+ 20 - 0
bus-common/src/main/java/bus/model/dto/BUserCoursePageDto.java

@@ -0,0 +1,20 @@
+package bus.model.dto;
+
+import bus.model.BaseEntity;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-11 18:22:22
+**/
+@Data
+public class BUserCoursePageDto extends BaseEntity{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("线路id")
+    private String courseId;
+    @ApiModelProperty("用户id")
+    private String userId;
+}

+ 1 - 1
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-10 22:38:56
+* @Date: 2025-03-11 18:22:22
 **/
 @ApiModel(description = "账户登陆请求实体")
 @Data

+ 22 - 0
bus-common/src/main/java/bus/model/po/BUserCoursePo.java

@@ -0,0 +1,22 @@
+package bus.model.po;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+/**
+* @Program: bus
+* @Description: 
+* @Author: zy
+* @Date: 2025-03-11 18:22:22
+**/
+@Data
+@TableName("b_user_course")
+public class BUserCoursePo{
+    @TableId
+    private String id;
+    private String courseId;
+    private String userId;
+    private String top;
+
+}

+ 21 - 0
bus-common/src/main/java/bus/model/vo/BUserCourseVo.java

@@ -0,0 +1,21 @@
+package bus.model.vo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import com.qzwisdom.qzframework.core.tool.base.vo.AbstractBaseVO;
+
+/**
+* @Program: bus
+* @Description: 描述
+* @Author: zy
+* @Date: 2025-03-11 18:22:22
+**/
+@Data
+public class BUserCourseVo extends AbstractBaseVO{
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("线路id")
+    private String courseId;
+    @ApiModelProperty("用户id")
+    private String userId;
+}

+ 95 - 0
bus-web/src/main/java/bus/controller/biz/BUserCourseController.java

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

+ 1 - 1
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-10 22:38:55
+* @Date: 2025-03-11 18:22:22
 **/
 @RestController
 @RequestMapping("/common")