From e279e456850734349842edd8ce52dc16fc5cdea7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 七月 2023 09:58:01 +0800
Subject: [PATCH] 增加webrt流媒体随程序启动 修复用户添加报错的bug
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index b084327..ca958c8 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -5,6 +5,7 @@
import com.github.pagehelper.PageHelper;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
import com.ruoyi.app.taskdetail.domain.ArdAppTaskDetailPic;
+import com.ruoyi.app.taskdetail.mapper.ArdAppTaskDetailPicMapper;
import com.ruoyi.app.tasktext.domain.ArdAppTaskText;
import com.ruoyi.app.tasktext.mapper.ArdAppTaskTextMapper;
import com.ruoyi.common.annotation.DataScope;
@@ -33,6 +34,8 @@
@Service
public class ArdAppTaskServiceImpl implements IArdAppTaskService {
@Resource
+ ArdAppTaskDetailPicMapper ardAppTaskDetailPicMapper;
+ @Resource
private ArdAppTaskMapper ardAppTaskMapper;
@Resource
private ArdAppTaskTextMapper ardAppTaskTextMapper;
@@ -46,6 +49,19 @@
@Override
public ArdAppTask selectArdAppTaskById(String id) {
return ardAppTaskMapper.selectArdAppTaskById(id);
+ }
+
+ @Override
+ public ArdAppTaskDetail selectArdAppTaskDetailById(String id) {
+ ArdAppTaskDetail appTaskDetail = ardAppTaskMapper.selectArdAppTaskDetailById(id);
+ ArdAppTaskDetailPic ardAppTaskDetailPic = new ArdAppTaskDetailPic();
+ ardAppTaskDetailPic.setTaskDetailId(id);
+ List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetailPicMapper.selectArdAppTaskDetailPicList(ardAppTaskDetailPic);
+ if(ardAppTaskDetailPicList.size()>0)
+ {
+ appTaskDetail.setArdAppTaskDetailPic(ardAppTaskDetailPicList);
+ }
+ return appTaskDetail;
}
/**
@@ -70,30 +86,19 @@
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
ardAppTask.setUserId(SecurityUtils.getUserId());
List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
- List<ArdAppTask>list=new ArrayList<>();
+ List<ArdAppTask> list = new ArrayList<>();
list.addAll(list1);
return list;
-// boolean flag=false;
-// List<ArdAppTask> ardAppTasks = ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
-// ardAppTask.setUserId(SecurityUtils.getUserId());
-// List<ArdAppTask> ardAppTasksNew=new ArrayList<>();
-// for (ArdAppTask appTask : ardAppTasks) {
-// ArdAppTask task = ardAppTaskMapper.selectArdAppTaskById(appTask.getId());
-// List<ArdAppTaskDetail> ardAppTaskDetailListNew = new ArrayList<>();
-// List<ArdAppTaskDetail> ardAppTaskDetailList = task.getArdAppTaskDetailList();
-// for (ArdAppTaskDetail appTaskDetail : ardAppTaskDetailList) {
-// if (appTaskDetail.getUserId().equals(ardAppTask.getUserId())) {
-// ardAppTaskDetailListNew.add(appTaskDetail);
-// flag=true;
-// }
-// }
-// if(flag) {
-// appTask.setArdAppTaskDetailList(ardAppTaskDetailListNew);
-// ardAppTasksNew.add(appTask);
-// }
-// flag=false;
-// }
-// return ardAppTasksNew;
+
+ }
+
+ @Override
+ public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask) {
+ ardAppTask.setUserId(SecurityUtils.getUserId());
+ List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetailById(ardAppTask);
+ List<ArdAppTask> list = new ArrayList<>();
+ list.addAll(list1);
+ return list;
}
/**
--
Gitblit v1.9.3