From cb22e2441394cd61116d64a844708ca9390a0529 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 18:43:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..972349f 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
@@ -24,21 +24,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 +45,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;
}
@@ -104,6 +100,9 @@
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
}
+ if (liveStreaming.getMaxPerson() > 120){
+ throw new RuntimeException("鍙绾充汉鏁版殏鏃舵渶澶氫负120浜�");
+ }
if (save(liveStreaming)) {
EsModel esModel = new EsModel();
@@ -114,9 +113,10 @@
esModel.setCtTableName("鐩存挱");
esModel.setBy1(liveStreaming.getTitle());
esModel.setBy2(liveStreaming.getApplyPerson());
+ esModel.setBy3(liveStreaming.getRoomId());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
- esModel.setBy5("/zLIveStreaming");
+ esModel.setBy5("/zLiveStreaming");
// esModel.setFid(familyId);
esSer.insertTable(esModel);
// System.out.println(esModel);
--
Gitblit v1.9.1