|
@@ -5,6 +5,7 @@ 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.CheckRoomPasswordParam;
|
|
|
import com.fdkankan.tk.request.RoomAddParam;
|
|
|
import com.fdkankan.tk.request.RoomListParam;
|
|
|
import com.fdkankan.tk.response.RoomAddUserParam;
|
|
@@ -126,19 +127,19 @@ public class RoomController extends BaseController{
|
|
|
* 获取房间密码
|
|
|
*/
|
|
|
@PostMapping("/checkRoomVisitPassword")
|
|
|
- public ResultData checkRoomVisitPassword(@RequestParam(required = false) String roomId,
|
|
|
- @RequestParam(required = false) String password){
|
|
|
- if(StringUtils.isBlank(roomId) || StringUtils.isBlank(password)){
|
|
|
+ public ResultData checkRoomVisitPassword(@RequestBody CheckRoomPasswordParam param){
|
|
|
+ if(StringUtils.isBlank(param.getRoomId()) || StringUtils.isBlank(param.getPassword())){
|
|
|
throw new BusinessException(ResultCode.PARAM_MISS);
|
|
|
}
|
|
|
- if(roomId.contains("_")){
|
|
|
- roomId = roomId.split("_")[0];
|
|
|
+ String roomId = param.getRoomId();
|
|
|
+ if(param.getRoomId().contains("_")){
|
|
|
+ roomId = param.getRoomId().split("_")[0];
|
|
|
}
|
|
|
Room room = roomService.getById(roomId);
|
|
|
- if(!MD5Utils.getPWD(room.getVisitPassword()).equals(password)){
|
|
|
- throw new BusinessException(ResultCode.ROOM_PASSWORD_ERROR);
|
|
|
+ if(!MD5Utils.getPWD(room.getVisitPassword()).equals(param.getPassword())){
|
|
|
+ return ResultData.ok(false);
|
|
|
}
|
|
|
- return ResultData.ok();
|
|
|
+ return ResultData.ok(true);
|
|
|
}
|
|
|
}
|
|
|
|