Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -0,0 +1,19 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.entity.HereWhite;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * (RongyunHereWhite)表数据库访问层
+ *
+ * @author zx
+ * @since 2022-06-13 18:16:23
+ */
+public interface RongyunHereWhiteDao extends BaseMapper<HereWhite> {
+
+    HereWhite findByCourseScheduleIdLock(@Param("courseScheduleId") Integer courseScheduleId);
+
+    HereWhite findByCourseScheduleId(@Param("courseScheduleId") Integer courseScheduleId);
+}
+

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

@@ -0,0 +1,179 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (RongyunHereWhite)表实体类
+ *
+ * @author zx
+ * @since 2022-06-13 18:16:23
+ */
+@ApiModel(value = "rongyun_here_white-${tableInfo.comment}")
+public class HereWhite implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "白板id，")
+    private Integer id;
+
+    @TableField("course_schedule_id_")
+    @ApiModelProperty(value = "对应课程编号")
+    private Integer courseScheduleId;
+
+    @TableField("name_")
+    @ApiModelProperty(value = "白板名称")
+    private String name;
+
+    @TableField("limit_")
+    @ApiModelProperty(value = "${column.comment}")
+    private Integer limit;
+
+    @TableField("team_id_")
+    @ApiModelProperty(value = "${column.comment}")
+    private Integer teamId;
+
+    @TableField("admin_id_")
+    @ApiModelProperty(value = "${column.comment}")
+    private Integer adminId;
+
+    @TableField("mode_")
+    @ApiModelProperty(value = "${column.comment}")
+    private String mode;
+
+    @TableField("template_")
+    @ApiModelProperty(value = "${column.comment}")
+    private String template;
+
+    @TableField("region_")
+    @ApiModelProperty(value = "${column.comment}")
+    private String region;
+
+    @TableField("room_token_")
+    @ApiModelProperty(value = "${column.comment}")
+    private String roomToken;
+
+    @TableField("uuid_")
+    @ApiModelProperty(value = "${column.comment}")
+    private String uuid;
+
+    @TableField("updated_at_")
+    @ApiModelProperty(value = "${column.comment}")
+    private Date updatedAt;
+
+    @TableField("created_at_")
+    @ApiModelProperty(value = "${column.comment}")
+    private Date createdAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Integer courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getTeamId() {
+        return teamId;
+    }
+
+    public void setTeamId(Integer teamId) {
+        this.teamId = teamId;
+    }
+
+    public Integer getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Integer adminId) {
+        this.adminId = adminId;
+    }
+
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    public String getTemplate() {
+        return template;
+    }
+
+    public void setTemplate(String template) {
+        this.template = template;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRoomToken() {
+        return roomToken;
+    }
+
+    public void setRoomToken(String roomToken) {
+        this.roomToken = roomToken;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+}
+

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

@@ -0,0 +1,19 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dao.RongyunHereWhiteDao;
+import com.yonge.cooleshow.biz.dal.entity.HereWhite;
+
+/**
+ * (RongyunHereWhite)表服务接口
+ *
+ * @author zx
+ * @since 2022-06-13 18:16:24
+ */
+public interface RongyunHereWhiteService extends IService<HereWhite> {
+
+    RongyunHereWhiteDao getDao();
+
+    HereWhite create(String name, Integer userNum, Integer courseScheduleId) throws Exception;
+}
+

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

@@ -0,0 +1,84 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.RongyunHereWhiteDao;
+import com.yonge.cooleshow.biz.dal.entity.HereWhite;
+import com.yonge.cooleshow.biz.dal.service.RongyunHereWhiteService;
+import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.utils.http.HttpUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+
+/**
+ * (RongyunHereWhite)表服务实现类
+ *
+ * @author zx
+ * @since 2022-06-13 18:16:24
+ */
+@Service("rongyunHereWhiteService")
+public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao, HereWhite> implements RongyunHereWhiteService {
+
+    private final static Logger log = LoggerFactory.getLogger(RongyunHereWhiteServiceImpl.class);
+
+    @Value("${cn.rongcloud.hereWhite.url}")
+    private String hereWhiteUrl;
+    @Value("${cn.rongcloud.hereWhite.token}")
+    private String hereWhiteToken;
+
+    @Override
+    public RongyunHereWhiteDao getDao() {
+        return this.baseMapper;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HereWhite create(String name, Integer userNum, Integer courseScheduleId) throws Exception {
+        log.error("create HereWhite name:{},userNum:{},courseScheduleId:{}",name,userNum,courseScheduleId);
+        JSONObject json = new JSONObject();
+        json.put("name",name);
+        json.put("limit",userNum);
+        json.put("mode","persistent");
+        String url = "/room?token=" + hereWhiteToken;
+        JSONObject jsonObject = JSONObject.parseObject(requestParam(json, url));
+        if(jsonObject.getString("code").equals("200")){
+            HereWhite hereWhite = this.getDao().findByCourseScheduleIdLock(courseScheduleId);
+            if(hereWhite == null){
+                JSONObject room = jsonObject.getJSONObject("msg").getJSONObject("room");
+                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);
+                baseMapper.insert(hereWhite);
+            }
+            return hereWhite;
+        }else {
+            throw new BizException(jsonObject.getString("msg"));
+        }
+    }
+
+    private String requestParam(JSONObject json,String url) throws Exception {
+        Map<String, String> headers = new HashMap<>(1);
+        headers.put("Content-Type","application/json");
+        return HttpUtil.postForHttps(hereWhiteUrl + url, json.toJSONString(), headers);
+    }
+
+}
+

cooleshow-user/user-biz/src/main/resources/config/mybatis/RongyunHereWhiteMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.RongyunHereWhiteDao">
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.HereWhite">
+        <id column="id_" jdbcType="INTEGER" property="id"/>
+        <result column="course_schedule_id_" jdbcType="INTEGER" property="courseScheduleId"/>
+        <result column="name_" jdbcType="VARCHAR" property="name"/>
+        <result column="limit_" jdbcType="INTEGER" property="limit"/>
+        <result column="team_id_" jdbcType="INTEGER" property="teamId"/>
+        <result column="admin_id_" jdbcType="INTEGER" property="adminId"/>
+        <result column="mode_" jdbcType="VARCHAR" property="mode"/>
+        <result column="template_" jdbcType="VARCHAR" property="template"/>
+        <result column="region_" jdbcType="VARCHAR" property="region"/>
+        <result column="room_token_" jdbcType="VARCHAR" property="roomToken"/>
+        <result column="uuid_" jdbcType="VARCHAR" property="uuid"/>
+        <result column="updated_at_" jdbcType="TIMESTAMP" property="updatedAt"/>
+        <result column="created_at_" jdbcType="TIMESTAMP" property="createdAt"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id_ , course_schedule_id_, name_, limit_, team_id_, admin_id_, mode_, template_, region_, room_token_, uuid_, updated_at_, created_at_
+    </sql>
+    <select id="findByCourseScheduleId" resultMap="BaseResultMap">
+        SELECT * FROM rongyun_here_white WHERE course_schedule_id_ = #{courseScheduleId} LIMIT 1
+    </select>
+    <select id="findByCourseScheduleIdLock" resultMap="BaseResultMap">
+        SELECT * FROM rongyun_here_white WHERE course_schedule_id_ = #{courseScheduleId} LIMIT 1 FOR UPDATE
+    </select>
+</mapper>

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

@@ -0,0 +1,48 @@
+package com.yonge.cooleshow.classroom.controller;
+
+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 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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/hereWhite")
+public class HereWhiteController extends BaseController {
+
+    @Autowired
+    private RongyunHereWhiteService hereWhiteService;
+
+    /**
+     * 创建白板，默认全部采用零时白板
+     * @param name 白板名称
+     * @param userNum 白板人数上限，0不限制
+     * @param courseScheduleId 课程编号
+     * @return
+     * @throws Exception
+     */
+    @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));
+    }
+
+    /**
+     * 获取特定白板详情
+     * @param courseScheduleId 课程编号
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value = "get")
+    public HttpResponseResult<HereWhite> join(Integer courseScheduleId){
+        return succeed(hereWhiteService.getDao().findByCourseScheduleId(courseScheduleId));
+    }
+
+}