Merge remote-tracking branch 'origin/master'

mec-im/src/main/java/com/ym/controller/HereWhiteController.java

@@ -2,6 +2,7 @@ package com.ym.controller;
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.service.HereWhiteService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -18,23 +19,27 @@ public class HereWhiteController  extends BaseController {
      * 创建白板，默认全部采用零时白板
      * @param name 白板名称
      * @param userNum 白板人数上限，0不限制
+     * @param courseScheduleId 课程编号
      * @return
      * @throws Exception
      */
     @RequestMapping(value = "create", method = RequestMethod.POST)
-    public Object userAdd(String name,Integer userNum) throws Exception {
-        return hereWhiteService.create(name, userNum);
+    public Object 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));
     }
 
     /**
-     * 获取特定白板 room Token
-     * @param courseScheduleId
+     * 获取特定白板详情
+     * @param courseScheduleId 课程编号
      * @return
      * @throws Exception
      */
-    @RequestMapping(value = "join", method = RequestMethod.POST)
-    public Object join(Integer courseScheduleId) throws Exception {
-        return succeed(hereWhiteService.join(courseScheduleId));
+    @RequestMapping(value = "get", method = RequestMethod.GET)
+    public Object join(Integer courseScheduleId){
+        return succeed(hereWhiteService.getByClassId(courseScheduleId));
     }
 
 }

mec-im/src/main/java/com/ym/dao/HereWhiteDao.java

@@ -8,4 +8,6 @@ import org.springframework.stereotype.Repository;
 public interface HereWhiteDao extends JpaRepository<HereWhite, Long> {
 
     HereWhite findById(Integer id);
+
+    HereWhite findByCourseScheduleId(Integer id);
 }

mec-im/src/main/java/com/ym/pojo/HereWhite.java

@@ -17,18 +17,32 @@ public class HereWhite implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Getter @Setter
+    @Column(name = "id_")
     private Integer id;
 
+    @Column(name = "course_schedule_id_")
+    private @Getter @Setter int courseScheduleId;
+    @Column(name = "name_")
     private @Getter @Setter String name;
+    @Column(name = "limit_")
     private @Getter @Setter int limit;
+    @Column(name = "team_id_")
     private @Getter @Setter int teamId;
+    @Column(name = "admin_id_")
     private @Getter @Setter int adminId;
+    @Column(name = "mode_")
     private @Getter @Setter String mode;
+    @Column(name = "template_")
     private @Getter @Setter String template;
+    @Column(name = "region_")
     private @Getter @Setter String region;
+    @Column(name = "uuid_")
     private @Getter @Setter String uuid;
+    @Column(name = "room_token_")
     private @Getter @Setter String roomToken;
+    @Column(name = "updated_at_")
     private @Getter @Setter Date updatedAt;
+    @Column(name = "created_at_")
     private @Getter @Setter Date createdAt;
+
 }

mec-im/src/main/java/com/ym/service/HereWhiteService.java

@@ -12,12 +12,12 @@ public interface HereWhiteService {
      * @param userNum
      * @return
      */
-    String create(String name,Integer userNum) throws Exception;
+    HereWhite create(String name,Integer userNum,Integer courseScheduleId) throws Exception;
 
     /**
-     * 获取特定白板 room Token
+     * 获取白板详情
      * @param courseScheduleId
      * @return
      */
-    HereWhite join(Integer courseScheduleId) throws Exception;
+    HereWhite getByClassId(Integer courseScheduleId);
 }

mec-im/src/main/java/com/ym/service/Impl/HereWhiteServiceImpl.java

@@ -8,7 +8,9 @@ import com.ym.service.HereWhiteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,13 +26,39 @@ public class HereWhiteServiceImpl implements HereWhiteService {
     private HereWhiteDao hereWhiteDao;
 
     @Override
-    public String create(String name, Integer userNum) throws Exception {
+    @Transactional(rollbackFor = Exception.class)
+    public HereWhite create(String name, Integer userNum,Integer courseScheduleId) throws Exception {
         JSONObject json = new JSONObject();
         json.put("name",name);
         json.put("limit",userNum);
         json.put("mode","transitory");
         String url = "/room?token=" + hereWhiteToken;
-        return requestParam(json,url);
+        JSONObject jsonObject = JSONObject.parseObject(requestParam(json, url));
+        if(jsonObject.getString("code").equals("200")){
+            JSONObject room = jsonObject.getJSONObject("msg").getJSONObject("room");
+            HereWhite hereWhite = new HereWhite();
+            Date date = new Date();
+            hereWhite.setCourseScheduleId(courseScheduleId);
+            hereWhite.setName(room.getString("name"));
+            hereWhite.setLimit(room.getInteger("limit"));
+            hereWhite.setTeamId(room.getInteger("teamId"));
+            hereWhite.setAdminId(room.getInteger("adminId"));
+            hereWhite.setMode(room.getString("mode"));
+            hereWhite.setTemplate(room.getString("template"));
+            hereWhite.setRegion(room.getString("region"));
+            hereWhite.setUuid(room.getString("uuid"));
+            hereWhite.setRoomToken(jsonObject.getJSONObject("msg").getString("roomToken"));
+            hereWhite.setUpdatedAt(date);
+            hereWhite.setCreatedAt(date);
+            return hereWhiteDao.save(hereWhite);
+        }else {
+            throw new Exception(jsonObject.getString("msg"));
+        }
+    }
+
+    @Override
+    public HereWhite getByClassId(Integer courseScheduleId) {
+        return hereWhiteDao.findByCourseScheduleId(courseScheduleId);
     }
 
     private String requestParam(JSONObject json,String url) throws Exception {
@@ -38,9 +66,4 @@ public class HereWhiteServiceImpl implements HereWhiteService {
         headers.put("Content-Type","application/json");
         return HttpUtil.postForHttps(hereWhiteUrl + url, json.toJSONString(), headers);
     }
-
-    @Override
-    public HereWhite join(Integer courseScheduleId) throws Exception {
-        return hereWhiteDao.findById(courseScheduleId);
-    }
 }