From fc8c8356f5e95cb8317069c9986120b1ecb88851 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 一月 2026 14:27:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_screen
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java | 8 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 135 ++++++++++++++++++++++++++++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java | 46 ++++++-----
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 36 ++++++--
6 files changed, 182 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
index ca978bd..0206f69 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@RestController
@RequestMapping("/projectEntrust")
@@ -107,6 +108,7 @@
public R<Page<ErrorListVo>> errorList(@RequestBody @Valid ErrorListQuery query) {
Page<ErrorListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
List<ErrorListVo> list = deviceUsageService.errorList(page, query);
+
for (ErrorListVo errorListVo : list) {
List<Integer> recordFileIds = recordImageService.lambdaQuery()
.eq(RecordImage::getRecordId, errorListVo.getId()).list()
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
index 313e6b7..d4c0bf3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
@@ -6,13 +6,19 @@
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.util.List;
@Data
@ApiModel("委托方端隐患列表查询query")
public class ErrorListQuery extends BasePage {
-
+ @ApiModelProperty("clientId")
+ private Integer clientId;
@ApiModelProperty("项目id")
private Integer projectId;
+ @ApiModelProperty("项目ids")
+ private List<Integer> projectIds;
+ @ApiModelProperty("检查ids")
+ private List<Integer> recordIds;
@ApiModelProperty("整改情况 true已整改 false未整改")
private Boolean reformed;
@ApiModelProperty("隐患类型 1安全 2设备")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
index 0a9d2b5..52d76bc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
@@ -558,7 +558,7 @@
break;
}
}
- //短路与开关
+ //短路或开关
// if (!matchesRule) {
// break;
// }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
index beb7d39..7d0d324 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
@@ -21,7 +22,6 @@
import java.time.LocalDate;
import java.time.YearMonth;
import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -86,9 +86,10 @@
.ne(Project::getType, 2) // 在建工程
.and(wrapper -> wrapper
.eq(Project::getStatus, 1) // 在建项目
+ .between(Project::getCreateTime, monthStart, monthEnd)
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .ge(Project::getSuccessTime, monthStart) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, monthStart,monthEnd) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
if (clientId != null) {
@@ -193,7 +194,7 @@
calculateMonthlyInspectionForOngoing(vo, projects, projectIds, monthStart, monthEnd);
// 3. 统计大型机械设备数
- List<MachineryStatisticsVO> machineryStatistics = calculateMachineryStatistics(projectIds);
+ List<MachineryStatisticsVO> machineryStatistics = calculateMachineryStatistics(projectIds, monthStart, monthEnd);
vo.setMachineryStatistics(machineryStatistics);
// 汇总计算设备总数统计
@@ -229,13 +230,14 @@
// 查询固定资产项目
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
projectWrapper.eq(Project::getDeleted, false)
- .eq(Project::getType, 2) // 固定资产
+ .eq(Project::getType, 2) // 在建工程
.and(wrapper -> wrapper
- .eq(Project::getStatus, 1) // 在建项目
- .or(w -> w
- .eq(Project::getStatus, 2) // 已完成项目
- .ge(Project::getSuccessTime, monthStart) // 完成时间 >= 开始日期
- )
+ .eq(Project::getStatus, 1) // 在建项目
+ .between(Project::getCreateTime, monthStart, monthEnd)
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .between(Project::getSuccessTime, monthStart,monthEnd) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
);
if (clientId != null) {
projectWrapper.eq(Project::getClientId, clientId);
@@ -393,7 +395,7 @@
/**
* 统计大型机械设备数（含已检查/未检查）
*/
- private List<MachineryStatisticsVO> calculateMachineryStatistics(List<Integer> projectIds) {
+ private List<MachineryStatisticsVO> calculateMachineryStatistics(List<Integer> projectIds, Date monthStart, Date monthEnd) {
if (projectIds.isEmpty()) {
return new ArrayList<>();
}
@@ -402,10 +404,10 @@
LambdaQueryWrapper<DeviceUsage> deviceWrapper = new LambdaQueryWrapper<>();
deviceWrapper.eq(DeviceUsage::getDeleted, false)
.in(DeviceUsage::getProjectId, projectIds);
- List<DeviceUsage> devices = deviceUsageMapper.selectList(deviceWrapper);
+ List<DeviceUsage> deviceUsages = deviceUsageMapper.selectList(deviceWrapper);
// 批量查询 Device 信息
- List<Integer> deviceIds = devices.stream()
+ List<Integer> deviceIds = deviceUsages.stream()
.map(DeviceUsage::getDeviceId)
.filter(Objects::nonNull)
.distinct()
@@ -427,7 +429,7 @@
// 按设备类型名称分组统计
final Map<Integer, Device> finalDeviceMap = deviceMap;
- Map<String, List<DeviceUsage>> deviceGroupMap = devices.stream()
+ Map<String, List<DeviceUsage>> deviceGroupMap = deviceUsages.stream()
.filter(d -> d.getDeviceId() != null)
.filter(d -> finalDeviceMap.containsKey(d.getDeviceId()))
.collect(Collectors.groupingBy(d -> {
@@ -444,7 +446,7 @@
// 查询设备检查记录
// 建立 device.id 到 device_usage.id 的映射
- Map<Integer, List<Integer>> deviceToUsageMap = devices.stream()
+ Map<Integer, List<Integer>> deviceToUsageMap = deviceUsages.stream()
.filter(d -> d.getDeviceId() != null)
.collect(Collectors.groupingBy(
DeviceUsage::getDeviceId,
@@ -457,7 +459,8 @@
recordWrapper.eq(Record::getRecordType, "error")
.isNotNull(Record::getDeviceId)
.in(Record::getDeviceId, deviceIds)
- .eq(Record::getDeleted, false);
+ .eq(Record::getDeleted, false)
+ .between(Record::getCreateTime, monthStart, monthEnd);
List<Record> records = recordMapper.selectList(recordWrapper);
// 获取已检查的 device.id 集合
@@ -666,11 +669,12 @@
*/
private Date getStartDate(Date startDate) {
if (startDate != null) {
- return startDate;
+ return DateUtil.beginOfDay(startDate);
}
// 默认为当前月份第一天
- YearMonth currentMonth = YearMonth.now();
- return Date.from(currentMonth.atDay(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
+ Date date = new Date();
+ return DateUtil.beginOfMonth(date);
+
}
/**
@@ -678,11 +682,11 @@
*/
private Date getEndDate(Date endDate) {
if (endDate != null) {
- return endDate;
+ return DateUtil.endOfDay(endDate);
}
// 默认为当前月份最后一天
- YearMonth currentMonth = YearMonth.now();
- return Date.from(currentMonth.atEndOfMonth().atTime(23, 59, 59).atZone(ZoneId.systemDefault()).toInstant());
+ Date date = new Date();
+ return DateUtil.endOfMonth(date);
}
/**
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 067cc92..6b0fcf7 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
@@ -6,12 +6,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.mapper.DeviceUsageMapper;
-import com.ruoyi.system.mapper.EvalResultMapper;
-import com.ruoyi.system.model.DeviceUsage;
-import com.ruoyi.system.model.EvalResult;
+import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.model.Record;
import com.ruoyi.system.query.*;
+import com.ruoyi.system.service.ClientParamService;
import com.ruoyi.system.service.DeviceUsageService;
import com.ruoyi.system.vo.*;
import com.ruoyi.system.vo.DeviceCountVo;
@@ -26,6 +25,7 @@
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.stream.Collectors;
@@ -44,6 +44,14 @@
@Autowired
private EvalResultMapper evalResultMapper;
+ @Autowired
+ private ProjectMapper projectMapper;
+ @Autowired
+ private ClientParamMapper clientParamMapper;
+ @Autowired
+ private TaskMapper taskMapper;
+ @Autowired
+ private RecordMapper recordMapper;
@Override
public List<String> getDeviceUsageList(Integer id) {
@@ -81,6 +89,14 @@
.ge(EvalResult::getCreateTime, startTime)
.le(EvalResult::getCreateTime, LocalDateTime.now())
).stream().collect(Collectors.groupingBy(EvalResult::getProjectId));
+ 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>())
+ .stream().collect(Collectors.groupingBy(Task::getProjectId));
+ List<Record> records = recordMapper.selectList(new LambdaQueryWrapper<Record>()
+ .eq(Record::getDeleted, false));
// 获取本月第一天凌晨
List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page,query);
for (EntrustProjectVo deviceListVo : deviceList) {
@@ -107,18 +123,39 @@
.orElse(0.0);
temp = (avgSafetyScore + avgDeviceScore)/2;
}
- // todo 查询项目所属委托人风险等级参数设置
- deviceListVo.setRisk("A类");
-
+ Integer clientId = projectMap.get(deviceListVo.getId());
+ String s = clientParamMap.get(clientId);
+ JSONObject jsonObject = JSON.parseObject(s);
+ String a = jsonObject.getString("a");
+ String b = jsonObject.getString("b");
+ String c = jsonObject.getString("c");
+ if (temp>=Float.parseFloat( a)){
+ deviceListVo.setRisk("A类");
+ }else if (temp>=Float.parseFloat( b)){
+ deviceListVo.setRisk("B类");
+ }else if (temp>=Float.parseFloat( c)){
+ deviceListVo.setRisk("C类");
+ }
}else{
- deviceListVo.setRisk("C类");
+ deviceListVo.setRisk(null);
}
- LocalDateTime checkTime = deviceListVo.getCheckTime();
- // 判断checkTime是否是本月的时间
- if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
- deviceListVo.setCheckResult("已检查");
- }else {
+ 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());
+ Record record = recordList.stream().max(Comparator.comparing(Record::getCreateTime)).orElse(null);
+ if (record!=null){
+ deviceListVo.setCheckTime(record.getCreateTime());
+ deviceListVo.setCheckResult("已检查");
+ }else{
+ deviceListVo.setCheckTime(null);
+ deviceListVo.setCheckResult("未检查");
+ deviceListVo.setRisk(null);
+ }
+ }else{
+ deviceListVo.setCheckTime(null);
deviceListVo.setCheckResult("未检查");
+ deviceListVo.setRisk(null);
}
}
return deviceList;
@@ -215,17 +252,89 @@
@Override
public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ // 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ if (query.getClientId() != null) {
+ projectWrapper.eq(Project::getClientId, query.getClientId());
+ }
+ List<Project> projects = projectMapper.selectList(projectWrapper);
+ List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
+ if (projectIds.isEmpty()){
+ projectIds.add(-1);
+ }
+ // 查询检查任务
+ LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
+ taskWrapper.in(Task::getProjectId, projectIds)
+ .eq(Task::getDeleted, false);
+ List<Task> tasks = taskMapper.selectList(taskWrapper);
+ List<Integer> checkTaskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
+
+ // 查询重大隐患记录（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();
+ query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.errorList(page, query);
return errorList;
}
@Override
public List<ErrorListVo> deviceErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ // 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ if (query.getClientId() != null) {
+ projectWrapper.eq(Project::getClientId, query.getClientId());
+ }
+ List<Project> projects = projectMapper.selectList(projectWrapper);
+ List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
+ if (projectIds.isEmpty()){
+ projectIds.add(-1);
+ }
+ // 查询检查任务
+ LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
+ taskWrapper.in(Task::getProjectId, projectIds)
+ .eq(Task::getDeleted, false);
+ List<Task> tasks = taskMapper.selectList(taskWrapper);
+ List<Integer> checkTaskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
+
+ // 查询重大隐患记录（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();
+ query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.deviceErrorList(page, query);
return errorList; }
@Override
public List<ErrorListVo> safetyErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ // 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ if (query.getClientId() != null) {
+ projectWrapper.eq(Project::getClientId, query.getClientId());
+ }
+ List<Project> projects = projectMapper.selectList(projectWrapper);
+ List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
+ if (projectIds.isEmpty()){
+ projectIds.add(-1);
+ }
+ // 查询检查任务
+ LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
+ taskWrapper.in(Task::getProjectId, projectIds)
+ .eq(Task::getDeleted, false);
+ List<Task> tasks = taskMapper.selectList(taskWrapper);
+ List<Integer> checkTaskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
+
+ // 查询重大隐患记录（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();
+ query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.safetyErrorList(page, query);
return errorList; }
diff --git a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
index 1c7fd88..407ec7a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -75,14 +75,9 @@
</select>
<select id="projectList" resultType="com.ruoyi.system.vo.EntrustProjectVo">
select
- t1.*, latest.record_time as checkTime,result.risk_level
+ t1.*,result.risk_level
from project t1
- left join device_usage t2 on t1.id = t2.project_id
- left join (
- select device_id, max(create_time) as record_time
- from record
- group by device_id
- ) latest on t2.device_id = latest.device_id
+
left join (
select score,project_id,risk_level
from eval_result
@@ -110,7 +105,7 @@
and #{query.endTime} >=latest.record_time
</if>
GROUP BY t1.id
- order by latest.record_time desc
+ order by t1.create_time desc
</select>
<select id="projectReport" resultType="com.ruoyi.system.vo.EntrustProjectReportVo">
select t1.name,t1.type,t2.score,t2.risk_level,t3.time as checkTime
@@ -128,8 +123,15 @@
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
- where t1.deleted = 0 and t2.deleted = 0 and t1.`level` =1
- <if test="query.projectId != null">
+ where t1.deleted = 0 and t2.deleted = 0 and t1.`level` =0
+ <if test="query.recordIds != null">
+ and t1.id in
+ <foreach item="item" index="index" collection="query.recordIds" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
<if test="query.reformed != null">
@@ -165,7 +167,13 @@
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
- where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is not null
+ where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is not null and
+ <if test="query.recordIds != null">
+ and t1.id in
+ <foreach item="item" index="index" collection="query.recordIds" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
@@ -198,6 +206,12 @@
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is null
+ <if test="query.recordIds != null">
+ and t1.id in
+ <foreach item="item" index="index" collection="query.recordIds" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
--
Gitblit v1.7.1