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

liukangdong

2024-05-31 bc2cda03481cd62a1b04959d2653678053e60b18

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

@@ -27,9 +27,11 @@
import com.doumee.dao.system.dto.UserStatisticsDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.*;
import com.doumee.dao.system.vo.UserResponse;
import com.doumee.dao.system.vo.UserStatisticsVo;
import com.doumee.dao.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
import com.doumee.dao.web.request.UserPageRequest;
import com.doumee.dao.web.response.*;
import com.doumee.service.business.BookingsService;
import com.doumee.service.business.DevicesService;
@@ -46,6 +48,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.awt.print.Book;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -71,6 +74,7 @@
    private SystemUserMapper systemUserMapper;
    @Autowired
    private RoomRecordMapper roomRecordMapper;


    @Autowired
    private BookingsJoinMapper bookingsJoinMapper;
@@ -120,7 +124,7 @@
    @Override
    @Transactional(rollbackFor = {BusinessException.class, Exception.class})
    public Integer create(Bookings bookings) {
        LoginUserInfo user = new LoginUserInfo();
        LoginUserInfo user = bookings.getLoginUserInfo();
        user.setId(bookings.getCreator());
        isCreateParamValid(bookings, user);
        bookings.setCreateDate(new Date());
@@ -452,14 +456,11 @@
        queryWrapper.selectAll(Bookings.class);
        queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
        queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);

        queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);

        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);

        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
        queryWrapper.orderByDesc(Bookings::getCreateDate);
        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);

