课程调整

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -1,11 +1,19 @@
 package com.yunzhi.marketing.xlk.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
+import com.yunzhi.marketing.xlk.entity.Brand;
+import com.yunzhi.marketing.xlk.entity.Video;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +27,7 @@ import com.yunzhi.marketing.xlk.entity.Curriculum;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -33,7 +42,7 @@ import javax.servlet.http.HttpServletRequest;
 @Api(value = "课程表", tags = "xlk-课程表")
 public class CurriculumController extends BaseController {
 
-    private final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CurriculumController.class);
+    private final Logger logger = LoggerFactory.getLogger(CurriculumController.class);
 
     @Autowired
     public ICurriculumService iCurriculumService;
@@ -46,7 +55,7 @@ public class CurriculumController extends BaseController {
      * @return
      */
     @ApiOperation(value = "查询课程表列表", notes = "查询课程表列表")
-    @RequestMapping(value="/curriculum",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/curriculum",method= RequestMethod.GET)
     public ResponseBean curriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestHeader("authorization") String token, HttpServletRequest request){
@@ -54,8 +63,9 @@ public class CurriculumController extends BaseController {
         try {
             //使用分页插件
 		    IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
-            com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<Curriculum> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.orderByDesc(Curriculum::getWeight);
+            queryWrapper.orderByDesc(Curriculum::getCreatedTime);
 
             IPage<Curriculum> result = iCurriculumService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -69,15 +79,20 @@ public class CurriculumController extends BaseController {
 
     /**
      * 保存对象
-     * @param curriculum 实体对象
+     * @param curriculumDTO 实体对象
      * @return
      */
     @ApiOperation(value = "新增课程表", notes = "新增课程表")
-    @RequestMapping(value="/curriculum",method= RequestMethod.POST)
-    public ResponseBean curriculumAdd(@RequestBody Curriculum curriculum,
+    @RequestMapping(value="/admin/curriculum",method= RequestMethod.POST)
+    public ResponseBean curriculumAdd(@RequestBody CurriculumDTO curriculumDTO,
                                       @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Curriculum curriculum = new Curriculum();
+            BeanUtils.copyProperties(curriculumDTO,curriculum);
+            curriculum.setCreatedTime(LocalDateTime.now());
+            curriculum.setCreatedBy(getUserId(request));
+            curriculum.setOrgId(getOrgId(request));
             if (iCurriculumService.save(curriculum)){
                 responseBean.addSuccess(curriculum);
             }else {
@@ -97,8 +112,8 @@ public class CurriculumController extends BaseController {
      */
     @ApiOperation(value = "根据id删除课程表", notes = "根据id删除课程表")
     @ResponseBody
-    @RequestMapping(value="/curriculum/{id}", method= RequestMethod.DELETE)
-    public ResponseBean curriculumDelete(@PathVariable Integer id,
+    @RequestMapping(value="/admin/curriculum/{id}", method= RequestMethod.DELETE)
+    public ResponseBean curriculumDelete(@PathVariable String id,
                                          @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -118,16 +133,19 @@ public class CurriculumController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param curriculum 实体对象
+     * @param curriculumDTO 实体对象
      * @return
      */
     @ApiOperation(value = "根据id修改课程表", notes = "根据id修改课程表")
-    @RequestMapping(value="/curriculum/{id}",method= RequestMethod.PUT)
-    public ResponseBean curriculumUpdate(@PathVariable Integer id,
-                                        @RequestBody Curriculum curriculum,
+    @RequestMapping(value="/admin/curriculum/{id}",method= RequestMethod.PUT)
+    public ResponseBean curriculumUpdate(@PathVariable String id,
+                                        @RequestBody CurriculumDTO curriculumDTO,
                                          @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Curriculum curriculum = new Curriculum();
+            BeanUtils.copyProperties(curriculumDTO,curriculum);
+            curriculum.setCurriculumId(id);
             if (iCurriculumService.updateById(curriculum)){
                 responseBean.addSuccess(curriculum);
             }else {
@@ -146,8 +164,8 @@ public class CurriculumController extends BaseController {
      * @param id  实体ID
      */
     @ApiOperation(value = "根据id查询课程表详情", notes = "根据id查询课程表详情")
-    @RequestMapping(value="/curriculum/{id}",method= RequestMethod.GET)
-    public ResponseBean curriculumGet(@PathVariable Integer id,
+    @RequestMapping(value="/admin/curriculum/{id}",method= RequestMethod.GET)
+    public ResponseBean curriculumGet(@PathVariable String id,
                                       @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -67,6 +67,7 @@ public class VideoController extends BaseController {
             LambdaQueryWrapper<Video> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(name),Video::getName,name);
             queryWrapper.eq(Video::getOrgId,getOrgId(request));
+            queryWrapper.orderByDesc(Video::getWeight);
             queryWrapper.orderByDesc(Video::getCreatedTime);
 
             IPage<Video> result = iVideoService.page(pg, queryWrapper);

src/main/java/com/yunzhi/marketing/xlk/dto/CurriculumDTO.java

@@ -0,0 +1,67 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 课程表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_curriculum")
+public class CurriculumDTO implements java.io.Serializable {
+
+    /**
+     * 参与对象
+     */
+    private String roleId;
+
+    /**
+     * 主图
+     */
+    private String curriculumImg;
+
+    /**
+     * 标题
+     */
+    private String name;
+
+    /**
+     * 简介
+     */
+    private String remark;
+
+    /**
+     * 详情类型：0富文本或者1视频
+     */
+    private Integer type;
+
+    /**
+     * 视频地址
+     */
+    private String curriculumUrl;
+
+    /**
+     * 富文本内容
+     */
+    private String content;
+
+    /**
+     * 权重
+     */
+    @TableField("WEIGHT")
+    private Integer weight;
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java

@@ -30,13 +30,13 @@ public class Curriculum implements java.io.Serializable {
      * 主键
      */
     @TableId(type = IdType.UUID)
-    private Integer curriculumId;
+    private String curriculumId;
 
     /**
      * 创建人
      */
     @TableField("CREATED_BY")
-    private String createdBy;
+    private Integer createdBy;
 
     /**
      * 创建时间
@@ -106,12 +106,12 @@ public class Curriculum implements java.io.Serializable {
     /**
      * 阅读人数
      */
-    private Integer lookNum;
+    private Integer lookNum = 0;
 
     /**
      * 是否发布
      */
-    private Integer isPublish;
+    private Integer isPublish = 0;
 
 
 }