课程大章

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseChapterController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.course.bo.CourseChapterAddBo;
+import com.zhongzheng.modules.course.bo.CourseChapterEditBo;
+import com.zhongzheng.modules.course.bo.CourseChapterQueryBo;
+import com.zhongzheng.modules.course.service.ICourseChapterService;
+import com.zhongzheng.modules.course.vo.CourseChapterVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 课程大章Controller
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Api(value = "课程大章控制器", tags = {"课程大章管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/chapter")
+public class CourseChapterController extends BaseController {
+
+    private final ICourseChapterService iCourseChapterService;
+
+    /**
+     * 查询课程大章列表
+     */
+    @ApiOperation("查询课程大章列表")
+    @PreAuthorize("@ss.hasPermi('system:chapter:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CourseChapterVo> list(CourseChapterQueryBo bo) {
+        startPage();
+        List<CourseChapterVo> list = iCourseChapterService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出课程大章列表
+     */
+   /* @ApiOperation("导出课程大章列表")
+    @PreAuthorize("@ss.hasPermi('system:chapter:export')")
+    @Log(title = "课程大章", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<CourseChapterVo> export(CourseChapterQueryBo bo) {
+        List<CourseChapterVo> list = iCourseChapterService.queryList(bo);
+        ExcelUtil<CourseChapterVo> util = new ExcelUtil<CourseChapterVo>(CourseChapterVo.class);
+        return util.exportExcel(list, "课程大章");
+    }*/
+
+    /**
+     * 获取课程大章详细信息
+     */
+    @ApiOperation("获取课程大章详细信息")
+    @PreAuthorize("@ss.hasPermi('system:chapter:query')")
+    @GetMapping("/{chapterId}")
+    public AjaxResult<CourseChapterVo> getInfo(@PathVariable("chapterId" ) Long chapterId) {
+        return AjaxResult.success(iCourseChapterService.queryById(chapterId));
+    }
+
+    /**
+     * 新增课程大章
+     */
+    @ApiOperation("新增课程大章")
+    @PreAuthorize("@ss.hasPermi('system:chapter:add')")
+    @Log(title = "课程大章", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CourseChapterAddBo bo) {
+        return toAjax(iCourseChapterService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改课程大章
+     */
+    @ApiOperation("修改课程大章")
+    @PreAuthorize("@ss.hasPermi('system:chapter:edit')")
+    @Log(title = "课程大章", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody CourseChapterEditBo bo) {
+        return toAjax(iCourseChapterService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除课程大章
+     */
+    /*@ApiOperation("删除课程大章")
+    @PreAuthorize("@ss.hasPermi('system:chapter:remove')")
+    @Log(title = "课程大章" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{chapterIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] chapterIds) {
+        return toAjax(iCourseChapterService.deleteWithValidByIds(Arrays.asList(chapterIds), true) ? 1 : 0);
+    }*/
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterAddBo.java

@@ -4,9 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
@@ -15,19 +12,14 @@ import java.util.Date;
  * 课程大章添加对象 course_chapter
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 @Data
 @ApiModel("课程大章添加对象")
 public class CourseChapterAddBo {
 
-    /** 课程ID */
-    @ApiModelProperty("课程ID")
-    @Min(value = 1, message = "课程ID不能为空")
-    private Long courseId;
     /** 名称 */
     @ApiModelProperty("名称")
-    @NotBlank(message = "大章名称不能为空")
     private String name;
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
@@ -41,4 +33,25 @@ public class CourseChapterAddBo {
     /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
+    /** 前缀名称 */
+    @ApiModelProperty("前缀名称")
+    private String prefixName;
+    /** 封面地址 */
+    @ApiModelProperty("封面地址")
+    private String coverUrl;
+    /** 发布状态 1发布 0未发布 */
+    @ApiModelProperty("发布状态 1发布 0未发布")
+    private Long publishStatus;
+    /** 教育类型id用,拼接 */
+    @ApiModelProperty("教育类型id用,拼接")
+    private String educationTypeIds;
+    /** 业务层次id用,拼接 */
+    @ApiModelProperty("业务层次id用,拼接")
+    private String businessIds;
+    /** 科目id用,拼接 */
+    @ApiModelProperty("科目id用,拼接")
+    private String subjectIds;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterEditBo.java

@@ -4,9 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
@@ -14,25 +11,18 @@ import java.util.Date;
  * 课程大章编辑对象 course_chapter
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 @Data
 @ApiModel("课程大章编辑对象")
 public class CourseChapterEditBo {
 
-
     /** 章ID */
     @ApiModelProperty("章ID")
     private Long chapterId;
 
-    /** 课程ID */
-    @ApiModelProperty("课程ID")
-    @Min(value = 1, message = "课程ID不能为空")
-    private Long courseId;
-
     /** 名称 */
     @ApiModelProperty("名称")
-    @NotBlank(message = "大章名称不能为空")
     private String name;
 
     /** $column.columnComment */
@@ -46,4 +36,34 @@ public class CourseChapterEditBo {
     /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
+
+
+    /** 前缀名称 */
+    @ApiModelProperty("前缀名称")
+    private String prefixName;
+
+    /** 封面地址 */
+    @ApiModelProperty("封面地址")
+    private String coverUrl;
+
+    /** 发布状态 1发布 0未发布 */
+    @ApiModelProperty("发布状态 1发布 0未发布")
+    private Long publishStatus;
+
+    /** 教育类型id用,拼接 */
+    @ApiModelProperty("教育类型id用,拼接")
+    private String educationTypeIds;
+
+    /** 业务层次id用,拼接 */
+    @ApiModelProperty("业务层次id用,拼接")
+    private String businessIds;
+
+    /** 科目id用,拼接 */
+    @ApiModelProperty("科目id用,拼接")
+    private String subjectIds;
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterQueryBo.java

@@ -16,7 +16,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 课程大章分页查询对象 course_chapter
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -37,9 +37,6 @@ public class CourseChapterQueryBo extends BaseEntity {
 	private String isAsc;
 
 
-	/** 课程ID */
-	@ApiModelProperty("课程ID")
-	private Long courseId;
 	/** 名称 */
 	@ApiModelProperty("名称")
 	private String name;
@@ -49,5 +46,25 @@ public class CourseChapterQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private List<Integer> status;
-
+	/** 前缀名称 */
+	@ApiModelProperty("前缀名称")
+	private String prefixName;
+	/** 封面地址 */
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
+	/** 发布状态 1发布 0未发布 */
+	@ApiModelProperty("发布状态 1发布 0未发布")
+	private Long publishStatus;
+	/** 教育类型id用,拼接 */
+	@ApiModelProperty("教育类型id用,拼接")
+	private String educationTypeIds;
+	/** 业务层次id用,拼接 */
+	@ApiModelProperty("业务层次id用,拼接")
+	private String businessIds;
+	/** 科目id用,拼接 */
+	@ApiModelProperty("科目id用,拼接")
+	private String subjectIds;
+	/** 编码 */
+	@ApiModelProperty("编码")
+	private String code;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 课程大章对象 course_chapter
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 @Data
 @NoArgsConstructor
@@ -23,29 +23,33 @@ public class CourseChapter implements Serializable {
 
 private static final long serialVersionUID=1L;
 
-
     /** 章ID */
     @TableId(value = "chapter_id")
     private Long chapterId;
-
-    /** 课程ID */
-    private Long courseId;
-
     /** 名称 */
     private String name;
-
     /** $column.columnComment */
     private Long sort;
-
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
-
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-
     /** 状态 1正常 0关闭 */
     private Integer status;
-
+    /** 前缀名称 */
+    private String prefixName;
+    /** 封面地址 */
+    private String coverUrl;
+    /** 发布状态 1发布 0未发布 */
+    private Long publishStatus;
+    /** 教育类型id用,拼接 */
+    private String educationTypeIds;
+    /** 业务层次id用,拼接 */
+    private String businessIds;
+    /** 科目id用,拼接 */
+    private String subjectIds;
+    /** 编码 */
+    private String code;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterMapper.java

@@ -8,7 +8,7 @@ import com.zhongzheng.modules.course.domain.CourseChapter;
  * 课程大章Mapper接口
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 public interface CourseChapterMapper extends BaseMapper<CourseChapter> {
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseChapterService.java

@@ -1,6 +1,5 @@
 package com.zhongzheng.modules.course.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.course.bo.CourseChapterAddBo;
 import com.zhongzheng.modules.course.bo.CourseChapterEditBo;
@@ -15,7 +14,7 @@ import java.util.List;
  * 课程大章Service接口
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 public interface ICourseChapterService extends IService<CourseChapter> {
 	/**

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
  * 课程大章Service业务层处理
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 @Service
 public class CourseChapterServiceImpl extends ServiceImpl<CourseChapterMapper, CourseChapter> implements ICourseChapterService {
@@ -39,10 +39,16 @@ public class CourseChapterServiceImpl extends ServiceImpl<CourseChapterMapper, C
     @Override
     public List<CourseChapterVo> queryList(CourseChapterQueryBo bo) {
         LambdaQueryWrapper<CourseChapter> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getCourseId() != null, CourseChapter::getCourseId, bo.getCourseId());
         lqw.like(StrUtil.isNotBlank(bo.getName()), CourseChapter::getName, bo.getName());
         lqw.eq(bo.getSort() != null, CourseChapter::getSort, bo.getSort());
-        lqw.in(bo.getStatus() != null, CourseChapter::getStatus, bo.getStatus());
+        lqw.eq(bo.getStatus() != null, CourseChapter::getStatus, bo.getStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getPrefixName()), CourseChapter::getPrefixName, bo.getPrefixName());
+        lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), CourseChapter::getCoverUrl, bo.getCoverUrl());
+        lqw.in(bo.getPublishStatus() != null, CourseChapter::getPublishStatus, bo.getPublishStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getEducationTypeIds()), CourseChapter::getEducationTypeIds, bo.getEducationTypeIds());
+        lqw.eq(StrUtil.isNotBlank(bo.getBusinessIds()), CourseChapter::getBusinessIds, bo.getBusinessIds());
+        lqw.eq(StrUtil.isNotBlank(bo.getSubjectIds()), CourseChapter::getSubjectIds, bo.getSubjectIds());
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), CourseChapter::getCode, bo.getCode());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseChapterVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * 课程大章视图对象 mall_package
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-10-09
  */
 @Data
 @ApiModel("课程大章视图对象")
@@ -24,21 +24,44 @@ public class CourseChapterVo {
 	@ApiModelProperty("章ID")
 	private Long chapterId;
 
-	/** 课程ID */
-	@Excel(name = "课程ID")
-	@ApiModelProperty("课程ID")
-	private Long courseId;
 	/** 名称 */
 	@Excel(name = "名称")
 	@ApiModelProperty("名称")
 	private String name;
 	/** $column.columnComment */
-	@Excel(name = "排序")
+	@Excel(name = "名称")
 	@ApiModelProperty("$column.columnComment")
 	private Long sort;
 	/** 状态 1正常 0关闭 */
 	@Excel(name = "状态 1正常 0关闭")
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
-
+	/** 前缀名称 */
+	@Excel(name = "前缀名称")
+	@ApiModelProperty("前缀名称")
+	private String prefixName;
+	/** 封面地址 */
+	@Excel(name = "封面地址")
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
+	/** 发布状态 1发布 0未发布 */
+	@Excel(name = "发布状态 1发布 0未发布")
+	@ApiModelProperty("发布状态 1发布 0未发布")
+	private Long publishStatus;
+	/** 教育类型id用,拼接 */
+	@Excel(name = "教育类型id用,拼接")
+	@ApiModelProperty("教育类型id用,拼接")
+	private String educationTypeIds;
+	/** 业务层次id用,拼接 */
+	@Excel(name = "业务层次id用,拼接")
+	@ApiModelProperty("业务层次id用,拼接")
+	private String businessIds;
+	/** 科目id用,拼接 */
+	@Excel(name = "科目id用,拼接")
+	@ApiModelProperty("科目id用,拼接")
+	private String subjectIds;
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml

@@ -6,12 +6,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zhongzheng.modules.course.domain.CourseChapter" id="CourseChapterResult">
         <result property="chapterId" column="chapter_id"/>
-        <result property="courseId" column="course_id"/>
         <result property="name" column="name"/>
         <result property="sort" column="sort"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="prefixName" column="prefix_name"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="publishStatus" column="publish_status"/>
+        <result property="educationTypeIds" column="education_type_ids"/>
+        <result property="businessIds" column="business_ids"/>
+        <result property="subjectIds" column="subject_ids"/>
+        <result property="code" column="code"/>
     </resultMap>