@@ -467,7 +468,7 @@
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName());
        queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemDepartment::getId, pageWrap.getModel().getDepartmentId());
        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemUser::getId, pageWrap.getModel().getDepartmentId());

        if (pageWrap.getModel().getStartTime() != null) {
            queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -490,7 +491,7 @@
            List<Multifile> filelist = multifileJoinMapper.selectList(bookquery);
            filelist.stream().forEach(a -> {
                if (StringUtils.isNotBlank(a.getFileurl())) {
                    a.setFileFullUrl(path + a.getFileurl());
                    a.setFileurlFull(path + a.getFileurl());
                }
            });
            s.setFileList(filelist);
@@ -533,11 +534,10 @@
        queryWrapper.selectAll(Bookings.class);
        queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
        queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
        queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
        queryWrapper.eq(queryParam.getId() != null, Bookings::getId, queryParam.getId());
        queryWrapper.eq(queryParam.getRoomId() != null, Bookings::getRoomId, queryParam.getRoomId());
@@ -561,7 +561,7 @@
            List<Multifile> filelist = multifileJoinMapper.selectList(bookquery);
            filelist.stream().forEach(a -> {
                if (StringUtils.isNotBlank(a.getFileurl())) {
                    a.setFileFullUrl(path + a.getFileurl());
                    a.setFileurlFull(path + a.getFileurl());
                }
            });
            result.setFileList(filelist);
@@ -782,9 +782,49 @@
        String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
        page.getRecords().forEach(i -> {
            i.setPrefixUrl(path);
            if(i.getMeetingStatus().equals(Constants.ZERO)){
                if(i.getStatus()==Constants.ONE){
                    i.setMeetingStatus(5);
                }else{
                    //开始前5分钟 大于当前时间 则显示即将开始
                    if(DateUtil.afterMinutesDate(i.getStartTime(),-5).getTime()>System.currentTimeMillis()){
                        i.setMeetingStatus(4);
                    }
                }

            }

        });
        return page;
    }


    @Override
    public MeetingDetailResponse getMeetingDetailByDate(Bookings bean){
        try {
            if(Objects.isNull(bean)
            || Objects.isNull(bean.getRoomId())
                    || Objects.isNull(bean.getStartTime())
                    || Objects.isNull(bean.getEndTime())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
                    .eq(Bookings::getRoomId,bean.getRoomId())
                    .ge(Bookings::getEndTime,DateUtil.getPlusTime(bean.getEndTime()))
                    .le(Bookings::getStartTime,DateUtil.getPlusTime(bean.getStartTime()))
            );
            if(Objects.isNull(bookings)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY);
            }
            return getMeetingDetail(bookings.getId());
        }catch (Exception e){
            e.printStackTrace();
        }
        return null;
    }




    /**
     * 会议详情
@@ -807,9 +847,10 @@
        ));

        //参会人员列表
        SystemUser param = new SystemUser();
        List<SystemUser> userResponseList = systemUserService.findList(param);
        String avatarPath = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.MEMBER_IMG).getCode();

        List<UserResponse> userResponseList = systemUserService.getUserList(id);
        String avatarPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
        userResponseList.forEach(i -> {
            if(StringUtils.isNotBlank(i.getAvatar())){
                i.setAvatar(avatarPath+i.getAvatar());
@@ -817,7 +858,8 @@
        });
        meetingDetailResponse.setUserResponseList(userResponseList);
        //服务项
        String projectsPath = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
        String projectsPath = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
        List<ProjectsResponse> projectsResponseList = projectsService.getProjectsList(id, MeetConstants.ONE);
        projectsResponseList.forEach(i -> {
            i.setPrefixUrl(projectsPath);
@@ -828,7 +870,7 @@
                .eq("OBJ_TYPE", MeetConstants.ZERO)
        );
        multiFileList.forEach(i -> {
            i.setFileFullUrl(projectsPath);
            i.setFileurlFull(projectsPath);
        });
        //附件信息
        meetingDetailResponse.setMultiFileList(multiFileList);
@@ -893,6 +935,7 @@
     * @param userId
     */
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void reservationCancel(Integer id, Integer userId) {
        Bookings bookings = bookingsMapper.selectById(id);
        if (Objects.isNull(bookings)) {
@@ -996,7 +1039,7 @@

        lambdaWrapper.selectAll(Bookings.class)
                        .selectAs(SystemUser::getRealname, Bookings::getRealName)
                        .selectAs(SystemDepartment::getName, Bookings::getDepartmentName)
                        .selectAs(Company::getName, Bookings::getDepartmentName)
                        .selectAs(Rooms::getName, Bookings::getRoomName)
                .select("CASE DAYOFWEEK(t.START_TIME)\n" +
                        "\tWHEN 1 THEN \t\"星期日\" \tWHEN 2 THEN \"星期一\"\n" +
@@ -1010,8 +1053,7 @@
              //  .leftJoin(RoomTime.class, RoomTime::getId, BookingTime::getTimeId)
                .leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator)
                .leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId)
                .leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator)
                .leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .eq(Objects.nonNull(roomId), Bookings::getRoomId, roomId)
                .eq(Bookings::getIsdeleted, MeetConstants.ZERO)
                .eq(Bookings::getStatus, MeetConstants.ZERO)
@@ -1082,5 +1124,40 @@
        return PageData.from(userStatistics);
    }

    /**
     * 查询参会人员分页
     * @param pageWrap
     * @return
     */
    @Override
    public IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap) {
        IPage<UserResponse> page = systemUserMapper.getUserPage(pageWrap.toPage(),new QueryWrapper<UserResponse>()
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()), i -> i.like("c.realName", pageWrap.getModel().getKeyword())
                        .or().like("e.name", pageWrap.getModel().getKeyword())
                )
                .eq("c.DELETED",0)
                .eq("c.status",0)
                .orderByAsc("c.id")
        );
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
        //查询是否处于会议中
        page.getRecords().forEach(j->{
            j.setPrefixUrl(path);
            if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
                    .exists(" select 1 from meeting_user_rel u where u.OBJ_ID = bookings.id and  u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1    ")
                    .and(i -> i.between("START_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
                            .or().between("END_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
                    )
            )>Constants.ZERO){
                j.setStatus(Constants.ONE);
            }else{
                j.setStatus(Constants.ZERO);
            }
        });
        return page;
    }



}