From b7210488b6129ceb614e559d0240bf3ed3321dea Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 05 十二月 2024 19:36:20 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 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 f9994fd..6bc33be 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
@@ -13,6 +13,7 @@
import com.doumee.core.utils.*;
import com.doumee.core.wx.MeetConstants;
import com.doumee.core.wx.SendWxMessage;
+import com.doumee.core.wx.WxPlatNotice;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.request.QrOpenDoorDto;
import com.doumee.dao.admin.response.DevWgResponseParam;
@@ -152,8 +153,8 @@
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
}
- //鍙戦�佸井淇¤闃呴�氱煡
-// sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
return bookings.getId();
}
@@ -382,7 +383,11 @@
updateProjectRel(bookings, user);
handleFile(bookings, user);
//鍙戦�佷細璁�氱煡
- this.sendNotice(bookings, MeetConstants.TWO);
+ if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
+ this.sendNotice(bookings, MeetConstants.TWO);
+ }
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
@Override
@@ -447,9 +452,11 @@
bookings.setEditor(user.getId());
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
- this.sendNotice(bookings, 3);
- //鍙戦�佸井淇¤闃呴�氱煡
- sendWxMessage.bookingsCancel(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+ if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
+ this.sendNotice(bookings, 3);
+ }
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
}
@@ -927,8 +934,10 @@
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())){
+ if(StringUtils.isNotBlank(i.getAvatar()) && !i.getAvatar().startsWith("HKIMG") ){
i.setAvatar(avatarPath+i.getAvatar());
+ }else{
+ i.setAvatar(null);
}
});
meetingDetailResponse.setUserResponseList(userResponseList);
@@ -1039,9 +1048,12 @@
bookings.setEditor(businessOverDTO.getUserId());
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
- this.sendNotice(bookings, 3);
- //鍙戦�佸井淇¤闃呴�氱煡
-// sendWxMessage.bookingsCancel(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+ if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
+ this.sendNotice(bookings, 3);
+ }
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
+
}
@@ -1289,6 +1301,7 @@
bookings.setEditDate(new Date());
bookingsMapper.updateById(bookings);
this.sendNotice(bookings, MeetConstants.ONE);
+
//鍙戦�佸井淇￠�氱煡
// sendWxMessage.bookingsStart(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
}
@@ -1365,6 +1378,44 @@
}
+ @Async
+ public void sendWxNotice(Bookings bookings,String openid, Integer sendType) {
+ try{
+ List<UserRel> userRelList = userRelMapper.selectJoinList(UserRel.class,new MPJLambdaWrapper<UserRel>()
+ .selectAll(UserRel.class)
+ .selectAs(SystemUser::getRealname,UserRel::getRealName)
+ .selectAs(SystemUser::getMobile,UserRel::getUserPhone)
+ .selectAs(SystemUser::getOpenid,UserRel::getOpenid)
+ .leftJoin(SystemUser.class,SystemUser::getId,UserRel::getUserId)
+ .eq(UserRel::getObjType, MeetConstants.ONE)
+ .eq(UserRel::getObjId, bookings.getId())
+ .eq(UserRel::getIsdeleted, MeetConstants.ZERO)
+ .isNotNull(SystemUser::getOpenid)
+ );
+ List<String> openIdList = userRelList.stream().map(i->i.getOpenid()).collect(Collectors.toList());
+ if(StringUtils.isNotBlank(openid)){
+ openIdList.add(openid);
+ }
+ Set<String> openIds = new HashSet<String>(openIdList);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(openIds)){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ if(Constants.equalsInteger(sendType,Constants.ZERO)){
+ wxPlatNotice.sendMeetingBookTemplateNotice(bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
+ }else{
+
+ wxPlatNotice.sendMeetingBookCancelTemplateNotice(bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
+ }
+ }
+ }catch (Exception e){
+
+ }
+
+
+ }
+
+
@Override
public List<Bookings> getMyJoinBookingMeet(Integer userId, Integer roomId, LocalDateTime startTime, LocalDateTime endTime) {
DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
--
Gitblit v1.9.3