From f3f1875f2718c8753255896242ee67346790a7b4 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 28 六月 2024 16:58:25 +0800
Subject: [PATCH] 修改直播申请
---
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java | 14 +++++---------
zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java | 29 +++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java b/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
index d0b55d9..24ceaca 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
@@ -60,4 +60,33 @@
@TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
private Timestamp happenEndTime;
+ /**
+ * 鎴块棿鍙�
+ */
+ private String roomId;
+
+ /**
+ * 寮�濮嬫棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date date1;
+
+ /**
+ * 缁撴潫鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date date2;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "HH:mm:ss")
+ private Date time1;
+
+ /**
+ * 鎴块棿鍙�
+ */
+ @JsonFormat(pattern = "HH:mm:ss")
+ private Date time2;
+
}
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..8ab89cb 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,12 +24,6 @@
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) {
@@ -38,7 +32,8 @@
lqw.orderByDesc(LiveStreaming::getCreateTime);
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;
}
@@ -114,9 +110,9 @@
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