소스 검색

网络教室

zouxuan 3 년 전
부모
커밋
374a825840

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yonge.cooleshow.biz.dal.entity.HereWhite;
+import com.yonge.cooleshow.biz.dal.entity.ImNetWorkHereWhite;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -10,10 +10,10 @@ import org.apache.ibatis.annotations.Param;
  * @author zx
  * @since 2022-06-13 18:16:23
  */
-public interface RongyunHereWhiteDao extends BaseMapper<HereWhite> {
+public interface RongyunHereWhiteDao extends BaseMapper<ImNetWorkHereWhite> {
 
-    HereWhite findByCourseScheduleIdLock(@Param("courseScheduleId") Long courseScheduleId);
+    ImNetWorkHereWhite findByCourseScheduleIdLock(@Param("courseScheduleId") Long courseScheduleId);
 
-    HereWhite findByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
+    ImNetWorkHereWhite findByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
 }
 

+ 2 - 2
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,8 +16,8 @@ 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;

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

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

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

@@ -3,7 +3,7 @@ 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.entity.ImNetWorkHereWhite;
 import com.yonge.cooleshow.biz.dal.service.RongyunHereWhiteService;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.utils.http.HttpUtil;
@@ -24,7 +24,7 @@ import java.util.Map;
  * @since 2022-06-13 18:16:24
  */
 @Service("rongyunHereWhiteService")
-public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao, HereWhite> implements RongyunHereWhiteService {
+public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao, ImNetWorkHereWhite> implements RongyunHereWhiteService {
 
     private final static Logger log = LoggerFactory.getLogger(RongyunHereWhiteServiceImpl.class);
 
@@ -40,7 +40,7 @@ public class RongyunHereWhiteServiceImpl extends ServiceImpl<RongyunHereWhiteDao
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HereWhite create(String name, Integer userNum, Long 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"));
         }

+ 3 - 3
cooleshow-user/user-biz/src/main/resources/config/mybatis/RongyunHereWhiteMapper.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">
+    <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>

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

@@ -1,7 +1,7 @@
 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.entity.ImNetWorkHereWhite;
 import com.yonge.cooleshow.biz.dal.service.RongyunHereWhiteService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -21,7 +21,7 @@ public class HereWhiteController extends BaseController {
 
     @ApiOperation("创建白板,默认全部采用零时白板")
     @PostMapping(value = "create")
-    public HttpResponseResult<HereWhite> userAdd(@RequestBody HereWhiteDto hereWhiteDto) throws Exception {
+    public HttpResponseResult<ImNetWorkHereWhite> userAdd(@RequestBody HereWhiteDto hereWhiteDto) throws Exception {
         return succeed(hereWhiteService.create(hereWhiteDto.getName(), hereWhiteDto.getUserNum(),hereWhiteDto.getCourseScheduleId()));
     }
 }