From f95968f0465e2332eea578785822c51719e9e10f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 08 八月 2024 11:19:17 +0800
Subject: [PATCH] 修改直播，分享bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
index 66cca59..db59d66 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
@@ -17,6 +17,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@Slf4j
@@ -24,21 +26,16 @@
public class LiveStreamingServiceImpl extends ServiceImpl<LiveStreamingMapper, LiveStreaming> implements LiveStreamingService {
@Resource
- ZInfoUserService zInfoUserService;
-
- @Resource
- ZAuthorityService zAuthorityService;
-
- @Resource
private EsService esSer;
private LambdaQueryWrapper<LiveStreaming> buildCondition(LiveStreaming liveStreaming) {
LambdaQueryWrapper<LiveStreaming> lqw = new LambdaQueryWrapper<>();
// lqw.in(LiveStreaming::getFamilyId,familyIdList);
- lqw.orderByDesc(LiveStreaming::getCreateTime);
+ lqw.orderByDesc(LiveStreaming::getId);
lqw.like(StringUtils.isNotEmpty(liveStreaming.getTitle()), LiveStreaming::getTitle, liveStreaming.getTitle())
.like(StringUtils.isNotEmpty(liveStreaming.getApplyPerson()),LiveStreaming::getApplyPerson,liveStreaming.getApplyPerson())
- .like(StringUtils.isNotEmpty(liveStreaming.getContactPerson()),LiveStreaming::getContactPerson,liveStreaming.getContactPerson());
+ .like(StringUtils.isNotEmpty(liveStreaming.getContactPerson()),LiveStreaming::getContactPerson,liveStreaming.getContactPerson())
+ .like(StringUtils.isNotEmpty(liveStreaming.getRoomId()),LiveStreaming::getRoomId,liveStreaming.getRoomId());
lqw.between(liveStreaming.getHappenStartTime() != null && liveStreaming.getHappenEndTime() != null,LiveStreaming::getCreateTime,liveStreaming.getHappenStartTime(),liveStreaming.getHappenEndTime());
return lqw;
@@ -50,6 +47,7 @@
lqw.eq(!StringUtils.isEmpty(liveStreaming.getContactPhone()), LiveStreaming::getContactPhone, liveStreaming.getContactPhone());
lqw.eq(!StringUtils.isEmpty(liveStreaming.getApplyPerson()), LiveStreaming::getApplyPerson, liveStreaming.getApplyPerson());
lqw.eq(!StringUtils.isEmpty(liveStreaming.getContactPerson()), LiveStreaming::getContactPerson, liveStreaming.getContactPerson());
+ lqw.eq(!StringUtils.isEmpty(liveStreaming.getRoomId()), LiveStreaming::getRoomId, liveStreaming.getRoomId());
return lqw;
}
@@ -81,6 +79,9 @@
// List<LiveStreaming> dtoResult = markOwnData(familyId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+
+
+
return AjaxResult.success(data);
}
@@ -96,14 +97,30 @@
return list;
}
+ private Date getEndTime1(LiveStreaming liveStreaming) throws ParseException{
+ System.out.println(liveStreaming.getStartTime());
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Calendar nowTime = Calendar.getInstance();
+ nowTime.setTime(liveStreaming.getStartTime());
+ nowTime.add(Calendar.MINUTE, liveStreaming.getDuration());
+ String currentTime = df.format(nowTime.getTime());
+ System.out.println("30鍒嗛挓鍚庣殑鏃堕棿" + currentTime);
+ return df.parse(currentTime);
+ }
+
@Override
- public AjaxResult addData(LiveStreaming liveStreaming) {
+ public AjaxResult addData(LiveStreaming liveStreaming) throws ParseException {
LambdaQueryWrapper<LiveStreaming> lqw = uniqueCondition(liveStreaming);
List<LiveStreaming> list = list(lqw);
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
}
+ if (liveStreaming.getMaxPerson() > 120){
+ throw new RuntimeException("鍙绾充汉鏁版殏鏃舵渶澶氫负120浜�");
+ }
+
+ liveStreaming.setEndTime(getEndTime1(liveStreaming));
if (save(liveStreaming)) {
EsModel esModel = new EsModel();
@@ -114,9 +131,15 @@
esModel.setCtTableName("鐩存挱");
esModel.setBy1(liveStreaming.getTitle());
esModel.setBy2(liveStreaming.getApplyPerson());
+ esModel.setBy3(liveStreaming.getRoomId());
+ //鍙栧綋鍓嶇殑鏃跺垎-30
+
+
+ System.out.println(liveStreaming.getEndTime());
+// esModel.setBy4(liveStreaming.getEndTime());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
- esModel.setBy5("/zLIveStreaming");
+ esModel.setBy5("/zLiveStreaming");
// esModel.setFid(familyId);
esSer.insertTable(esModel);
// System.out.println(esModel);
--
Gitblit v1.9.1