课程分类和课程内容的增删改查

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/flyer/qo/CurriculumQo.java

@@ -23,14 +23,12 @@ public class CurriculumQo implements Serializable {
     private static final long serialVersionUID = 3124398495152234751L;
     @ApiModelProperty(value = "课程名称")
     private String curriculumName;
-    @ApiModelProperty(value = "省份编码")
-    private Integer provinceCode;
-    @ApiModelProperty(value = "执照id")
-    private Integer licenseId;
-    @ApiModelProperty(value = "技能id")
-    private Integer flightSkillsId;
-    @ApiModelProperty(value = "课程类型id")
-    private Integer categoriesId;
+    @ApiModelProperty(value = "1级课程分类")
+    private Integer oneCourseId;
+    @ApiModelProperty(value = "2级课程分类")
+    private Integer twoCourseId;
+    @ApiModelProperty(value = "课程属性： 0:免费 1：积分兑换 2：付费 ")
+    private Integer courseAttribute;
     @ApiModelProperty(value = "页码", required = true)
     @NotNull(message = "页码不能为空", groups = { Page.class })
     @Min(value = 1, groups = Page.class)

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/flyer/vo/CurriculumClassifyVO.java

+package com.mmc.csf.release.flyer.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.mmc.csf.release.model.group.Insert;
+import com.mmc.csf.release.model.group.Update;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author han
+ * 概要:课程分类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CurriculumClassifyVO implements Serializable {
+    private static final long serialVersionUID = -7343885960160805850L;
+
+    @ApiModelProperty(value = "课程分类id")
+    private Integer id;
+
+    @ApiModelProperty(value = "分类名字")
+    @NotNull(message = "分类名字不能为空" ,groups = {Update.class})
+    private String name;
+
+    @ApiModelProperty(value = "1级课程分类")
+    @NotNull(message = "1级课程分类不能为空" ,groups = {Update.class})
+    private Integer oneCourseId;
+
+    @ApiModelProperty(value = "2级课程分类")
+    private Integer twoCourseId;
+
+    @ApiModelProperty(value = "分类图标")
+    private String classifyUrl;
+
+    @ApiModelProperty(value = "分类描述")
+    private String classifyDesc;
+
+    @ApiModelProperty(value = "创建时间")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/flyer/vo/CurriculumInfoVO.java

 package com.mmc.csf.release.flyer.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.mmc.csf.release.model.group.Insert;
 import com.mmc.csf.release.model.group.Update;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +13,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @Author LW
@@ -25,35 +27,19 @@ import java.math.BigDecimal;
 public class CurriculumInfoVO implements Serializable {
     private static final long serialVersionUID = -7343885960160805850L;
     @ApiModelProperty(value = "课程id")
-    @NotNull(message = "课程id不能为空" ,groups = {Update.class})
     private Integer id;
 
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
+    @ApiModelProperty(value = "1级课程分类ID")
+    @NotNull(message = "1级课程分类ID不能为空" ,groups = {Insert.class})
+    private Integer oneCourseId;
 
-    @ApiModelProperty(value = "供应商名称")
-    private String supplierName;
+    @ApiModelProperty(value = "2级课程分类ID")
+    private Integer twoCourseId;
 
     @ApiModelProperty(value = "课程名称，长度30")
     @Length(max = 30)
     private String curriculumName;
 
-    @ApiModelProperty(value = "课程是否免费 0：免费 1：付费")
-    private Integer free;
-
-    @ApiModelProperty(value = "课程类型，二级id")
-    @NotNull(message = "课程类型id不能为空" ,groups = {Insert.class})
-    private Integer categoriesId;
-
-    @ApiModelProperty(value = "目录名称", example = "技能")
-    private String directoryName;
-
-    @ApiModelProperty(value = "课程类型名称", example = "通用巡检")
-    private String categoriesName;
-
-    @ApiModelProperty(value = "课程技能类型，二级id")
-    private Integer flightSkills;
-
     @ApiModelProperty(value = "课程介绍（简介）, 长度255")
     @Length(max = 255)
     private String curriculumDesc;
@@ -64,6 +50,27 @@ public class CurriculumInfoVO implements Serializable {
     @ApiModelProperty(value = "课程视频")
     private String videoUrl;
 
+    @ApiModelProperty(value = "课程属性: 0:免费 1：积分兑换 2：付费 ")
+    private Integer courseAttribute;
+
+    @ApiModelProperty(value = "价格")
+    private BigDecimal requireAmout;
+
+    @ApiModelProperty(value = "积分")
+    private Integer requireIntegral;
+
+    @ApiModelProperty(value = "课程是否热门 0：否 1：是")
+    private Integer isHot;
+
     @ApiModelProperty(value = "课程详情")
     private String detailContent;
+
+    @ApiModelProperty(value = "创建时间")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
 }

pom.xml

@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mmc.csf</groupId>
-    <artifactId>iuav-ims</artifactId>
+    <artifactId>iuav-ims</artifactId>aa
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>信息发布管理系统</name>

release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java

@@ -3,10 +3,7 @@ package com.mmc.csf.release.controller;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.flyer.qo.CurriculumQo;
-import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
-import com.mmc.csf.release.flyer.vo.DronePilotLicenseVO;
-import com.mmc.csf.release.flyer.vo.FlightSkillsVO;
-import com.mmc.csf.release.flyer.vo.RegistrationVO;
+import com.mmc.csf.release.flyer.vo.*;
 import com.mmc.csf.release.model.group.Insert;
 import com.mmc.csf.release.model.group.Update;
 import com.mmc.csf.release.service.FlyerTrainingService;
@@ -70,12 +67,6 @@ public class FlyerTrainingController extends BaseController {
         return flyerTrainingService.treeCurriculumSkill();
     }
 
-    @ApiOperation(value = "V1.0.1课程视频列表")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
-    @PostMapping("/queryCurriculumInfoList")
-    public ResultBody queryCurriculumInfoList(@RequestBody CurriculumQo curriculumQo) {
-        return ResultBody.success(flyerTrainingService.queryCurriculumInfoList(curriculumQo));
-    }
 
     @ApiOperation(value = "feign-V1.0.1课程视频列表", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
@@ -98,27 +89,34 @@ public class FlyerTrainingController extends BaseController {
         return flyerTrainingService.curriculumDetails(id);
     }
 
-    @ApiOperation(value = "V1.0.1新增课程")
+    @ApiOperation(value = "新增课程")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
     @PostMapping("addCurriculum")
     public ResultBody addCurriculum(@Validated(Insert.class) @RequestBody CurriculumInfoVO curriculumInfoVO) {
         return ResultBody.success(flyerTrainingService.addCurriculum(curriculumInfoVO));
     }
 
-    @ApiOperation(value = "V1.0.1修改课程")
+    @ApiOperation(value = "修改课程")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
     @PostMapping("updateCurriculum")
     public ResultBody updateCurriculum(@Validated(Update.class) @RequestBody CurriculumInfoVO curriculumInfoVO) {
         return ResultBody.success(flyerTrainingService.updateCurriculum(curriculumInfoVO));
     }
 
-    @ApiOperation(value = "V1.0.1删除课程")
+    @ApiOperation(value = "删除课程")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("removeCurriculum")
     public ResultBody removeCurriculum(@RequestParam Integer id) {
         return ResultBody.success(flyerTrainingService.removeCurriculum(id));
     }
 
+    @ApiOperation(value = "课程查询-分页")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/queryCurriculumInfoList")
+    public ResultBody queryCurriculumInfoList(@RequestBody CurriculumQo curriculumQo) {
+        return ResultBody.success(flyerTrainingService.queryCurriculumInfoList(curriculumQo));
+    }
+
     @Autowired
     private PmsAppApi pmsAppApi;
 
@@ -136,4 +134,34 @@ public class FlyerTrainingController extends BaseController {
     public Integer getCurriculumCount() {
         return flyerTrainingService.getCurriculumCount();
     }
+
+    @ApiOperation(value = "新增课程分类")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumClassifyVO.class)})
+    @PostMapping("addCurriculumClassify")
+    public ResultBody addCurriculumClassify(@Validated(Insert.class) @RequestBody CurriculumClassifyVO curriculumClassifyVO) {
+        return ResultBody.success(flyerTrainingService.addCurriculumClassify(curriculumClassifyVO));
+    }
+
+    @ApiOperation(value = "修改课程分类")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumClassifyVO.class)})
+    @PostMapping("updateCurriculumClassify")
+    public ResultBody updateCurriculumClassify(@Validated(Update.class) @RequestBody CurriculumClassifyVO curriculumClassifyVO) {
+        return ResultBody.success(flyerTrainingService.updateCurriculumClassify(curriculumClassifyVO));
+    }
+    @ApiOperation(value = "删除课程分类")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumClassifyVO.class)})
+    @PostMapping("removeCurriculumClassify")
+    public ResultBody removeCurriculumClassify(@RequestParam Integer oneCourseId,
+                                                                     @RequestParam(required = false) Integer twoCourseId) {
+        return ResultBody.success(flyerTrainingService.removeCurriculumClassify(oneCourseId, twoCourseId));
+    }
+
+    @ApiOperation(value = "所有课程分类列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumClassifyVO.class)})
+    @GetMapping("/selectCurriculumClassify")
+    public ResultBody selectCurriculumClassify() {
+        return flyerTrainingService.selectCurriculumClassify();
+    }
+
+
 }

