From f95968f0465e2332eea578785822c51719e9e10f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 08 八月 2024 11:19:17 +0800
Subject: [PATCH] 修改直播，分享bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java | 25 ++++++++++++
zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java | 4 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java | 5 +-
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java | 3 +
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountSharServiceImpl.java | 14 +++++++
zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailSharServiceImpl.java | 52 +++++++++++++-------------
7 files changed, 74 insertions(+), 31 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
index 938c27d..8e78ad3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
+
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -41,8 +43,7 @@
*/
@Log(title = "鐩存挱", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody LiveStreaming liveStreaming)
- {
+ public AjaxResult add(@RequestBody LiveStreaming liveStreaming) throws ParseException {
return liveStreamingService.addData(liveStreaming);
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 217fea0..a4034ef 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -569,7 +569,7 @@
roleId.setRoleId(2L);
roleList.add(roleId);
successNum++;
-
+
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
}
else if (isUpdateSupport)
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 f9b2846..43d2b08 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
@@ -94,5 +94,9 @@
*/
private Integer maxPerson;
+ /**
+ * 鎸佺画鏃堕棿
+ */
+ private Integer duration;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
index 59354ff..e5656ad 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
@@ -5,6 +5,7 @@
import com.ruoyi.domain.LiveStreaming;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
import java.util.List;
public interface LiveStreamingService extends IService<LiveStreaming> {
@@ -12,5 +13,5 @@
List<LiveStreaming> selectByIds(Long[] ids);
- AjaxResult addData(LiveStreaming liveStreaming);
+ AjaxResult addData(LiveStreaming liveStreaming) throws ParseException;
}
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 972349f..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
@@ -77,6 +79,9 @@
// List<LiveStreaming> dtoResult = markOwnData(familyId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+
+
+
return AjaxResult.success(data);
}
@@ -92,8 +97,19 @@
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);
@@ -103,6 +119,8 @@
if (liveStreaming.getMaxPerson() > 120){
throw new RuntimeException("鍙绾充汉鏁版殏鏃舵渶澶氫负120浜�");
}
+
+ liveStreaming.setEndTime(getEndTime1(liveStreaming));
if (save(liveStreaming)) {
EsModel esModel = new EsModel();
@@ -114,7 +132,12 @@
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.setFid(familyId);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountSharServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountSharServiceImpl.java
index 48c4fc7..0add52e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountSharServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountSharServiceImpl.java
@@ -97,6 +97,20 @@
za.setShareId(shareId);
za.setSysMenuId(2056L);
addData(za);
+
+ TravelDetail travelDetail = new TravelDetail();
+ travelDetail.setCid(za.getShareContent());
+
+ List<TravelDetail> travelDetails = travelDetailService.getDataByCid(za.getShareContent(),travelDetail);
+ for (TravelDetail travelDetail1:travelDetails) {
+ za.setId(za.getId()+1);
+ za.setSysMenuId(2055L);
+ za.setShareContent(travelDetail1.getId());
+ System.out.println(za);
+ save(za);
+ }
+
+
}
}
// Long []
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailSharServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailSharServiceImpl.java
index 84e0c50..7c38c96 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailSharServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailSharServiceImpl.java
@@ -59,19 +59,19 @@
}
- public void addData(ZfShare za)
- {
- LambdaQueryWrapper<ZfShare> lqw = uniqueCondition(za);
- List<ZfShare> list = list(lqw);
-
- if(list.size()>0){
- throw new RuntimeException("璇峰嬁鍒嗕韩閲嶅鏁版嵁");
- }
- else {
- save(za);
- }
-
- }
+// public void addData(ZfShare za)
+// {
+// LambdaQueryWrapper<ZfShare> lqw = uniqueCondition(za);
+// List<ZfShare> list = list(lqw);
+//
+// if(list.size()>0){
+// throw new RuntimeException("璇峰嬁鍒嗕韩閲嶅鏁版嵁");
+// }
+// else {
+//
+// }
+//
+// }
@Override
public AjaxResult saveZa(ShareMore shareMore) {
@@ -84,19 +84,19 @@
za.setShareContent(shareContent);
za.setShareId(shareId);
za.setSysMenuId(2055L);
- addData(za);
- TravelDetail travelDetail =travelDetailService.getById(za.getShareContent());
- Long id = travelDetail.getCid();
- if (id != null){
- za.setId(za.getId()+1);
- za.setSysMenuId(2056L);
- za.setShareContent(id);
- List<ZfShare> travelCount = list(uniqueCondition(za));
- System.out.println("nmfiwwugn419526/"+za);
- System.out.println(travelCount);
- if (travelCount.size() == 0){
- addData(za);
- }}
+ save(za);
+// TravelDetail travelDetail =travelDetailService.getById(za.getShareContent());
+// Long id = travelDetail.getCid();
+// if (id != null){
+// za.setId(za.getId()+1);
+// za.setSysMenuId(2056L);
+// za.setShareContent(id);
+// List<ZfShare> travelCount = list(uniqueCondition(za));
+// System.out.println("nmfiwwugn419526/"+za);
+// System.out.println(travelCount);
+// if (travelCount.size() == 0){
+// addData(za);
+// }}
}
}
// Long []
--
Gitblit v1.9.1