From 891442cd642c035ea7fbf65c3136509f97e24f0b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 29 一月 2026 16:01:11 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 157 insertions(+), 22 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
index 6b0fcf7..dfb028b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
@@ -21,13 +21,12 @@
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.YearMonth;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -83,21 +82,86 @@
public List<EntrustProjectVo> projectList( Page<EntrustProjectVo> page,EntrustListQuery query) {
Integer pageNum = query.getPageNum();
Integer pageSize = query.getPageSize();
- LocalDateTime startTime = LocalDateTime.of(LocalDate.now().withDayOfMonth(1), LocalDateTime.MIN.toLocalTime());
- Map<Integer, List<EvalResult>> resultMap = evalResultMapper.selectList(new LambdaQueryWrapper<EvalResult>()
- .ge(EvalResult::getCreateTime, startTime)
- .le(EvalResult::getCreateTime, LocalDateTime.now())
- ).stream().collect(Collectors.groupingBy(EvalResult::getProjectId));
+ String startTime = query.getStartTime();
+ String endTime = query.getEndTime();
+
+ // 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ if (query.getClientId() != null) {
+ projectWrapper.eq(Project::getClientId, query.getClientId());
+ }
+ if (StringUtils.hasLength(query.getName())){
+ projectWrapper.like(Project::getName, query.getName());
+ }
+ switch (query.getCategory()){
+ case 1:
+ // 查询在建资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .ne(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .ge(Project::getSuccessTime, startTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ case 2:
+ // 查询固定资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .eq(Project::getType, 2) // 固定资产
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .ge(Project::getSuccessTime, startTime) // 完成时间 >= 开始日期
+ )
+ );
+ break;
+ }
+
+ List<Project> projects = projectMapper.selectList(projectWrapper);
+ List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
+ if (projectIds.isEmpty()){
+ projectIds.add(-1);
+ }
+ query.setProjectIds(projectIds);
+ // 查询检查任务
+ LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
+ taskWrapper.in(Task::getProjectId, projectIds)
+ .eq(Task::getDeleted, false);
+ List<Task> taskList = taskMapper.selectList(taskWrapper);
+ List<Integer> checkTaskIds = taskList.stream().map(Task::getId).collect(Collectors.toList());
+ if (checkTaskIds.isEmpty()){
+ checkTaskIds.add(-1);
+ }
+ // 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
+ LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
+ recordWrapper.eq(Record::getDeleted, false)
+ .in(Record::getCheckTaskId, checkTaskIds)
+ .eq(Record::getLevel, 0); // 重大隐患等级
+ List<Integer> recordIds = recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList();
+ if (recordIds.isEmpty()){
+ recordIds.add(-1);
+ }
+
Map<Integer, Integer> projectMap = projectMapper.selectList(new LambdaQueryWrapper<Project>()
.eq(Project::getDeleted, false)).stream().collect(Collectors.toMap(Project::getId, Project::getClientId));
Map<Integer, String> clientParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>())
.stream().collect(Collectors.toMap(ClientParam::getClientId, ClientParam::getUnderConstructionProject));
- Map<Integer, List<Task>> taskMap = taskMapper.selectList(new LambdaQueryWrapper<Task>())
+ Map<Integer, List<Task>> taskMap = taskMapper.selectList(new LambdaQueryWrapper<Task>()
+ .ge(Task::getCreateTime, startTime)
+ .le(Task::getCreateTime, LocalDateTime.now())
+ .in(Task::getId, checkTaskIds)
+ .isNotNull(Task::getProjectId))
.stream().collect(Collectors.groupingBy(Task::getProjectId));
+ Map<Integer, List<EvalResult>> resultMap = evalResultMapper.selectList(new LambdaQueryWrapper<EvalResult>()
+ .in(EvalResult::getCheckTaskId, checkTaskIds)
+ ).stream().collect(Collectors.groupingBy(EvalResult::getProjectId));
List<Record> records = recordMapper.selectList(new LambdaQueryWrapper<Record>()
+ .in(Record::getId, recordIds)
.eq(Record::getDeleted, false));
- // 获取本月第一天凌晨
List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page,query);
for (EntrustProjectVo deviceListVo : deviceList) {
List<EvalResult> evalResults = resultMap.get(deviceListVo.getId());
@@ -142,7 +206,7 @@
List<Task> tasks = taskMap.get(deviceListVo.getId());
if (tasks!=null&&!tasks.isEmpty()){
List<Integer> taskIds = tasks.stream().map(Task::getId).toList();
- List<Record> recordList = records.stream().filter(e -> taskIds.contains(e.getCheckTaskId())).collect(Collectors.toList());
+ List<Record> recordList = records.stream().filter(e -> taskIds.contains(e.getCheckTaskId())).toList();
Record record = recordList.stream().max(Comparator.comparing(Record::getCreateTime)).orElse(null);
if (record!=null){
deviceListVo.setCheckTime(record.getCreateTime());
@@ -237,23 +301,96 @@
@Override
public List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query) {
+ String startTime = query.getStartTime().replace("年","-").replace("月","-").replace("日","-");
+ String endTime = query.getEndTime();
+
+ // 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ if (query.getClientId() != null) {
+ projectWrapper.eq(Project::getClientId, query.getClientId());
+ }
+ switch (query.getCategory()){
+ case 1:
+ // 查询在建资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .ne(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .ge(Project::getSuccessTime, startTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ case 2:
+ // 查询固定资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .eq(Project::getType, 2) // 固定资产
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .ge(Project::getSuccessTime, startTime) // 完成时间 >= 开始日期
+ )
+ );
+ break;
+ }
+ List<Integer> projectIds = projectMapper.selectList(projectWrapper).stream().map(Project::getId).collect(Collectors.toList());
+ query.setProjectIds(projectIds);
List<EntrustDeviceListVo> deviceList = this.baseMapper.deviceList(page, query);
+ List<Integer> deviceIds = deviceList.stream().map(EntrustDeviceListVo::getId).collect(Collectors.toList());
+ if (deviceIds.isEmpty()){
+ deviceIds.add(-1);
+ }
+ LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
+ recordWrapper.eq(Record::getRecordType, "error")
+ .isNotNull(Record::getDeviceId)
+ .in(Record::getDeviceId, deviceIds)
+ .eq(Record::getDeleted, false);
+ List<Record> records = recordMapper.selectList(recordWrapper);
+ List<Integer> deviceIdsRecord = records.stream().map(Record::getDeviceId).distinct().collect(Collectors.toList());
for (EntrustDeviceListVo deviceListVo : deviceList) {
- LocalDateTime checkTime = deviceListVo.getCheckTime();
- // 判断checkTime是否是本月的时间
- if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
- deviceListVo.setCheckResult("已检查");
- }else {
+ if (deviceIdsRecord.contains(deviceListVo.getId())){
+ Record record = records.stream().filter(e -> e.getDeviceId().equals(deviceListVo.getId())).findFirst()
+ .orElse(null);
+ if (record!=null){
+ deviceListVo.setCheckResult("已检查");
+ deviceListVo.setCheckTime(record.getCreateTime());
+ }
+ }else{
deviceListVo.setCheckResult("未检查");
+ deviceListVo.setCheckTime(null);
+
}
+//
+// LocalDateTime checkTime = deviceListVo.getCheckTime();
+// // 判断checkTime是否是本月的时间
+// if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
+// deviceListVo.setCheckResult("已检查");
+// }else {
+// deviceListVo.setCheckResult("未检查");
+// }
}
return deviceList;
}
@Override
- public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) throws ParseException {
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (StringUtils.hasLength(query.getStartTime())){
+ Date startTime = simpleDateFormat.parse(query.getStartTime());
+ }
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ projectWrapper.eq(Project::getDeleted, false)
+ .ne(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .ge(Project::getSuccessTime, "2026-01-01 00:00:00") // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
@@ -302,8 +439,7 @@
// 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
recordWrapper.eq(Record::getDeleted, false)
- .in(Record::getCheckTaskId, checkTaskIds)
- .eq(Record::getLevel, 0); // 重大隐患等级
+ .in(Record::getCheckTaskId, checkTaskIds);
List<Integer> recordIds = recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList();
query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.deviceErrorList(page, query);
@@ -331,8 +467,7 @@
// 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
recordWrapper.eq(Record::getDeleted, false)
- .in(Record::getCheckTaskId, checkTaskIds)
- .eq(Record::getLevel, 0); // 重大隐患等级
+ .in(Record::getCheckTaskId, checkTaskIds);
List<Integer> recordIds = recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList();
query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.safetyErrorList(page, query);
--
Gitblit v1.7.1