release-service/src/main/java/com/mmc/csf/release/dao/FlyerTrainingDao.java

@@ -2,6 +2,8 @@ package com.mmc.csf.release.dao;
 
 import java.util.List;
 
+import com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO;
+import com.mmc.csf.release.flyer.vo.CurriculumClassifyVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO;
@@ -92,4 +94,44 @@ public interface FlyerTrainingDao {
     int countCurriculumInfo(Integer categoriesId);
 
     Integer getCurriculumCount();
+
+    /**
+     * 添加课程分类
+     *
+     * @param curriculumClassifyDO
+     */
+    Integer addCurriculumClassify(CurriculumClassifyDO curriculumClassifyDO);
+
+    /**
+     * 修改课程分类
+     *
+     * @param curriculumClassify
+     */
+    Integer updateCurriculumClassify(CurriculumClassifyDO curriculumClassify);
+
+    /**
+     * 删除课程分类
+     *
+     * @param oneCourseId 1级课程分类
+     * @param twoCourseId 2级课程分类
+     */
+    Integer removeCurriculumClassify(Integer oneCourseId, Integer twoCourseId);
+
+    /**
+     * 查询一级分类的数量
+     * @return
+     */
+    Integer countOneCourseClassify();
+
+    /**
+     * 查询当前一级分类下的二级分类的数量
+     * @param twoCourseId 2级课程分类
+     */
+    Integer countTwoCourseClassify(Integer twoCourseId);
+
+    /**
+     * 查询所有的课程分类
+     * @return
+     */
+    List<CurriculumClassifyDO> selectCurriculumClassify();
 }

