From ccd693a914802ab29632af4db35838512149bacc Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 四月 2025 20:58:44 +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 | 94 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 insertions(+), 16 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 f153e93..4120a90 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,33 +17,61 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.stream.Collectors;
-import static com.ruoyi.constant.MenuAuthority.DOCTOR_LIST;
@Slf4j
@Service
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) {
+ private LambdaQueryWrapper<LiveStreaming> buildCondition(LiveStreaming liveStreaming) throws ParseException {
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());
- lqw.between(liveStreaming.getHappenStartTime() != null && liveStreaming.getHappenEndTime() != null,LiveStreaming::getCreateTime,liveStreaming.getHappenStartTime(),liveStreaming.getHappenEndTime());
+ .eq(LiveStreaming::getStatus,0);
+
+ List<LiveStreaming> liveStreamingList = list(lqw);
+ for (LiveStreaming liveStreaming1: liveStreamingList) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Calendar nowTime = Calendar.getInstance();
+ String currentTime = df.format(nowTime.getTime());
+ Date date = df.parse(currentTime);
+ if(liveStreaming1.getStartTime() != null && liveStreaming1.getEndTime() != null){
+ if (!belongCalendar(date,liveStreaming1.getStartTime(),liveStreaming1.getEndTime())){
+ liveStreaming1.setStatus(1);
+ updateById(liveStreaming1);
+ }}
+ }
return lqw;
+ }
+
+ /**MaNongXF
+ * 鍒ゆ柇鏃堕棿鏄惁澶勪簬鏌愪釜鏃堕棿娈靛唴
+ *
+ * @param time 闇�瑕佹瘮杈冪殑鏃堕棿
+ * @param from 璧峰鏃堕棿
+ * @param to 缁撴潫鏃堕棿
+ * @return
+ */
+ public static boolean belongCalendar(Date time, Date from, Date to) {
+ System.out.println("11111"+time+"222"+from+"333"+to);
+ Calendar date = Calendar.getInstance();
+ date.setTime(time);
+ Calendar after = Calendar.getInstance();
+ after.setTime(from);
+ Calendar before = Calendar.getInstance();
+ before.setTime(to);
+ if (date.after(after) && date.before(before)) {
+ return true;
+ } else {
+ return false;
+ }
}
private LambdaQueryWrapper<LiveStreaming> uniqueCondition(LiveStreaming liveStreaming){
@@ -52,11 +80,12 @@
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;
}
@Override
- public AjaxResult selectDataList(LiveStreaming liveStreaming, Integer pageNum, Integer pageSize) {
+ public AjaxResult selectDataList(LiveStreaming liveStreaming, Integer pageNum, Integer pageSize) throws ParseException {
//瑕佹煡鑷繁瀹跺涵鐨�
// ZInfoUser myself = zInfoUserService.getMyself();
// if(myself==null)
@@ -75,6 +104,7 @@
LambdaQueryWrapper<LiveStreaming> lqw = buildCondition(liveStreaming);
+
Page<LiveStreaming> liveStreamingPage = new Page<>(pageNum, pageSize);
Page<LiveStreaming> pageResult = page(liveStreamingPage, lqw);
@@ -83,6 +113,8 @@
// List<LiveStreaming> dtoResult = markOwnData(familyId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+
+
return AjaxResult.success(data);
}
@@ -98,14 +130,29 @@
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());
+ 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.setStatus(0);
+ liveStreaming.setEndTime(getEndTime1(liveStreaming));
if (save(liveStreaming)) {
EsModel esModel = new EsModel();
@@ -116,9 +163,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);
@@ -129,4 +182,13 @@
}
}
+ @Override
+ public AjaxResult deleteData(Long[] ids) {
+ List<LiveStreaming> liveStreaming = selectByIds(ids);
+ for (LiveStreaming liveStreaming1:liveStreaming) {
+ liveStreaming1.setStatus(1);
+ updateById(liveStreaming1);
+ }
+ return AjaxResult.success();
+}
}
--
Gitblit v1.9.1