Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-01-07 f9c24ba3d5eba45afef222dcd72b6383893efc76

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

@@ -6,10 +6,10 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Bookings;
@@ -17,13 +17,11 @@
import com.doumee.dao.system.dto.UserStatisticsDTO;
import com.doumee.dao.system.vo.UserStatisticsVo;
import com.doumee.dao.web.response.DateTimeResourceDate;
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.service.business.BookingsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -57,7 +55,7 @@
    @PostMapping("/create")
    @RequiresPermissions("business:bookings:create")
    public ApiResponse create(@RequestBody Bookings bookings) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        LoginUserInfo user = getLoginUser(null);
        bookings.setCreator(user.getId());
        return ApiResponse.success(bookingsService.create(bookings));
    }
@@ -66,7 +64,7 @@
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:bookings:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        bookingsService.deleteById(id);
        bookingsService.deleteById(id,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

@@ -79,7 +77,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        bookingsService.deleteByIdInBatch(idList);
        bookingsService.deleteByIdInBatch(idList,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

@@ -87,8 +85,7 @@
    @PostMapping("/updateById")
    @RequiresPermissions("business:bookings:update")
    public ApiResponse updateById(@RequestBody Bookings bookings) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        bookings.setCreator(user.getId());
        bookings.setLoginUserInfo(getLoginUser(null));
        bookingsService.updateById(bookings);
        return ApiResponse.success(null);
    }
@@ -107,12 +104,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("取消")
@@ -197,7 +194,7 @@
            startTime =  DateUtil.getMonday();
            endTime = DateUtil.getSunday();
        }
        return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser().getId(), null,startTime,endTime));
        return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser(null).getId(), null,startTime,endTime));
    }

    /**
@@ -207,8 +204,6 @@
    @ApiOperation("获取用户当当月预约会议情况")
    @PostMapping("/findMothBookingMeet")
    public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth){


        return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser().getId(),roomId,dateMonth));
        return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser(null).getId(),roomId,dateMonth));
    }
}