release-service/src/main/java/com/mmc/csf/release/entity/curriculum/CurriculumClassifyDO.java

+package com.mmc.csf.release.entity.curriculum;
+
+import com.mmc.csf.release.flyer.vo.CurriculumClassifyVO;
+import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 课程基本信息(CurriculumClassifyDO)实体类
+ *
+ * @author han
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CurriculumClassifyDO implements Serializable {
+    private static final long serialVersionUID = 140348746605431718L;
+
+    private Integer id;
+
+    /**
+     * 课程类别名称
+     */
+    private String name;
+    /**
+     * 1级课程分类
+     */
+    private Integer oneCourseId;
+    /**
+     * 2级课程分类
+     */
+    private Integer twoCourseId;
+    /**
+     * 分类图标
+     */
+    private String classifyUrl;
+    /**
+     * 分类描述
+     */
+    private String classifyDesc;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+    /**
+     * 是否删除 0：否 1：是
+     */
+    private Integer deleted;
+
+
+    public CurriculumClassifyDO(CurriculumClassifyVO curriculumClassifyVO) {
+        this.id = curriculumClassifyVO.getId();
+        this.name = curriculumClassifyVO.getName();
+        this.oneCourseId = curriculumClassifyVO.getOneCourseId();
+        this.twoCourseId = curriculumClassifyVO.getTwoCourseId();
+        this.classifyUrl = curriculumClassifyVO.getClassifyUrl();
+        this.classifyDesc = curriculumClassifyVO.getClassifyDesc();
+    }
+
+    public CurriculumClassifyVO buildCurriculumClassifyVO(){
+        return CurriculumClassifyVO.builder().id(id).name(name)
+                .oneCourseId(oneCourseId).twoCourseId(twoCourseId)
+                .classifyUrl(classifyUrl).classifyDesc(classifyDesc)
+                .createTime(createTime).updateTime(updateTime).build();
+    }
+
+}
+

