会议室问题修改

rk

9 小时以前 14d22678d425c50af0d9bcb1c19cfecf7f4ca61b

会议室问题修改

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

@@ -151,12 +151,6 @@
        paramMap.put("touser", openId);
        paramMap.put("data", dataMap);

        smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
                .eq(SmsEmail::getObjType,Constants.FIVE.toString())
                .eq(SmsEmail::getStatus,Constants.TWO)
                .eq(SmsEmail::getType,Constants.TWO)
                .eq(SmsEmail::getObjId,bookings.getId())
        );

        SmsEmail smsEmail = new SmsEmail();
        smsEmail.setPhone(openId);
@@ -169,13 +163,12 @@
        smsEmail.setCreateDate(new Date());
        smsEmail.setTitle("会议即将开始提醒");
        smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getStartTime(),-earlyMin),"yyyy-MM-dd HH:mm:ss"));
        smsEmail.setContent(JSONObject.toJSONString(map));
        smsEmail.setContent(JSONObject.toJSONString(paramMap));
        smsEmailMapper.insert(smsEmail);
    }


    public void createEndWxNotice(SystemDictDataBiz systemDictDataBiz, SmsEmailMapper smsEmailMapper, Bookings bookings,  String openId){
        Map<String,Object> map = new HashMap<>();

        //整体参数map
        Map<String, Object> paramMap = new HashMap<String, Object>();
        //消息主题显示相关map
@@ -203,13 +196,6 @@
        paramMap.put("touser", openId);
        paramMap.put("data", dataMap);

        smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
                .eq(SmsEmail::getObjType,Constants.FIVE.toString())
                .eq(SmsEmail::getStatus,Constants.TWO)
                .eq(SmsEmail::getType,Constants.TWO)
                .eq(SmsEmail::getObjId,bookings.getId())
        );

        SmsEmail smsEmail = new SmsEmail();
        smsEmail.setPhone(openId);
        smsEmail.setRemark("等待发送");
@@ -222,7 +208,8 @@
        smsEmail.setTitle("会议即将开始提醒");
        Integer endMin= Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.OVER_NOTICE_WX).getCode());
        smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getEndTime(),-endMin),"yyyy-MM-dd HH:mm:ss"));
        smsEmail.setContent(JSONObject.toJSONString(map));
        smsEmail.setContent(JSONObject.toJSONString(paramMap));
        smsEmailMapper.insert(smsEmail);
    }



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

@@ -444,6 +444,12 @@
            SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
            this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
            if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
                smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
                        .eq(SmsEmail::getObjType,Constants.FIVE.toString())
                        .eq(SmsEmail::getStatus,Constants.TWO)
                        .eq(SmsEmail::getType,Constants.TWO)
                        .eq(SmsEmail::getObjId,bookings.getId())
                );
                WxPlatNotice wxPlatNotice = new WxPlatNotice();
                wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
                wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());