From f4f653b1f69eae7eee5249b9f41e43bdf3239aa1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 四月 2026 15:45:56 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
index 04299d0..615a59c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -40,6 +41,7 @@
import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static java.util.stream.Collectors.groupingBy;
@@ -143,6 +145,7 @@
BeanUtils.copyProperties(project,projectVo);
List<String> properties = deviceUsageService.getDeviceUsageList(id);
+ properties = properties.stream().filter(e -> JSONObject.parseObject(e).containsKey("工程起重机械租赁单位") && JSONObject.parseObject(e).getString("工程起重机械租赁单位") != null && !JSONObject.parseObject(e).getString("工程起重机械租赁单位").isEmpty()).collect(Collectors.toList());
projectVo.setProperties( properties);
ProjectInfo projectInfo = projectInfoService.getOne(new LambdaUpdateWrapper<ProjectInfo>().eq(ProjectInfo::getProjectId, id).eq(ProjectInfo::getDeleted,false).orderByDesc(ProjectInfo::getCreateTime).last("limit 1"));
@@ -173,6 +176,23 @@
List<Integer> taskIds = list.stream().map(Task::getId).collect(Collectors.toList());
// 0是一级隐患
List<Record> records = recordService.list(new LambdaQueryWrapper<Record>().eq(Record::getLevel, 0).eq(Record::getDeleted, 0).in(Record::getCheckTaskId, taskIds));
+ hiddenDangerVo.setSerious(records.size());
+ int rectified = records.stream().filter(Record::getReformed).collect(Collectors.toList()).size();
+ hiddenDangerVo.setRectified(rectified);
+ hiddenDangerVo.setUnRectified(records.size()-rectified);
+ }
+ return R.ok(hiddenDangerVo);
+ }
+
+ @ApiOperation(value = "获取项目所有隐患数量",response = HiddenDangerVo.class)
+ @GetMapping("/getProjectHiddenDangerCountAll/{id}")
+ public R<HiddenDangerVo> getProjectHiddenDangerCountAll(@PathVariable Integer id) {
+ HiddenDangerVo hiddenDangerVo = new HiddenDangerVo();
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, id));
+ if(!list.isEmpty()){
+ List<Integer> taskIds = list.stream().map(Task::getId).collect(Collectors.toList());
+ // 0是一级隐患
+ List<Record> records = recordService.list(new LambdaQueryWrapper<Record>().eq(Record::getDeleted, 0).in(Record::getCheckTaskId, taskIds));
hiddenDangerVo.setSerious(records.size());
int rectified = records.stream().filter(Record::getReformed).collect(Collectors.toList()).size();
hiddenDangerVo.setRectified(rectified);
@@ -250,8 +270,8 @@
@ApiOperation(value = "获取检查资料列表")
@GetMapping("/getDeviceDetailCheckPlanList")
- public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId) {
- List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).orderByDesc(Check::getTime));
+ public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId,@RequestParam Integer projectId) {
+ List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).eq(projectId!=null,Check::getProjectId,projectId).orderByDesc(Check::getTime));
if(!list.isEmpty()){
List<Integer> planIds = list.stream().map(Check::getPlanId).toList();
List<Plan> plans = planService.listByIds(planIds);
@@ -309,9 +329,22 @@
@ApiOperation(value = "获取计划下拉框信息",response = Plan.class)
@GetMapping("/getPlanList")
- public R<List<Plan>> getPlanList() {
- List<Plan> list = planService.list(new LambdaQueryWrapper<Plan>().eq(Plan::getDeleted, false));
+ public R<List<Plan>> getPlanList(Integer projectId) {
+ List<Plan> list = planService.list(new LambdaQueryWrapper<Plan>().eq(projectId!=null,Plan::getProjectId,projectId).eq(Plan::getDeleted, false));
return R.ok(list);
+ }
+
+
+ @ApiOperation(value = "获取计划下拉框信息",response = Plan.class)
+ @GetMapping("/getPlanListFromOnDuty")
+ public R<List<Plan>> getPlanListFromOnDuty(Integer projectId) {
+ List<OnDuty> list = onDutyService.list(new LambdaQueryWrapper<OnDuty>().eq(OnDuty::getProjectId, projectId));
+ if(list.isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
+ List<Integer> ids = list.stream().map(OnDuty::getPlanId).toList();
+ List<Plan> resultList = planService.list(new LambdaQueryWrapper<Plan>().in(Plan::getId,ids).eq(Plan::getDeleted, false));
+ return R.ok(resultList);
}
@@ -466,7 +499,7 @@
}
private ResponseEntity<org.springframework.core.io.Resource> downloadFile(UserFile userFile) throws IOException {
- InputStreamResource resource =resolveResource(userFile);
+ InputStreamResource resource =userFileService.resolveResource(userFile);
var fileSize = userFile.getSize();
// if(resource == null) {
// resource = new InputStreamResource(getClass().getClassLoader().getResourceAsStream("images/wukong.png"));
@@ -482,15 +515,6 @@
.body(resource);
}
- public InputStreamResource resolveResource(UserFile userFile) throws IOException {
- var filePath = fileLocation.resolve(userFile.getName() + "." + userFile.getExtension()).normalize();
- if(!Files.exists(filePath)){
- return null;
- }
- return new InputStreamResource(Files.newInputStream(filePath));
- }
-
- private Path fileLocation;
--
Gitblit v1.7.1