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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ImNetworkHereWhiteDao.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.ImNetworkHereWhite;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * (RongyunHereWhite)表数据库访问层
+ *
+ * @author zx
+ * @since 2022-06-13 18:16:23
+ */
+public interface ImNetworkHereWhiteDao extends BaseMapper<ImNetworkHereWhite> {
+
+    ImNetworkHereWhite findByCourseScheduleIdLock(@Param("courseScheduleId") Long courseScheduleId);
+
+    ImNetworkHereWhite findByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
+}
+

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

@@ -1,19 +0,0 @@
-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/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;
+    }
+}

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

@@ -16,15 +16,15 @@ import java.util.Date;
  * @author zx
  * @since 2022-06-13 18:16:23
  */
-@ApiModel(value = "rongyun_here_white-${tableInfo.comment}")
-public class HereWhite implements Serializable {
+@ApiModel(value = "im_network_here_white")
+public class ImNetworkHereWhite implements Serializable {
     @TableId(value = "id_", type = IdType.AUTO)
     @ApiModelProperty(value = "白板id，")
     private Integer id;
 
     @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;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ImNetworkHereWhiteService.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.ImNetworkHereWhiteDao;
+import com.yonge.cooleshow.biz.dal.entity.ImNetworkHereWhite;
+
+/**
+ * (RongyunHereWhite)表服务接口
+ *
+ * @author zx
+ * @since 2022-06-13 18:16:24
+ */
+public interface ImNetworkHereWhiteService extends IService<ImNetworkHereWhite> {
+
+    ImNetworkHereWhiteDao getDao();
+
+    ImNetworkHereWhite create(String name, Integer userNum, Long courseScheduleId) throws Exception;
+}
+

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

@@ -1,19 +0,0 @@
-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 → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkHereWhiteServiceImpl.java

@@ -2,9 +2,9 @@ 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.cooleshow.biz.dal.dao.ImNetworkHereWhiteDao;
+import com.yonge.cooleshow.biz.dal.entity.ImNetworkHereWhite;
+import com.yonge.cooleshow.biz.dal.service.ImNetworkHereWhiteService;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.utils.http.HttpUtil;
 import org.slf4j.Logger;
@@ -24,9 +24,9 @@ import java.util.Map;
  * @since 2022-06-13 18:16:24
  */
 @Service("rongyunHereWhiteService")
-public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao, HereWhite> implements RongyunHereWhiteService {
+public class ImNetworkHereWhiteServiceImpl extends ServiceImpl<ImNetworkHereWhiteDao, ImNetworkHereWhite> implements ImNetworkHereWhiteService {
 
-    private final static Logger log = LoggerFactory.getLogger(RongyunHereWhiteServiceImpl.class);
+    private final static Logger log = LoggerFactory.getLogger(ImNetworkHereWhiteServiceImpl.class);
 
     @Value("${cn.rongcloud.hereWhite.url}")
     private String hereWhiteUrl;
@@ -34,13 +34,13 @@ public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao
     private String hereWhiteToken;
 
     @Override
-    public RongyunHereWhiteDao getDao() {
+    public ImNetworkHereWhiteDao getDao() {
         return this.baseMapper;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HereWhite create(String name, Integer userNum, Integer courseScheduleId) throws Exception {
+    public ImNetworkHereWhite 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);
@@ -49,26 +49,26 @@ public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao
         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){
+            ImNetworkHereWhite imNetworkHereWhite = this.getDao().findByCourseScheduleIdLock(courseScheduleId);
+            if(imNetworkHereWhite == null){
                 JSONObject room = jsonObject.getJSONObject("msg").getJSONObject("room");
-                hereWhite = new HereWhite();
+                imNetworkHereWhite = new ImNetworkHereWhite();
                 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);
+                imNetworkHereWhite.setCourseScheduleId(courseScheduleId);
+                imNetworkHereWhite.setName(room.getString("name"));
+                imNetworkHereWhite.setLimit(room.getInteger("limit"));
+                imNetworkHereWhite.setTeamId(room.getInteger("teamId"));
+                imNetworkHereWhite.setAdminId(room.getInteger("adminId"));
+                imNetworkHereWhite.setMode(room.getString("mode"));
+                imNetworkHereWhite.setTemplate(room.getString("template"));
+                imNetworkHereWhite.setRegion(room.getString("region"));
+                imNetworkHereWhite.setUuid(room.getString("uuid"));
+                imNetworkHereWhite.setRoomToken(jsonObject.getJSONObject("msg").getString("roomToken"));
+                imNetworkHereWhite.setUpdatedAt(date);
+                imNetworkHereWhite.setCreatedAt(date);
+                baseMapper.insert(imNetworkHereWhite);
             }
-            return hereWhite;
+            return imNetworkHereWhite;
         }else {
             throw new BizException(jsonObject.getString("msg"));
         }

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

@@ -474,7 +474,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         imHelper.publishMessage(sysUser.getId().toString(),teacherId.toString(), deviceControl.getRoomId(), msg);
 
         //发送设备状态变更消息
-        this.sendDeviceStateChangedMessage(deviceControl, sysUser.getId(),100);
+        this.sendDeviceStateChangedMessage(deviceControl, sysUser.getId());
     }
 
     @Override
@@ -513,8 +513,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             imNetworkRoomMemberService.getDao().updateById(roomMember);
         }
         //发送设备状态同步消息
-        ImNetworkRoom room = baseMapper.findByRoomId(deviceStatusSync.getRoomId());
-        this.sendDeviceStateChangedMessage(deviceStatusSync,userId,room.getSoundVolume());
+        this.sendDeviceStateChangedMessage(deviceStatusSync,userId);
     }
 
     @Override
@@ -523,10 +522,11 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     }
 
     //发送设备状态同步消息
