代码初始化

k94314517

2024-09-19 0627bb7ce8c035ee5a295f16fbba3e748511cff3

代码初始化

 server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java

@@ -106,12 +106,12 @@
        ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "会议室预定信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:bookings:query")
    public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
        return ApiResponse.success(bookingsService.getMeetingDetail(id));
    }
//    @ApiOperation("根据ID查询")
//    @GetMapping("/{id}")
//    @RequiresPermissions("business:bookings:query")
//    public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
//        return ApiResponse.success(bookingsService.getMeetingDetail(id));
//    }


    @ApiOperation("取消")

 server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java

@@ -75,14 +75,14 @@



    @ApiOperation("会议详情")
    @GetMapping("/meetingDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id));
    }
//    @ApiOperation("会议详情")
//    @GetMapping("/meetingDetail")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
//    })
//    public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
//        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id));
//    }

    @ApiOperation("获取会议开门二维码")
    @GetMapping("/getQrCode")

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java

@@ -112,7 +112,7 @@
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:bookings:query")
    public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(bookingsService.getMeetingDetail(id));
        return ApiResponse.success(bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
    }

    @ApiOperation("根据日期和会议室主键查询占用信息")

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java

@@ -89,7 +89,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse<MeetingDetailResponse> meetingDetail( @RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam Integer id) {
        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id));
        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
    }

    @ApiOperation("获取会议开门二维码")

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java

@@ -93,8 +93,8 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id));
    public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
    }



 server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java

@@ -47,6 +47,9 @@
    @ApiModelProperty(value = "会议时间 ( a ~ b)")
    private String meetingTime;

    @ApiModelProperty(value = "是否是管理员 0=否；1=是")
    private Integer isAdmin = 0 ;

    @ApiModelProperty(value = "参会人员")
    private List<UserResponse> userResponseList;


 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java

@@ -143,7 +143,7 @@
     * @param id
     * @return
     */
    MeetingDetailResponse getMeetingDetail(Integer id);
    MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);

    /**
     * 根据日期和会议室主键查询占用信息

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -863,7 +863,7 @@
            if(Objects.isNull(bookings)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY);
            }
            return getMeetingDetail(bookings.getId());
            return getMeetingDetail(bookings.getId(),null);
        }catch (Exception e){
            e.printStackTrace();
        }
@@ -880,7 +880,7 @@
     * @return
     */
    @Override
    public MeetingDetailResponse getMeetingDetail(Integer id) {
    public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) {
        MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id);
        if (Objects.isNull(meetingDetailResponse)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "未查询到会议详情");
@@ -925,9 +925,18 @@
                .eq("OBJ_ID", meetingDetailResponse.getRoomId())
                .eq("OBJ_TYPE",MeetConstants.ZERO)
        );
        if(Constants.equalsInteger(sysUserId,meetingDetailResponse.getBookingUserId())){
            meetingDetailResponse.setIsAdmin(Constants.ONE);
        }
        if (!Objects.isNull(userRelList) && userRelList.size() > 0) {
            meetingDetailResponse.setRoomUser(systemUserService.findById(userRelList.get(MeetConstants.ZERO).getUserId()));
            if( Objects.nonNull(sysUserId) &&
                    userRelList.stream().filter(i->Constants.equalsInteger(i.getUserId(),sysUserId)).collect(Collectors.toList()).size()>Constants.ZERO
            ){
                meetingDetailResponse.setIsAdmin(Constants.ONE);
            }
        }

        return meetingDetailResponse;
    }

@@ -1022,7 +1031,7 @@
        Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
                .eq(UserRel::getIsdeleted,Constants.ZERO)
                .eq(UserRel::getObjId,bookings.getRoomId())
                .eq(UserRel::getObjType,Constants.ONE)
                .eq(UserRel::getObjType,Constants.ZERO)
                .eq(UserRel::getUserId,businessOverDTO.getUserId()));

        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
@@ -1093,7 +1102,7 @@
        Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
                .eq(UserRel::getIsdeleted,Constants.ZERO)
                .eq(UserRel::getObjId,bookings.getRoomId())
                .eq(UserRel::getObjType,Constants.ONE)
                .eq(UserRel::getObjType,Constants.ZERO)
                .eq(UserRel::getUserId,businessOverDTO.getUserId()));

        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {