From a845352eacdba8a8d05bb0e693e02c104b5abf98 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 02 十一月 2023 10:32:41 +0800
Subject: [PATCH] 接收解析告警前端发送的强制引导信息并进行引导
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 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 15e277d..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,8 +2,13 @@
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;
@@ -16,6 +21,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Optional;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
@@ -44,6 +50,8 @@
private ArdAppTaskTextMapper ardAppTaskTextMapper;
@Resource
private SysUserMapper sysUserMapper;
+ @Resource
+ private ArdAlarmpointsWellMapper wellMapper;
/**
* 鏌ヨapp浠诲姟绠＄悊
@@ -54,7 +62,10 @@
@Override
public ArdAppTask selectArdAppTaskById(String id) {
ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
-
+ if(StringUtils.isNull(ardAppTask))
+ {
+ return null;
+ }
List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
if(ardAppTaskDetailList.size()>0)
{
@@ -97,7 +108,21 @@
*/
@Override
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;
}
/**
@@ -328,4 +353,19 @@
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