From dc85547a4e5b3d377c7613efa32fc6cc0ab2e8c1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 11 四月 2024 09:23:14 +0800
Subject: [PATCH] app光电查询rtsp路径修改提交
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 203 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 155 insertions(+), 48 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..f9c31ad 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
@@ -2,17 +2,27 @@
import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
+import com.ruoyi.app.task.domain.WellParam;
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;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Optional;
+import java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -33,9 +43,15 @@
@Service
public class ArdAppTaskServiceImpl implements IArdAppTaskService {
@Resource
+ ArdAppTaskDetailPicMapper ardAppTaskDetailPicMapper;
+ @Resource
private ArdAppTaskMapper ardAppTaskMapper;
@Resource
private ArdAppTaskTextMapper ardAppTaskTextMapper;
+ @Resource
+ private SysUserMapper sysUserMapper;
+ @Resource
+ private ArdAlarmpointsWellMapper wellMapper;
/**
* 鏌ヨapp浠诲姟绠＄悊
@@ -45,7 +61,43 @@
*/
@Override
public ArdAppTask selectArdAppTaskById(String id) {
- return ardAppTaskMapper.selectArdAppTaskById(id);
+ ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
+ if(StringUtils.isNull(ardAppTask))
+ {
+ return null;
+ }
+ List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
+ if(ardAppTaskDetailList.size()>0)
+ {
+ ardAppTaskDetailList = ardAppTaskDetailList.stream()
+ .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAppTaskDetail::getName))), ArrayList::new));
+ ardAppTask.setArdAppTaskDetailList(ardAppTaskDetailList);
+ }
+
+ List<String> userIds = ardAppTaskMapper.selectArdAppTaskDetailUserIdsByTaskId(id);
+ if (userIds.size() > 0) {
+ ardAppTask.setUserIds(userIds);
+ List<SysUser> sysUserList=new ArrayList<>();
+ for (String userId : userIds) {
+ SysUser sysUser = sysUserMapper.selectUserById(userId);
+ sysUserList.add(sysUser);
+ }
+ ardAppTask.setSysUserList(sysUserList);
+
+ }
+ return ardAppTask;
+ }
+
+ @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;
}
/**
@@ -55,9 +107,22 @@
* @return app浠诲姟绠＄悊
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask) {
- return ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+ List<ArdAppTask> parentList = ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+
+ if(StringUtils.isNotNull(ardAppTask.getAppUserId())) {
+ //濡傛灉app鐢ㄦ埛id涓嶄负绌�,鏌ヨ鍑烘墍鏈変换鍔＄殑瀛愪换鍔″垪琛�
+ for(ArdAppTask appTask:parentList)
+ {
+ List<ArdAppTaskDetail> ardAppTaskDetails = ardAppTaskMapper.selectArdAppTaskDetailListByTaskId(appTask.getId());
+ appTask.setArdAppTaskDetailList(ardAppTaskDetails);
+ }
+ //閫氳繃app鐢ㄦ埛id杩囨护瀛愪换鍔″垪琛ㄦ潵杩囨护鍑虹埗浠诲姟鍒楄〃
+ parentList = parentList.stream()
+ .filter(parent -> parent.getArdAppTaskDetailList().stream().anyMatch(child -> child.getUserId().equals(ardAppTask.getAppUserId())))
+ .collect(Collectors.toList());
+ }
+ return parentList;
}
/**
@@ -68,32 +133,20 @@
*/
@Override
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
- ardAppTask.setUserId(SecurityUtils.getUserId());
- List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
- List<ArdAppTask>list=new ArrayList<>();
- list.addAll(list1);
+ List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
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) {
+ List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
+ for(ArdAppTaskDetail detail : list.get(0).getArdAppTaskDetailList()) {
+ ArdAppTaskDetailPic ardAppTaskDetailPic =new ArdAppTaskDetailPic();
+ ardAppTaskDetailPic.setTaskDetailId(detail.getId());
+ List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetailPicMapper.selectArdAppTaskDetailPicList(ardAppTaskDetailPic);
+ detail.setArdAppTaskDetailPic(ardAppTaskDetailPicList);
+ }
+ return list;
}
/**
@@ -107,7 +160,7 @@
public int insertArdAppTask(ArdAppTask ardAppTask) {
ardAppTask.setId(IdUtils.simpleUUID());
ardAppTask.setUserId(SecurityUtils.getUserId());
- ardAppTask.setCreateBy(SecurityUtils.getUsername());
+ ardAppTask.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
ardAppTask.setCreateTime(DateUtils.getNowDate());
int rows = ardAppTaskMapper.insertArdAppTask(ardAppTask);
insertArdAppTaskPic(ardAppTask);
@@ -127,8 +180,7 @@
public int updateArdAppTask(ArdAppTask ardAppTask) {
ardAppTask.setUpdateBy(SecurityUtils.getUsername());
ardAppTask.setUpdateTime(DateUtils.getNowDate());
- ardAppTaskMapper.deleteArdAppTaskPicByTaskId(ardAppTask.getId());
- ardAppTaskMapper.deleteArdAppTaskDetailByTaskId(ardAppTask.getId());
+
insertArdAppTaskPic(ardAppTask);
insertArdAppTaskDetail(ardAppTask);
return ardAppTaskMapper.updateArdAppTask(ardAppTask);
@@ -168,8 +220,10 @@
*/
public void insertArdAppTaskPic(ArdAppTask ardAppTask) {
List<ArdAppTaskPic> ardAppTaskPicList = ardAppTask.getArdAppTaskPicList();
- String id = ardAppTask.getId();
if (StringUtils.isNotNull(ardAppTaskPicList)) {
+ ardAppTaskMapper.deleteArdAppTaskPicByTaskId(ardAppTask.getId());
+ String id = ardAppTask.getId();
+
List<ArdAppTaskPic> list = new ArrayList<ArdAppTaskPic>();
for (ArdAppTaskPic ardAppTaskPic : ardAppTaskPicList) {
ardAppTaskPic.setId(IdUtils.simpleUUID());
@@ -188,21 +242,29 @@
* @param ardAppTask app浠诲姟绠＄悊瀵硅薄
*/
public void insertArdAppTaskDetail(ArdAppTask ardAppTask) {
- List<String> userIds = ardAppTask.getUserIds();
- for (String userId : userIds) {
- List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
- String id = ardAppTask.getId();
- if (StringUtils.isNotNull(ardAppTaskDetailList)) {
- List<ArdAppTaskDetail> list = new ArrayList<ArdAppTaskDetail>();
- for (ArdAppTaskDetail ardAppTaskDetail : ardAppTaskDetailList) {
- ardAppTaskDetail.setId(IdUtils.simpleUUID());
- ardAppTaskDetail.setStatus("0");
- ardAppTaskDetail.setTaskId(id);
- ardAppTaskDetail.setUserId(userId);
- list.add(ardAppTaskDetail);
- }
- if (list.size() > 0) {
- ardAppTaskMapper.batchArdAppTaskDetail(list);
+ List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
+ if (StringUtils.isNotNull(ardAppTaskDetailList)) {
+ if (ardAppTaskDetailList.size() > 0) {
+ List<String> userIds = ardAppTask.getUserIds();
+ if (userIds.size() > 0) {
+ ardAppTaskMapper.deleteArdAppTaskDetailByTaskId(ardAppTask.getId());
+ for (String userId : userIds) {
+ String id = ardAppTask.getId();
+ if (StringUtils.isNotNull(ardAppTaskDetailList)) {
+ List<ArdAppTaskDetail> list = new ArrayList<ArdAppTaskDetail>();
+ for (ArdAppTaskDetail ardAppTaskDetail : ardAppTaskDetailList) {
+ ardAppTaskDetail.setId(IdUtils.simpleUUID());
+ ardAppTaskDetail.setStatus("0");
+ ardAppTaskDetail.setTaskId(id);
+ ardAppTaskDetail.setUserId(userId);
+ list.add(ardAppTaskDetail);
+ }
+ if (list.size() > 0) {
+
+ ardAppTaskMapper.batchArdAppTaskDetail(list);
+ }
+ }
+ }
}
}
}
@@ -236,8 +298,15 @@
*/
@Override
public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail) {
+ ardAppTaskDetail.setClockInTime(DateUtils.getNowDate());
insertArdAppTaskPic(ardAppTaskDetail);
return ardAppTaskMapper.updateArdAppTaskDetail(ardAppTaskDetail);
+ }
+
+ @Override
+ public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail) {
+ ardAppTaskDetail.setViewTime(DateUtils.getNowDate());
+ return ardAppTaskMapper.updateArdAppTaskDetailView(ardAppTaskDetail);
}
/**
@@ -249,6 +318,7 @@
List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetail.getArdAppTaskDetailPic();
String detailId = ardAppTaskDetail.getId();
if (StringUtils.isNotNull(ardAppTaskDetailPicList)) {
+ ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
List<ArdAppTaskDetailPic> list = new ArrayList<ArdAppTaskDetailPic>();
for (ArdAppTaskDetailPic ardAppTaskDetailPic : ardAppTaskDetailPicList) {
ardAppTaskDetailPic.setId(IdUtils.simpleUUID());
@@ -256,9 +326,46 @@
list.add(ardAppTaskDetailPic);
}
if (list.size() > 0) {
- ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
ardAppTaskMapper.batchArdAppTaskDetailPic(list);
}
}
}
+
+ @Override
+ public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
+ ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
+ if (StringUtils.isNotNull(ardAppTask)) {
+ ArdAppTaskDetail detail = new ArdAppTaskDetail();
+ detail.setViewFlag("1");
+ detail.setTaskId(ardAppTask.getId());
+ int i = ardAppTaskMapper.updateArdAppTaskDetailByTaskId(detail);
+ }
+ return ardAppTask;
+ }
+
+ /**
+ * 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
+ *
+ * @param userId app鐢ㄦ埛Id
+ * @return 缁撴灉
+ */
+ @Override
+ public int selectUnreadArdAppTaskCount(String userId) {
+ return ardAppTaskMapper.selectUnreadArdAppTaskCount(userId);
+ }
+
+ @Override
+ public PageInfo likeWell(WellParam wellParam) {
+ if(wellParam.getPageNum()==null || wellParam.getPageNum() == 0){
+ wellParam.setPageNum(1);
+ }
+ if(wellParam.getPageSize()==null || wellParam.getPageSize() == 0){
+ wellParam.setPageSize(10);
+ }
+ PageHelper.startPage(wellParam.getPageNum(),wellParam.getPageSize());
+ QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(wellParam.getWellId()!=null,"well_id",wellParam.getWellId());
+ List<ArdAlarmpointsWell> list = wellMapper.selectList(queryWrapper);
+ return new PageInfo(list);
+ }
}
--
Gitblit v1.9.3