房间密码置空

src/main/java/com/fdkankan/tk/common/ResultCode.java

@@ -25,6 +25,7 @@ public enum ResultCode {
 
     FD_USER_NOT_EXIST(8001,"授权失败！此账号不存在！"),
     ROOM_END_EX(8002,"房间设置开启时间过期"),
+    ROOM_PASSWORD_ERROR(8003,"房间密码错误"),
 
 
     ;

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

@@ -3,6 +3,7 @@ package com.fdkankan.tk.controller;
 
 import com.fdkankan.tk.common.ResultCode;
 import com.fdkankan.tk.common.ResultData;
+import com.fdkankan.tk.entity.Room;
 import com.fdkankan.tk.exception.BusinessException;
 import com.fdkankan.tk.request.RoomAddParam;
 import com.fdkankan.tk.request.RoomListParam;
@@ -120,5 +121,23 @@ public class RoomController extends BaseController{
         roomShareLogService.saveLog(roomId,userId);
         return ResultData.ok();
     }
+    /**
+     * 获取房间密码
+     */
+    @GetMapping("/checkRoomVisitPassword")
+    public ResultData checkRoomVisitPassword(@RequestParam(required = false) String roomId,
+                                             @RequestParam(required = false) String password){
+        if(roomId == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        if(roomId.contains("_")){
+            roomId = roomId.split("_")[0];
+        }
+        Room room = roomService.getById(roomId);
+        if(!room.getVisitPassword().equals(password)){
+            throw new BusinessException(ResultCode.ROOM_PASSWORD_ERROR);
+        }
+        return ResultData.ok();
+    }
 }
 

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

@@ -1,5 +1,6 @@
 package com.fdkankan.tk.controller;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.tk.common.ResultData;
@@ -16,7 +17,11 @@ import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
 
 @RestController
 public class TestController {

src/main/java/com/fdkankan/tk/httpClient/FdKKService.java

@@ -20,7 +20,7 @@ public class FdKKService {
         try {
             FdkkLoginRequest fdParam = new FdkkLoginRequest(userName,null);
             FdkkResponse fdkkResponse = fdKKClient.checkUser(fdParam);
-            if(fdkkResponse.getCode() != 3008){
+            if(fdkkResponse.getCode() == 3008){
                 throw new BusinessException(ResultCode.FD_USER_NOT_EXIST);
             }
         }catch ( Exception e){

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

@@ -102,6 +102,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                 if(record.getRoomUserId() != null){
                     record.setRoomId(record.getRoomId() + "_"+ record.getRoomUserId());
                 }
+                record.setVisitPassword(null);
             }
             return PageInfo.PageInfo(page);
         }
@@ -123,6 +124,9 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         wrapper.orderByDesc(Room::getCreateTime);
 
         Page<Room> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        for (Room record : page.getRecords()) {
+            record.setVisitPassword(null);
+        }
         return PageInfo.PageInfo(page);
     }
 
@@ -191,6 +195,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         }
         RoomVo roomVo = new RoomVo();
         BeanUtils.copyProperties(room,roomVo);
+        roomVo.setVisitPassword(null);
         try {
             if(StringUtils.isNotBlank(wxToken)){
                 WxUser wxUser = wxUserService.getById(JwtUtil.getUserName(wxToken));