Jelajahi Sumber

网络教室

zouxuan 3 tahun lalu
induk
melakukan
0cf5e329cf

+ 2 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/RongyunHereWhiteDao.java

@@ -12,8 +12,8 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface RongyunHereWhiteDao extends BaseMapper<HereWhite> {
 
-    HereWhite findByCourseScheduleIdLock(@Param("courseScheduleId") Integer courseScheduleId);
+    HereWhite findByCourseScheduleIdLock(@Param("courseScheduleId") Long courseScheduleId);
 
-    HereWhite findByCourseScheduleId(@Param("courseScheduleId") Integer courseScheduleId);
+    HereWhite findByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
 }
 

+ 39 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/HereWhiteDto.java

@@ -0,0 +1,39 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class HereWhiteDto {
+
+    @ApiModelProperty(value = "课程编号")
+    private Long courseScheduleId;
+
+    @ApiModelProperty(value = "白板名称")
+    private String name;
+
+    @ApiModelProperty(value = "白板人数上限,0不限制")
+    private Integer userNum;
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getUserNum() {
+        return userNum;
+    }
+
+    public void setUserNum(Integer userNum) {
+        this.userNum = userNum;
+    }
+}

+ 3 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/HereWhite.java

@@ -24,7 +24,7 @@ public class HereWhite implements Serializable {
 
     @TableField("course_schedule_id_")
     @ApiModelProperty(value = "对应课程编号")
-    private Integer courseScheduleId;
+    private Long courseScheduleId;
 
     @TableField("name_")
     @ApiModelProperty(value = "白板名称")
@@ -79,11 +79,11 @@ public class HereWhite implements Serializable {
         this.id = id;
     }
 
-    public Integer getCourseScheduleId() {
+    public Long getCourseScheduleId() {
         return courseScheduleId;
     }
 
-    public void setCourseScheduleId(Integer courseScheduleId) {
+    public void setCourseScheduleId(Long courseScheduleId) {
         this.courseScheduleId = courseScheduleId;
     }
 

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/RongyunHereWhiteService.java

@@ -14,6 +14,6 @@ public interface RongyunHereWhiteService extends IService<HereWhite> {
 
     RongyunHereWhiteDao getDao();
 
-    HereWhite create(String name, Integer userNum, Integer courseScheduleId) throws Exception;
+    HereWhite create(String name, Integer userNum, Long courseScheduleId) throws Exception;
 }
 

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/RongyunHereWhiteServiceImpl.java

@@ -40,7 +40,7 @@ public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HereWhite create(String name, Integer userNum, Integer courseScheduleId) throws Exception {
+    public HereWhite create(String name, Integer userNum, Long courseScheduleId) throws Exception {
         log.error("create HereWhite name:{},userNum:{},courseScheduleId:{}",name,userNum,courseScheduleId);
         JSONObject json = new JSONObject();
         json.put("name",name);

+ 6 - 27
cooleshow-user/user-classroom/src/main/java/com/yonge/cooleshow/classroom/controller/HereWhiteController.java

@@ -1,13 +1,14 @@
 package com.yonge.cooleshow.classroom.controller;
 
+import com.yonge.cooleshow.biz.dal.dto.HereWhiteDto;
 import com.yonge.cooleshow.biz.dal.entity.HereWhite;
 import com.yonge.cooleshow.biz.dal.service.RongyunHereWhiteService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import org.apache.commons.lang3.StringUtils;
+import io.swagger.annotations.ApiOperation;
 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -18,31 +19,9 @@ public class HereWhiteController extends BaseController {
     @Autowired
     private RongyunHereWhiteService hereWhiteService;
 
-    /**
-     * 创建白板,默认全部采用零时白板
-     * @param name 白板名称
-     * @param userNum 白板人数上限,0不限制
-     * @param courseScheduleId 课程编号
-     * @return
-     * @throws Exception
-     */
+    @ApiOperation("创建白板,默认全部采用零时白板")
     @PostMapping(value = "create")
-    public HttpResponseResult<HereWhite> userAdd(String name, Integer userNum, Integer courseScheduleId) throws Exception {
-        if(StringUtils.isEmpty(name) || userNum == null || courseScheduleId == null){
-            return failed("参数校验失败");
-        }
-        return succeed(hereWhiteService.create(name, userNum,courseScheduleId));
+    public HttpResponseResult<HereWhite> userAdd(@RequestBody HereWhiteDto hereWhiteDto) throws Exception {
+        return succeed(hereWhiteService.create(hereWhiteDto.getName(), hereWhiteDto.getUserNum(),hereWhiteDto.getCourseScheduleId()));
     }
-
-    /**
-     * 获取特定白板详情
-     * @param courseScheduleId 课程编号
-     * @return
-     * @throws Exception
-     */
-    @GetMapping(value = "get")
-    public HttpResponseResult<HereWhite> join(Integer courseScheduleId){
-        return succeed(hereWhiteService.getDao().findByCourseScheduleId(courseScheduleId));
-    }
-
 }