提供管理后台使用接口，roomId更改了uuid

src/main/java/com/fdkankan/tk/TakeLookApplication.java

@@ -1,6 +1,9 @@
 package com.fdkankan.tk;
 
+import com.fdkankan.tk.common.util.RoomUtil;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
@@ -12,10 +15,17 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @ComponentScan(basePackages = {"com.fdkankan.*"})
 @MapperScan("com.fdkankan.**.mapper")
-public class TakeLookApplication {
+public class TakeLookApplication implements CommandLineRunner {
+
+    @Value("${spring.profiles.active}")
+    private String active;
 
     public static void main(String[] args) {
         SpringApplication.run(TakeLookApplication.class, args);
     }
 
+    @Override
+    public void run(String... args) throws Exception {
+        RoomUtil.ev = active;
+    }
 }

src/main/java/com/fdkankan/tk/common/util/RoomUtil.java

@@ -0,0 +1,19 @@
+package com.fdkankan.tk.common.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.UUID;
+
+public class RoomUtil {
+
+    public static String ev = null;
+
+    public static String genRoomId(){
+        String uuid = UUID.randomUUID().toString().replace("-","");
+        if(StringUtils.isBlank(ev)){
+            return "CS-"+uuid;
+        }
+        return ev+uuid;
+    }
+
+}

src/main/java/com/fdkankan/tk/controller/RoomController.java

@@ -27,14 +27,14 @@ public class RoomController extends BaseController{
      * 根据房间id获取详情
      */
     @GetMapping("/roomInfo")
-    public ResultData roomInfo(@RequestParam(required = false) Integer roomId){
+    public ResultData roomInfo(@RequestParam(required = false) String roomId){
         return ResultData.ok(roomService.getRoomInfo(roomId));
     }
     /**
      * 房间访问次数 +1
      */
     @GetMapping("/roomAddView")
-    public ResultData roomAddView(@RequestParam(required = false) Integer roomId){
+    public ResultData roomAddView(@RequestParam(required = false) String roomId){
         roomService.roomAddView(roomId);
         return ResultData.ok();
     }
@@ -69,7 +69,7 @@ public class RoomController extends BaseController{
      * type  follower  leader
      */
     @GetMapping("/roomGetShareCode")
-    public ResultData roomGetShareCode(@RequestParam(required = false) Integer roomId){
+    public ResultData roomGetShareCode(@RequestParam(required = false) String roomId){
         if(roomId == null){
             throw new BusinessException(ResultCode.PARAM_MISS);
         }
@@ -79,7 +79,7 @@ public class RoomController extends BaseController{
      * 获取分享二维码
      */
     @GetMapping("/roomGetHostCode")
-    public ResultData roomGetHostCode(@RequestParam(required = false) Integer roomId){
+    public ResultData roomGetHostCode(@RequestParam(required = false) String roomId){
         if(roomId == null){
             throw new BusinessException(ResultCode.PARAM_MISS);
         }
@@ -93,7 +93,7 @@ public class RoomController extends BaseController{
      */
     @GetMapping("/inOrOutRoom")
     public ResultData inOrOutRoom(@RequestParam(required = false) String role,
-                                  @RequestParam(required = false) Integer roomId,
+                                  @RequestParam(required = false) String roomId,
                                   @RequestParam(required = false) Integer type){
         roomService.inOrOutRoom(roomId,role,type);
         return ResultData.ok();

src/main/java/com/fdkankan/tk/entity/Room.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.tk.common.util.StringUtils;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -28,8 +30,8 @@ public class Room implements Serializable {
     /**
      * 房间id
      */
-    @TableId(value = "room_id", type = IdType.AUTO)
-    private Integer roomId;
+    @TableId(value = "room_id")
+    private String roomId;
 
     /**
      * 房间标题
@@ -99,4 +101,8 @@ public class Room implements Serializable {
     @TableField("last_look_time")
     private String lastLookTime;
 
+    //房间状态 ，0 不显示，1显示
+    @TableField("show")
+    private Integer show;
+
 }

src/main/java/com/fdkankan/tk/entity/RoomNum.java

@@ -35,7 +35,7 @@ public class RoomNum implements Serializable {
      * 房间id
      */
     @TableField("room_id")
-    private Integer roomId;
+    private String roomId;
 
     /**
      * 场景码

src/main/java/com/fdkankan/tk/inner/controller/InnerController.java

@@ -0,0 +1,46 @@
+package com.fdkankan.tk.inner.controller;
+
+import com.fdkankan.tk.common.ResultData;
+import com.fdkankan.tk.inner.request.InnerRoomParam;
+import com.fdkankan.tk.inner.service.InnerService;
+import com.fdkankan.tk.service.IRoomService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * 管理后台使用接口
+ */
+@RestController
+@RequestMapping("_inner")
+public class InnerController {
+
+    @Autowired
+    InnerService innerService;
+
+    /**
+     * 全部房间列表
+     */
+    @PostMapping("roomList")
+    public ResultData list(@RequestBody InnerRoomParam param){
+        return ResultData.ok(innerService.roomList(param));
+    }
+    /**
+     * 修改显示状态
+     */
+    @PostMapping("updateRoomShow")
+    public ResultData updateRoomShow(@RequestBody InnerRoomParam param){
+        innerService.updateRoomShow(param);
+        return ResultData.ok();
+    }
+    /**
+     * 删除
+     */
+    @PostMapping("deleteRoom")
+    public ResultData deleteRoom(@RequestBody InnerRoomParam param){
+        innerService.deleteRoom(param);
+        return ResultData.ok();
+    }
+}

src/main/java/com/fdkankan/tk/inner/request/InnerRoomParam.java

@@ -0,0 +1,13 @@
+package com.fdkankan.tk.inner.request;
+
+import com.dtflys.forest.annotation.BaseRequest;
+import com.fdkankan.tk.common.RequestBase;
+import lombok.Data;
+
+@Data
+public class InnerRoomParam extends RequestBase {
+    private String roomId;
+    private String roomTitle;
+    private String roomUserName;
+    private Integer show;
+}

src/main/java/com/fdkankan/tk/inner/service/InnerService.java

@@ -0,0 +1,55 @@
+package com.fdkankan.tk.inner.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.tk.common.PageInfo;
+import com.fdkankan.tk.common.ResultCode;
+import com.fdkankan.tk.entity.Room;
+import com.fdkankan.tk.exception.BusinessException;
+import com.fdkankan.tk.inner.request.InnerRoomParam;
+import com.fdkankan.tk.service.IRoomService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InnerService {
+
+    @Autowired
+    IRoomService roomService;
+
+
+    public Object roomList(InnerRoomParam param) {
+        LambdaQueryWrapper<Room> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getRoomTitle())){
+            wrapper.eq(Room::getRoomTitle,param.getRoomTitle());
+        }
+        if(StringUtils.isNotBlank(param.getRoomUserName())){
+            wrapper.eq(Room::getRoomHostName,param.getRoomUserName());
+        }
+        if(param.getShow()!=null){
+            wrapper.eq(Room::getShow,param.getShow());
+        }
+        Page<Room> page = roomService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        return PageInfo.PageInfo(page);
+    }
+
+    public void updateRoomShow(InnerRoomParam param) {
+        if(param.getRoomId() == null && param.getShow() == null ){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        LambdaUpdateWrapper<Room> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(Room::getRoomId,param.getRoomId());
+        wrapper.set(Room::getShow,param.getShow());
+        roomService.update(wrapper);
+
+    }
+
+    public void deleteRoom(InnerRoomParam param) {
+        if(StringUtils.isBlank(param.getRoomId())){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        roomService.deleteById(param.getRoomId());
+    }
+}

src/main/java/com/fdkankan/tk/service/IRoomNumService.java

@@ -15,9 +15,9 @@ import java.util.List;
  */
 public interface IRoomNumService extends IService<RoomNum> {
 
-    void addBatch(Integer roomId, List<String> numList);
+    void addBatch(String roomId, List<String> numList);
 
-    void deleteByRoomId(Integer roomId);
+    void deleteByRoomId(String roomId);
 
-    List<String> getListByRoomId(Integer roomId);
+    List<String> getListByRoomId(String roomId);
 }

src/main/java/com/fdkankan/tk/service/IRoomService.java

@@ -23,13 +23,13 @@ public interface IRoomService extends IService<Room> {
 
     Room addOrUpdate(RoomAddParam param, String token);
 
-    void deleteById(Integer roomId);
+    void deleteById(String roomId);
 
-    RoomVo getRoomInfo(Integer roomId);
+    RoomVo getRoomInfo(String roomId);
 
-    void roomAddView(Integer roomId);
+    void roomAddView(String roomId);
 
-    String getWxQrCode(Integer roomId,String type);
+    String getWxQrCode(String roomId,String type);
 
-    void inOrOutRoom(Integer roomId, String role, Integer type);
+    void inOrOutRoom(String roomId, String role, Integer type);
 }

src/main/java/com/fdkankan/tk/service/impl/RoomNumServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 public class RoomNumServiceImpl extends ServiceImpl<IRoomNumMapper, RoomNum> implements IRoomNumService {
 
     @Override
-    public void addBatch(Integer roomId, List<String> numList) {
+    public void addBatch(String roomId, List<String> numList) {
         this.deleteByRoomId(roomId);
         List<RoomNum> roomNumList = new ArrayList<>();
         for (String num : numList) {
@@ -40,14 +40,14 @@ public class RoomNumServiceImpl extends ServiceImpl<IRoomNumMapper, RoomNum> imp
     }
 
     @Override
-    public void deleteByRoomId(Integer roomId) {
+    public void deleteByRoomId(String roomId) {
         LambdaQueryWrapper<RoomNum> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(RoomNum::getRoomId,roomId);
         this.remove(wrapper);
     }
 
     @Override
-    public List<String> getListByRoomId(Integer roomId) {
+    public List<String> getListByRoomId(String roomId) {
         LambdaQueryWrapper<RoomNum> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(RoomNum::getRoomId,roomId);
         List<RoomNum> list = this.list(wrapper);

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -19,6 +19,7 @@ import com.fdkankan.tk.common.PageInfo;
 import com.fdkankan.tk.common.ResultCode;
 import com.fdkankan.tk.common.util.JwtUtil;
 import com.fdkankan.tk.common.util.RedisKeyUtil;
+import com.fdkankan.tk.common.util.RoomUtil;
 import com.fdkankan.tk.common.util.UploadToOssUtil;
 import com.fdkankan.tk.entity.Room;
 import com.fdkankan.tk.exception.BusinessException;
@@ -109,12 +110,14 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if(StringUtils.isEmpty(room.getRoomHostName())){
             room.setRoomHostName(room.getRoomUserName());
         }
-        if(param.getRoomId() != null){
+        if(StringUtils.isNotBlank(room.getRoomId())){
             room.setUpdateTime(null);
             Room byId = this.getById(room.getRoomId());
             if(byId.getRoomStatus() == 1){
                 throw new BusinessException(ResultCode.ROOM_ING);
             }
+        }else {
+            room.setRoomId(RoomUtil.genRoomId());
         }
         this.saveOrUpdate(room);
         roomNumService.addBatch(room.getRoomId(),param.getNumList());
@@ -123,7 +126,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public void deleteById(Integer roomId) {
+    public void deleteById(String roomId) {
         Room room = this.getById(roomId);
         if(room == null ){
             throw new BusinessException(ResultCode.ROOM_MISS);
@@ -139,7 +142,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public RoomVo getRoomInfo(Integer roomId) {
+    public RoomVo getRoomInfo(String roomId) {
         Room room = this.getById(roomId);
         List<String> numList = roomNumService.getListByRoomId(roomId);
         List<SceneVo> list = new ArrayList<>();
@@ -153,7 +156,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public void roomAddView(Integer roomId) {
+    public void roomAddView(String roomId) {
         LambdaUpdateWrapper<Room> wrapper = new LambdaUpdateWrapper<>();
         wrapper.setSql("room_view_count = room_view_count +1");
         wrapper.eq(Room::getRoomId,roomId);
@@ -162,7 +165,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
 
 
     @Override
-    public String getWxQrCode(Integer roomId,String type) {
+    public String getWxQrCode(String roomId,String type) {
         Room room = this.getById(roomId);
         if(room == null){
             throw new BusinessException(ResultCode.ROOM_MISS);
@@ -212,7 +215,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public void inOrOutRoom(Integer roomId, String role, Integer type) {
+    public void inOrOutRoom(String roomId, String role, Integer type) {
         if(roomId == null || StringUtils.isBlank(role)
                 || ( !role.equals("leader") && !role.equals("follower"))){
             throw new BusinessException(ResultCode.PARAM_MISS);