From f6ba5de2578c58a738f35b29a708c523ccb518ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 09:20:07 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 3f39d61..f9994fd 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -10,16 +10,15 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
-import com.doumee.core.utils.DateUtil;
-import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.*;
import com.doumee.core.wx.MeetConstants;
import com.doumee.core.wx.SendWxMessage;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.request.QrOpenDoorDto;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.SmsConfigMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.RoomStatisticsVo;
@@ -56,6 +55,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
+import java.util.Date;
import java.util.stream.Collectors;
/**
@@ -71,6 +71,8 @@
private String desPwd;
@Autowired
private BookingsMapper bookingsMapper;
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
@Autowired
private SystemUserMapper systemUserMapper;
@Autowired
@@ -109,6 +111,8 @@
@Autowired
private NoticesJoinMapper noticesMapper;
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
@Autowired
private UserRelMapper userRelMapper;
@@ -126,6 +130,11 @@
@Transactional(rollbackFor = {BusinessException.class, Exception.class})
public Integer create(Bookings bookings) {
LoginUserInfo user = bookings.getLoginUserInfo();
+ Rooms rooms = roomsMapper.selectById(bookings.getRoomId());
+ if(rooms==null ){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ細璁鏆傛椂鏃犳硶棰勭害");
+ }
+ bookings.setRoomName(rooms.getName());
isCreateParamValid(bookings, user);
bookings.setCreateDate(new Date());
bookings.setCreator(user.getId());
@@ -140,7 +149,9 @@
updateProjectRel(bookings, user);
handleFile(bookings, user);
//鍙戦�佷細璁绾︽垚鍔熼�氱煡
- this.sendNotice(bookings, MeetConstants.TWO);
+ if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
+ this.sendNotice(bookings, MeetConstants.TWO);
+ }
//鍙戦�佸井淇¤闃呴�氱煡
// sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
@@ -1294,22 +1305,52 @@
//1銆佸弬涓庝細璁細鍙備笌浼氳鍗冲皢寮�濮� 缁欐瘡涓弬浼氫汉鍛樺彂閫佷細璁�氱煡骞朵笖缁欎細璁绾︿汉鍙戦�侀瀹氱殑浼氳鍗冲皢寮�濮� 濡傛灉棰勮浜轰篃鍙備笌浼氳锛屽垯浼氭湁2鏉′細璁�氱煡
//2銆佷細璁瀹氭垚鍔燂紝缁欐墍鏈夊弬浼氫汉鍛樹笌棰勭害浜洪兘鍙戦��
//3銆佷細璁彇娑� 浼氳鍙栨秷锛岀粰鎵�鏈夊弬浼氫汉鍛橀兘鍙戦��
- List<UserRel> userRelList = userRelMapper.selectList(new QueryWrapper<UserRel>()
- .eq("OBJ_TYPE", MeetConstants.ONE)
- .eq("OBJ_ID", bookings.getId())
- .eq("ISDELETED", MeetConstants.ZERO)
+ List<UserRel> userRelList = userRelMapper.selectJoinList(UserRel.class,new MPJLambdaWrapper<UserRel>()
+ .selectAll(UserRel.class)
+ .selectAs(SystemUser::getRealname,UserRel::getRealName)
+ .selectAs(SystemUser::getMobile,UserRel::getUserPhone)
+ .leftJoin(SystemUser.class,SystemUser::getId,UserRel::getUserId)
+ .eq(UserRel::getObjType, MeetConstants.ONE)
+ .eq(UserRel::getObjId, bookings.getId())
+ .eq(UserRel::getIsdeleted, MeetConstants.ZERO)
);
+ List<SmsEmail> smsEmailList = new ArrayList<>();
List<Notices> noticeList = new ArrayList<>();
+ SmsConfig smsConfig = null;
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.MEETING_START;
if (sendType.equals(MeetConstants.THREE)){
noticeObjectType = Constants.NoticeObjectType.MEETING_CACEL;
}else if (sendType.equals(MeetConstants.TWO)){
noticeObjectType = Constants.NoticeObjectType.MEETING_BOOK_SUCCESS;
+ smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
+ SmsConstants.meetingContent.meetingBookJoinUser)
+ .eq(SmsConfig::getIsdeleted,Constants.ZERO)
+ .last(" limit 1 "));
}
if(userRelList!=null && userRelList.size()>0){
for (UserRel i : userRelList) {
Notices notices = new Notices(noticeObjectType,i.getId(),noticeObjectType.getInfo(), i.getUserId(), Constants.ZERO);
noticeList.add(notices);
+ if (smsConfig!=null && Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
+ SmsEmail smsEmail = new SmsEmail();
+ //{鍙備細浜哄憳濮撳悕}锛屾偍濂斤紒鎮ㄦ湁涓�涓柊鐨勪細璁紝浼氳涓婚锛歿浼氳涓婚}锛屼細璁湴鐐癸細{浼氳瀹ゅ悕绉皚锛屼細璁椂闂达細{浼氳鏃堕棿娈祡锛岃鎸夋椂鍙傚姞
+ String timeInfo =DateUtil.getFomartDate( bookings.getStartTime(),"MM/dd HH:mm")+"-"
+ +DateUtil.getFomartDate( bookings.getEndTime(),"HH:mm");
+ smsEmail.setPhone(i.getUserPhone());
+ smsEmail.setRemark("绛夊緟鍙戦��");
+ smsEmail.setStatus(Constants.TWO);//
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setObjId(bookings.getId());
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setTitle("浼氳瀹ょ敵璇峰弬浼氶�氱煡");
+ smsEmail.setContent(StringUtils.defaultString(smsConfig.getContent(),"")
+ .replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(i.getRealName(),""))
+ .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
+ .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
+ .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
+ smsEmailList.add(smsEmail);
+ }
}
}
//缁欏弬浼氫汉鍛樻彃鍏�
@@ -1318,6 +1359,9 @@
if(noticeList.size()>0){
noticesMapper.insert(noticeList);
}
+ if(smsEmailList.size()>0){
+ smsEmailMapper.insert(smsEmailList);//寰呭彂鐭俊鏁版嵁
+ }
}
--
Gitblit v1.9.3