-    private void sendDeviceStateChangedMessage(ImNetworkDeviceControlDto deviceStatusSync,Long userId,Integer soundVolume) throws Exception {
+    private void sendDeviceStateChangedMessage(ImNetworkDeviceControlDto deviceStatusSync,Long userId) throws Exception {
+        ImNetworkRoom room = baseMapper.findByRoomId(deviceStatusSync.getRoomId());
         ImNetworkDeviceStateChangedMessage deviceResourceMessage = new ImNetworkDeviceStateChangedMessage(deviceStatusSync.getDeviceType().ordinal(),deviceStatusSync.getEnable());
         deviceResourceMessage.setUserId(userId.toString());
-        deviceResourceMessage.setSoundVolume(soundVolume);
+        deviceResourceMessage.setSoundVolume(room.getSoundVolume());
         imHelper.publishMessage(userId.toString(), deviceStatusSync.getRoomId(), deviceResourceMessage, 1);
     }
 
@@ -585,7 +585,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         ImNetworkRoom room = baseMapper.findByRoomId(roomId);
         String display = "";
         if (userRole == UserRoleEnum.TEACHER) {
-            display = "display://type=1?userId=" + userId + "?uri=";
+            display = "display://type=0?userId=" + userId + "?uri=";
         }
         if(Objects.isNull(room)){
             room = new ImNetworkRoom();
@@ -622,7 +622,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     public boolean isUserDisplay(String display, Long userId) {
         boolean result = false;
         if (!display.isEmpty() && display.contains("userId=" + userId)) {
-            if (display.contains("type=0") || display.contains("type=1") || display.contains("type=3")) {
+            if (display.contains("type=0") || display.contains("type=2")) {
                 result = true;
             }
         }

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

@@ -1,7 +1,7 @@
 <?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">
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ImNetworkHereWhiteDao">
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ImNetworkHereWhite">
         <id column="id_" jdbcType="INTEGER" property="id"/>
         <result column="course_schedule_id_" jdbcType="INTEGER" property="courseScheduleId"/>
         <result column="name_" jdbcType="VARCHAR" property="name"/>
@@ -21,9 +21,9 @@
         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 * FROM im_network_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 * FROM im_network_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

@@ -1,13 +1,14 @@
 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.biz.dal.dto.HereWhiteDto;
+import com.yonge.cooleshow.biz.dal.entity.ImNetworkHereWhite;
+import com.yonge.cooleshow.biz.dal.service.ImNetworkHereWhiteService;
 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;
 
@@ -16,33 +17,11 @@ import org.springframework.web.bind.annotation.RestController;
 public class HereWhiteController extends BaseController {
 
     @Autowired
-    private RongyunHereWhiteService hereWhiteService;
+    private ImNetworkHereWhiteService 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<ImNetworkHereWhite> 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));
-    }
-
 }