Merge remote-tracking branch 'origin/master'

jiangping

2024-12-09 69f7797c85c830226eabee6d9793fed6ed6785a1

Merge remote-tracking branch 'origin/master'

 server/meeting/meeting_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: meetingAdmin
      # 安全配置

 server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java

@@ -82,7 +82,7 @@
            thing1.put("value",bookings.getName());
            //会议时间
            Map<String, Object> time2 = new HashMap<String,Object>();
            time2.put("value", DateUtil.getDate(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") );
            time2.put("value", DateUtil.getFomartDate(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") );
            //会议地点
            Map<String, Object> thing3 = new HashMap<String,Object>();
            thing3.put("value",bookings.getRoomName());

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

@@ -142,6 +142,7 @@
        bookings.setIsdeleted(MeetConstants.ZERO);
        bookings.setStatus(MeetConstants.ZERO);
        bookingsMapper.insert(bookings);
        bookings.setManagerInfo(user.getRealname());
        //更新会议室预定时间段
        updateBookingTimes(bookings, user);
        //添加管理人员
@@ -153,7 +154,7 @@
        if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
            this.sendNotice(bookings, MeetConstants.TWO);
        }
        SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
        SystemUser systemUser = systemUserMapper.selectById(user.getId());
        this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);

        return bookings.getId();
@@ -1046,6 +1047,10 @@
        bookings.setStatus(MeetConstants.ONE);
        bookings.setEditDate(new Date());
        bookings.setEditor(businessOverDTO.getUserId());
        Rooms rooms = roomsMapper.selectById(bookings.getRoomId());
        if(Objects.nonNull(rooms)){
            bookings.setRoomName(rooms.getName());
        }
        bookingsMapper.updateById(bookings);
        //取消会议 发送取消通知
        if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
@@ -1393,8 +1398,9 @@
                    .isNotNull(SystemUser::getOpenid)
            );
            List<String> openIdList = userRelList.stream().map(i->i.getOpenid()).collect(Collectors.toList());
            if(StringUtils.isNotBlank(openid)){
                openIdList.add(openid);
            openIdList.add(openid);
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(openIdList)){
                return;
            }
            Set<String> openIds = new HashSet<String>(openIdList);
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(openIds)){