From 9a5883db73ff33bdec2aa026eb0229109762474f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 13 九月 2023 16:08:01 +0800
Subject: [PATCH] 设备健康列表
---
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
index a39956c..836e2ca 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
@@ -1,15 +1,22 @@
package com.ruoyi.alarmpoints.tube.service.impl;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
+import com.ruoyi.alarmpoints.tube.domain.ArdTubesParam;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesMapper;
import com.ruoyi.alarmpoints.tube.service.IArdTubesService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.utils.result.Results;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
/**
@@ -24,6 +31,7 @@
private ArdTubesMapper ardTubesMapper;
@Resource
private ArdTubesDetailsMapper ardTubesDetailsMapper;
+
/**
* 鏌ヨ绠＄嚎绠＄悊
*
@@ -44,13 +52,16 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdTubes> selectArdTubesList(ArdTubes ardTubes) {
- ArdTubesDetails tubesDetails=new ArdTubesDetails();
- tubesDetails.setTubeId(ardTubes.getId());
- List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
- ArdTubes arttube=new ArdTubes();
- arttube.setChildCount(ardTubesDetails.size());
- ardTubesMapper.updateArdTubes(arttube);
- return ardTubesMapper.selectArdTubesList(ardTubes);
+
+ List<ArdTubes> tubes = ardTubesMapper.selectArdTubesList(ardTubes);
+ for (ArdTubes tube : tubes) {
+ ArdTubesDetails tubesDetails = new ArdTubesDetails();
+ tubesDetails.setTubeId(tube.getId());
+ List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
+ tube.setChildCount(ardTubesDetails.size());
+ ardTubesMapper.updateArdTubes(tube);
+ }
+ return tubes;
}
/**
@@ -61,6 +72,7 @@
*/
@Override
public int insertArdTubes(ArdTubes ardTubes) {
+ ardTubes.setId(IdUtils.simpleUUID());
ardTubes.setChildCount(0);
ardTubes.setUserId(SecurityUtils.getUserId());
ardTubes.setCreateBy(SecurityUtils.getUsername());
@@ -90,11 +102,11 @@
*/
@Override
public int deleteArdTubesByIds(String[] ids) {
- for (String id: ids ) {
- ArdTubesDetails tubesDetails=new ArdTubesDetails();
+ for (String id : ids) {
+ ArdTubesDetails tubesDetails = new ArdTubesDetails();
tubesDetails.setTubeId(id);
List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
- if(ardTubesDetails.size()>0) {
+ if (ardTubesDetails.size() > 0) {
for (ArdTubesDetails tubesDetail : ardTubesDetails) {
int i = ardTubesDetailsMapper.deleteArdTubesDetailsById(tubesDetail.getId());
}
@@ -111,14 +123,66 @@
*/
@Override
public int deleteArdTubesById(String id) {
- ArdTubesDetails tubesDetails=new ArdTubesDetails();
+ ArdTubesDetails tubesDetails = new ArdTubesDetails();
tubesDetails.setTubeId(id);
List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
- if(ardTubesDetails.size()>0) {
+ if (ardTubesDetails.size() > 0) {
for (ArdTubesDetails tubesDetail : ardTubesDetails) {
int i = ardTubesDetailsMapper.deleteArdTubesDetailsById(tubesDetail.getId());
}
}
return ardTubesMapper.deleteArdTubesById(id);
}
+
+ @Override
+ public Results tubeById(String id) {
+ ArdTubes ardTubes = ardTubesMapper.selectById(id);
+ if(ardTubes!=null){
+ QueryWrapper<ArdTubesDetails> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tube_id",id);
+ List<ArdTubesDetails> list = ardTubesDetailsMapper.selectList(queryWrapper);
+ ardTubes.setArdTubesDetails(list);
+ }
+ return Results.succeed(ardTubes);
+ }
+
+ @Override
+ public Results tobeList(List<Long> deptList) {
+ QueryWrapper<ArdTubes> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("dept_id",deptList);
+ List<ArdTubes> list = ardTubesMapper.selectList(queryWrapper);
+ if(list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ ArdTubes ardTubes = list.get(i);
+ QueryWrapper<ArdTubesDetails> detailsQueryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tube_id",ardTubes.getId());
+ List<ArdTubesDetails> details = ardTubesDetailsMapper.selectList(detailsQueryWrapper);
+ ardTubes.setArdTubesDetails(details);
+ }
+ }
+ return Results.succeed(list);
+ }
+
+ @Override
+ public Results conditionList(ArdTubesParam ardTubesParam) {
+ QueryWrapper<ArdTubes> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("dept_id",ardTubesParam.getDeptList())
+ .eq(!StringUtils.isBlank(ardTubesParam.getName()),"name",ardTubesParam.getName())
+ .eq(!StringUtils.isBlank(ardTubesParam.getType()),"type",ardTubesParam.getType())
+ .eq(!StringUtils.isBlank(ardTubesParam.getPipeDiameter()),"pipe_diameter",ardTubesParam.getPipeDiameter())
+ .eq(!StringUtils.isBlank(ardTubesParam.getColor()),"color",ardTubesParam.getColor());
+ List<ArdTubes> list = ardTubesMapper.selectList(queryWrapper);
+ if(list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ ArdTubes ardTubes = list.get(i);
+ QueryWrapper<ArdTubesDetails> detailsQueryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tube_id",ardTubes.getId());
+ List<ArdTubesDetails> details = ardTubesDetailsMapper.selectList(detailsQueryWrapper);
+ ardTubes.setArdTubesDetails(details);
+ }
+ }
+ return Results.succeed(list);
+ }
+
+
}
--
Gitblit v1.9.3