release-service/src/main/java/com/mmc/csf/release/entity/curriculum/CurriculumInfoDO.java

 package com.mmc.csf.release.entity.curriculum;
 
 import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -22,23 +23,51 @@ public class CurriculumInfoDO implements Serializable {
     private static final long serialVersionUID = 140348746605431718L;
     
     private Integer id;
+
     /**
-     * 课程名称
+     * 1级课程分类ID
      */
-    private String curriculumName;
+    private Integer oneCourseId;
     /**
-     * 课程供应商（id），用户id
+     * 2级课程分类ID
      */
-    private Integer supplierId;
+    private Integer twoCourseId;
     /**
-     * 课程价格
+     * 课程名称
      */
-    private BigDecimal curriculumPrice;
+    private String curriculumName;
     /**
      * 课程简介
      */
     private String curriculumDesc;
-
+    /**
+     * 课程封面
+     */
+    private String surfaceUrl;
+    /**
+     * 课程视频
+     */
+    private String videoUrl;
+    /**
+     * 课程属性
+     */
+    private Integer courseAttribute;
+    /**
+     * 课程所需金额
+     */
+    private BigDecimal requireAmout;
+    /**
+     * 课程所需积分
+     */
+    private Integer requireIntegral;
+    /**
+     * 课程是否热门 0：否 1：是
+     */
+    private Integer isHot;
+    /**
+     * 课程详情
+     */
+    private String detailContent;
     /**
      * 创建时间
      */
@@ -52,32 +81,30 @@ public class CurriculumInfoDO implements Serializable {
      */
     private Integer deleted;
 
-    private String videoUrl;
-
-    private String surfaceUrl;
-
-    private String detailContent;
-
-    /**
-     * 课程类型id
-     */
-    private Integer categoriesId;
 
     public CurriculumInfoDO(CurriculumInfoVO curriculumInfoVO) {
         this.id = curriculumInfoVO.getId();
+        this.oneCourseId = curriculumInfoVO.getOneCourseId();
+        this.twoCourseId = curriculumInfoVO.getTwoCourseId();
         this.curriculumName = curriculumInfoVO.getCurriculumName();
         this.curriculumDesc = curriculumInfoVO.getCurriculumDesc();
         this.surfaceUrl = curriculumInfoVO.getSurfaceUrl();
-        this.detailContent = curriculumInfoVO.getDetailContent();
         this.videoUrl = curriculumInfoVO.getVideoUrl();
-        this.categoriesId = curriculumInfoVO.getCategoriesId();
+        this.courseAttribute = curriculumInfoVO.getCourseAttribute();
+        this.requireAmout = curriculumInfoVO.getRequireAmout();
+        this.requireIntegral = curriculumInfoVO.getRequireIntegral();
+        this.isHot = curriculumInfoVO.getIsHot();
+        this.detailContent = curriculumInfoVO.getDetailContent();
     }
 
     public CurriculumInfoVO buildCurriculumInfoVO(){
-        return CurriculumInfoVO.builder().id(id).curriculumDesc(curriculumDesc).price(curriculumPrice)
-                .supplierName("浙江科比特创新科技有限公司").curriculumName(curriculumName)
+        return CurriculumInfoVO.builder().id(id).curriculumDesc(curriculumDesc)
+                .curriculumName(curriculumName)
                 .videoUrl(videoUrl).surfaceUrl(this.surfaceUrl).detailContent(this.detailContent)
-                .categoriesId(this.categoriesId).build();
+                .requireAmout(this.requireAmout).courseAttribute(courseAttribute)
+                .requireIntegral(this.requireIntegral).isHot(this.isHot)
+                .oneCourseId(this.oneCourseId).twoCourseId(this.twoCourseId)
+                .createTime(createTime).updateTime(updateTime).build();
     }
 
 }

release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java

@@ -2,7 +2,9 @@ package com.mmc.csf.release.service;
 
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO;
 import com.mmc.csf.release.flyer.qo.CurriculumQo;
+import com.mmc.csf.release.flyer.vo.CurriculumClassifyVO;
 import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
 import com.mmc.csf.release.flyer.vo.RegistrationVO;
 
@@ -93,4 +95,32 @@ public interface FlyerTrainingService {
     int feignCountCurriculumInfo(Integer categoriesId);
 
     Integer getCurriculumCount();
+
+    /**
+     * 添加课程分类
+     *
+     * @param curriculumClassify
+     */
+    Integer addCurriculumClassify(CurriculumClassifyVO curriculumClassify);
+
+    /**
+     * 修改课程分类
+     *
+     * @param curriculumClassify
+     */
+    Integer updateCurriculumClassify(CurriculumClassifyVO curriculumClassify);
+
+    /**
+     * 删除课程分类
+     *
+     * @param oneCourseId 1级课程分类
+     * @param twoCourseId 2级课程分类
+     */
+    Integer removeCurriculumClassify(Integer oneCourseId, Integer twoCourseId);
+
+    /**
+     * 查询所有的课程分类
+     * @return
+     */
+    ResultBody selectCurriculumClassify();
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -8,6 +8,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO;
+import com.mmc.csf.release.flyer.vo.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,10 +24,6 @@ import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.flyer.dto.AllCategoryDTO;
 import com.mmc.csf.release.flyer.dto.CategoriesInfoListDTO;
 import com.mmc.csf.release.flyer.qo.CurriculumQo;
-import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
-import com.mmc.csf.release.flyer.vo.DronePilotLicenseVO;
-import com.mmc.csf.release.flyer.vo.FlightSkillsVO;
-import com.mmc.csf.release.flyer.vo.RegistrationVO;
 import com.mmc.csf.release.service.FlyerTrainingService;
 
 /**
@@ -39,9 +37,6 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
     @Resource
     private FlyerTrainingDao flyerTrainingDao;
 
-    @Autowired
-    private PmsAppApi pmsAppApi;
-
     @Override
     public ResultBody pilotRegistration(RegistrationVO registrationVO, Integer userAccountId) {
         PilotRegistrationDO pilotRegistrationDO = new PilotRegistrationDO(registrationVO);
@@ -88,10 +83,6 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
 
     @Override
     public PageResult queryCurriculumInfoList(CurriculumQo curriculumQo) {
-        Integer SZ = 440300;
-        if (curriculumQo.getProvinceCode() != null && !curriculumQo.getProvinceCode().equals(SZ)) {
-            return PageResult.buildPage(curriculumQo.getPageNo(), curriculumQo.getPageSize(), 0);
-        }
         int count = flyerTrainingDao.countCurriculumInfoList(curriculumQo);
         if (count == 0) {
             return PageResult.buildPage(curriculumQo.getPageNo(), curriculumQo.getPageSize(), count);
@@ -99,22 +90,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         Integer pageNo = curriculumQo.getPageNo();
         curriculumQo.buildCurrentPage();
         List<CurriculumInfoDO> curriculumList = flyerTrainingDao.listPageCurriculumInfo(curriculumQo);
-        List<AllCategoryDTO> allCategoryDTOS = pmsAppApi.feignQqueryCategoryInfoByType(3);
         List<CurriculumInfoVO> list = curriculumList.stream().map(CurriculumInfoDO::buildCurriculumInfoVO).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(allCategoryDTOS)) {
-            list.stream().forEach(curriculumInfoVO -> {
-                allCategoryDTOS.stream().forEach(directory -> {
-                    if (CollectionUtils.isNotEmpty(directory.getCategoriesInfoListDTO())) {
-                        directory.getCategoriesInfoListDTO().stream().forEach(category -> {
-                            if (curriculumInfoVO.getCategoriesId().equals(category.getId())) {
-                                curriculumInfoVO.setDirectoryName(directory.getName());
-                                curriculumInfoVO.setCategoriesName(category.getName());
-                            }
-                        });
-                    }
-                });
-            });
-        }
         return PageResult.buildPage(pageNo, curriculumQo.getPageSize(), count, list);
     }
 
@@ -139,18 +115,6 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
             return ResultBody.error("课程不存在或已下架！");
         } else {
             CurriculumInfoVO curriculumInfoVO = curriculumInfoDO.buildCurriculumInfoVO();
-            List<AllCategoryDTO> allCategoryDTOS = pmsAppApi.feignQqueryCategoryInfoByType(3);
-            for (AllCategoryDTO directory : allCategoryDTOS) {
-                if (CollectionUtils.isNotEmpty(directory.getCategoriesInfoListDTO())) {
-                    for (CategoriesInfoListDTO category : directory.getCategoriesInfoListDTO()) {
-                        if (curriculumInfoVO.getCategoriesId().equals(category.getId())) {
-                            curriculumInfoVO.setDirectoryName(directory.getName());
-                            curriculumInfoVO.setCategoriesName(category.getName());
-                            break;
-                        }
-                    }
-                }
-            }
             return ResultBody.success(curriculumInfoVO);
         }
     }
@@ -158,8 +122,6 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
     @Override
     public Integer addCurriculum(CurriculumInfoVO curriculumInfoVO) {
         CurriculumInfoDO currInfoDO = new CurriculumInfoDO(curriculumInfoVO);
-        // TODO Auto-generated method stub 暂时先设置科比特单位ID
-        currInfoDO.setSupplierId(1);
         return flyerTrainingDao.addCurriculum(currInfoDO);
     }
 
@@ -184,7 +146,6 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
     @Override
     public List<CurriculumInfoVO> feignCurriculumInfoList(Integer categoriesId) {
         CurriculumQo curriculumQo = new CurriculumQo();
-        curriculumQo.setCategoriesId(categoriesId);
         curriculumQo.setPageNo(1);
         curriculumQo.setPageSize(Integer.MAX_VALUE);
         int count = flyerTrainingDao.countCurriculumInfoList(curriculumQo);
@@ -208,4 +169,37 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
     public Integer getCurriculumCount() {
         return flyerTrainingDao.getCurriculumCount();
     }
+
+    @Override
+    public Integer addCurriculumClassify(CurriculumClassifyVO curriculumClassify) {
+        CurriculumClassifyDO curriculumClassifyDO = new CurriculumClassifyDO(curriculumClassify);
+        Integer count;
+        if(curriculumClassifyDO.getTwoCourseId() == null){
+            count = flyerTrainingDao.countOneCourseClassify();
+            curriculumClassifyDO.setOneCourseId(count + 1);
+        } else {
+            count = flyerTrainingDao.countTwoCourseClassify(curriculumClassify.getOneCourseId());
+            curriculumClassifyDO.setTwoCourseId(count + 1);
+        }
+        return flyerTrainingDao.addCurriculumClassify(curriculumClassifyDO);
+    }
+
+    @Override
+    public Integer updateCurriculumClassify(CurriculumClassifyVO curriculumClassify) {
+        CurriculumClassifyDO curriculumClassifyDO = new CurriculumClassifyDO(curriculumClassify);
+        return flyerTrainingDao.updateCurriculumClassify(curriculumClassifyDO);
+    }
+
+    @Override
+    public Integer removeCurriculumClassify(Integer oneCourseId, Integer twoCourseId) {
+        return flyerTrainingDao.removeCurriculumClassify(oneCourseId, twoCourseId);
+    }
+
+    @Override
+    public ResultBody selectCurriculumClassify() {
+        flyerTrainingDao.selectCurriculumClassify();
+        List<CurriculumClassifyDO> curriculumClassifyList = flyerTrainingDao.selectCurriculumClassify();
+        List<CurriculumClassifyVO> collect = curriculumClassifyList.stream().map(CurriculumClassifyDO::buildCurriculumClassifyVO).collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
 }

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -27,39 +27,53 @@
 
     <insert id="addCurriculum" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
-        INSERT INTO `curriculum_info`(`curriculum_name`, `supplier_id`, `curriculum_desc`, `drone_pilot_license_id`,
-                                      `flight_skills`, `categories_id`, `surface_url`, `video_url`, `detail_content`)
-        VALUES (#{curriculumName}, #{supplierId}, #{curriculumDesc}, #{dronePilotLicenseId}, #{flightSkills},
-                #{categoriesId}, #{surfaceUrl}, #{videoUrl}, #{detailContent});
+        INSERT INTO `curriculum_info`(`one_course_id`, `two_course_id`, `curriculum_name`, `curriculum_desc`,
+                                      `surface_url`, `video_url`, `course_attribute`, `require_amout`, `require_integral`, `is_hot`, `detail_content`)
+        VALUES (#{oneCourseId}, #{twoCourseId}, #{curriculumName}, #{curriculumDesc}, #{surfaceUrl},
+                #{videoUrl}, #{courseAttribute}, #{requireAmout}, #{requireIntegral}, #{isHot}, #{detailContent});
+    </insert>
+    <insert id="addCurriculumClassify" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO">
+        INSERT INTO `course_classify`(`name`, `one_course_id`, `two_course_id`, `classify_url`, `classify_desc`)
+        VALUES (#{name}, #{oneCourseId}, #{twoCourseId}, #{classifyUrl}, #{classifyDesc});
     </insert>
 
     <update id="updateCurriculum" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
         UPDATE curriculum_info
         <set>
+            <if test="oneCourseId != null">
+                one_course_id = #{oneCourseId},
+            </if>
+            <if test="twoCourseId != null">
+                two_course_id = #{twoCourseId},
+            </if>
             <if test="curriculumName != null">
                 curriculum_name = #{curriculumName},
             </if>
             <if test="curriculumDesc != null">
                 curriculum_desc = #{curriculumDesc},
             </if>
-            <if test="dronePilotLicenseId != null">
-                drone_pilot_license_id = #{dronePilotLicenseId},
-            </if>
-            <if test="flightSkills != null">
-                flight_skills = #{flightSkills},
-            </if>
-            <if test="categoriesId != null">
-                categories_id = #{categoriesId},
-            </if>
             <if test="surfaceUrl != null">
                 surface_url = #{surfaceUrl},
             </if>
             <if test="videoUrl != null">
                 video_url = #{videoUrl},
             </if>
-            <if test="detailContent ">
+            <if test="courseAttribute != null">
+                course_attribute = #{courseAttribute},
+            </if>
+            <if test="requireAmout != null">
+                require_amout = #{requireAmout},
+            </if>
+            <if test="requireIntegral != null">
+                require_integral = #{requireIntegral},
+            </if>
+            <if test="isHot != null">
+                is_hot = #{isHot},
+            </if>
+            <if test="detailContent != null ">
                 detail_content = #{detailContent},
             </if>
+            update_time = NOW()
         </set>
         <where>
             id = #{id}
@@ -71,6 +85,39 @@
         set is_deleted = 1
         where id = #{id}
     </update>
+    <update id="updateCurriculumClassify" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO">
+        UPDATE course_classify
+        <set>
+            <if test="name != null">
+                name = #{name},
+            </if>
+            <if test="classifyUrl != null">
+                classify_url = #{classifyUrl},
+            </if>
+            <if test="classifyDesc != null">
+                classify_desc = #{classifyDesc},
+            </if>
+            update_time = NOW()
+        </set>
+        <where>
+            one_course_id = #{oneCourseId}
+            <if test="twoCourseId != null">
+                and two_course_id = #{twoCourseId}
+            </if>
+        </where>
+    </update>
+    <update id="removeCurriculumClassify">
+        UPDATE course_classify
+        <set>
+            is_deleted = 1
+        </set>
+        <where>
+            one_course_id = #{oneCourseId}
+            <if test="twoCourseId != null">
+                and two_course_id = #{twoCourseId}
+            </if>
+        </where>
+    </update>
     <select id="selectAllLicenses" resultType="com.mmc.csf.release.flyer.vo.DronePilotLicenseVO">
         select id,
                parent_id,
@@ -96,42 +143,33 @@
             <if test="curriculumName != null">
                 and ci.curriculum_name like CONCAT("%", #{curriculumName}, "%")
             </if>
-            <if test="licenseId != null">
-                and ci.drone_pilot_license_id = #{licenseId}
+            <if test="oneCourseId != null">
+                and ci.one_course_id = #{oneCourseId}
+            </if>
+            <if test="twoCourseId != null">
+                and ci.two_course_id = #{twoCourseId}
             </if>
-            <if test="flightSkillsId != null">
-                and ci.flight_skills = #{flightSkillsId}
+            <if test="courseAttribute != null">
+                and ci.course_attribute = #{courseAttribute}
             </if>
         </where>
     </select>
     <select id="listPageCurriculumInfo" resultType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
-        SELECT
-        ci.id,
-        ci.curriculum_name,
-        ci.supplier_id,
-        ci.curriculum_price,
-        ci.curriculum_desc,
-        ci.is_free free,
-        ci.drone_pilot_license_id,
-        ci.flight_skills,
-        ci.detail_content,
-        ci.video_url,
-        ci.categories_id,
-        ci.surface_url
+        SELECT *
         from curriculum_info ci
         <where>
             and ci.is_deleted = 0
             <if test="curriculumName != null">
                 and ci.curriculum_name like CONCAT("%", #{curriculumName}, "%")
             </if>
-            <if test="licenseId != null">
-                and drone_pilot_license_id = #{licenseId}
+            <if test="oneCourseId != null">
+                and ci.one_course_id = #{oneCourseId}
             </if>
-            <if test="flightSkillsId != null">
-                and flight_skills = #{flightSkillsId}
+            <if test="twoCourseId != null">
+                and ci.two_course_id = #{twoCourseId}
             </if>
-            <if test="categoriesId != null">
-                and categories_id = #{categoriesId}
+            <if test="courseAttribute != null">
+                and ci.course_attribute = #{courseAttribute}
             </if>
         </where>
         order by ci.create_time desc
@@ -204,4 +242,19 @@
         from curriculum_info
         where is_deleted = 0
     </select>
+    <select id="countOneCourseClassify" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM course_classify
+        WHERE two_course_id IS NULL
+    </select>
+    <select id="countTwoCourseClassify" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM course_classify
+        WHERE two_course_id = #{two_course_id}
+    </select>
+    <select id="selectCurriculumClassify"
+            resultType="com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO">
+        select * from course_classify
+        where is_deleted = 0
+    </select>
 </mapper>