From b2893120939390f1a4468ff52813b47bbda44444 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 23 一月 2026 16:53:57 +0800
Subject: [PATCH] fix:委托方大屏接口设备增加type字段返回
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java | 83 +++--------------------------------------
1 files changed, 7 insertions(+), 76 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 13f894d..395cf91 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
@@ -164,82 +164,13 @@
recordService.updateById(record);
return R.ok();
}
- @ApiOperation(value = "隐患详情")
- @GetMapping("/errorDetail")
- public R errorDetail(Integer id) {
- Record record = recordService.getById(id);
-
- return R.ok();
- }
- @ApiOperation(value = "获取项目详情", response = Project.class)
- @GetMapping("/getProjectDetail/{id}")
- public R<ProjectVo> getStoryDetail(@PathVariable Integer id) {
- ProjectVo projectVo = new ProjectVo();
- Project project = projectService.getById(id);
- BeanUtils.copyProperties(project, projectVo);
-
- List<String> properties = deviceUsageService.getDeviceUsageList(id);
- projectVo.setProperties(properties);
-
- ProjectInfo projectInfo = projectInfoService.getOne(new LambdaUpdateWrapper<ProjectInfo>().eq(ProjectInfo::getProjectId, id));
- if (projectInfo != null) {
- projectVo.setProgress(projectInfo.getProgress());
- }
- Task task = taskService.getOne(new LambdaUpdateWrapper<Task>().eq(Task::getProjectId, id).orderByDesc(Task::getUpdateTime).last("limit 1"));
-
- if (task != null) {
- projectVo.setCheckTime(task.getUpdateTime());
- }
- return R.ok(projectVo);
- }
-
-
- @ApiOperation(value = "获取项目隐患数量", response = Project.class)
- @GetMapping("/getProjectHiddenDangerCount/{id}")
- public R<HiddenDangerVo> getProjectHiddenDangerCount(@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::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 = HiddenDangerListVo.class)
- @PostMapping("/getHiddenDangerList")
- public R<Page<HiddenDangerListVo>> getHiddenDangerList(@RequestBody @Valid HiddenDangerListQuery query) {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, query.getProjectId()));
- if (tasks.isEmpty()) {
- return R.ok(new Page<>());
- }
- List<Integer> taskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
- Page<HiddenDangerListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
- List<HiddenDangerListVo> list = recordService.getHiddenDangerList(page, query, taskIds);
- page.setRecords(list);
- return R.ok(page);
-
- }
-
-
- @ApiOperation(value = "编辑隐患责任人")
- @PostMapping("/editHiddenDangerResponsiblePerson")
- public R<Void> editHiddenDangerResponsiblePerson(@RequestBody @Valid EditHiddenDangerResponsiblePersonDto dto) {
- Record record = recordService.getById(dto.getId());
- if (record == null) {
- return R.fail("隐患不存在");
- }
- record.setResponsiblePerson(dto.getResponsiblePerson());
- recordService.updateById(record);
- return R.ok();
- }
-
+// @ApiOperation(value = "隐患详情")
+// @GetMapping("/errorDetail")
+// public R errorDetail(Integer id) {
+// Record record = recordService.getById(id);
+//
+// return R.ok();
+// }
@ApiOperation(value = "获取隐患详情")
@GetMapping("/getHiddenDangerDetail/{id}")
--
Gitblit v1.7.1