From e01bf35d3d0256ed2e889e24d8ff9f541032551b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 20 一月 2026 14:58:00 +0800
Subject: [PATCH] 大屏项目接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 139 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 132 insertions(+), 7 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 0c9dbf5..41c35aa 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
@@ -7,22 +7,25 @@
import com.ruoyi.system.dto.EditHiddenDangerResponsiblePersonDto;
import com.ruoyi.system.model.*;
import com.ruoyi.system.model.Record;
-import com.ruoyi.system.query.DeviceDetailCheckListQuery;
-import com.ruoyi.system.query.DeviceListQuery;
-import com.ruoyi.system.query.HiddenDangerListQuery;
+import com.ruoyi.system.query.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.var;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.parsing.Problem;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.groupingBy;
@RestController
@RequestMapping("/project")
@@ -45,6 +48,19 @@
@Autowired
private RecordService recordService;
+ @Autowired
+ private CheckService checkService;
+
+ @Autowired
+ private OnDutyService onDutyService;
+
+ @Autowired
+ private PositionService positionService;
+
+
+ @Autowired
+ private PlanService planService;
+
@ApiOperation(value = "获取项目详情",response = Project.class)
@@ -57,7 +73,7 @@
List<String> properties = deviceUsageService.getDeviceUsageList(id);
projectVo.setProperties( properties);
- ProjectInfo projectInfo = projectInfoService.getOne(new LambdaUpdateWrapper<ProjectInfo>().eq(ProjectInfo::getProjectId, id));
+ ProjectInfo projectInfo = projectInfoService.getOne(new LambdaUpdateWrapper<ProjectInfo>().eq(ProjectInfo::getProjectId, id).eq(ProjectInfo::getDeleted,false).orderByDesc(ProjectInfo::getCreateTime).last("limit 1"));
if(projectInfo!=null){
projectVo.setProgress(projectInfo.getProgress());
}
@@ -70,7 +86,7 @@
}
- @ApiOperation(value = "获取项目隐患数量",response = Project.class)
+ @ApiOperation(value = "获取项目隐患数量",response = HiddenDangerVo.class)
@GetMapping("/getProjectHiddenDangerCount/{id}")
public R<HiddenDangerVo> getProjectHiddenDangerCount(@PathVariable Integer id) {
HiddenDangerVo hiddenDangerVo = new HiddenDangerVo();
@@ -85,6 +101,13 @@
hiddenDangerVo.setUnRectified(records.size()-rectified);
}
return R.ok(hiddenDangerVo);
+ }
+
+ @ApiOperation(value = "获取设备数量",response = DeviceCountVo.class)
+ @GetMapping("/getProjectDeviceCount/{id}")
+ public R<List<DeviceCountVo>> getProjectDeviceCount(@PathVariable Integer id) {
+ List<DeviceCountVo> list = deviceUsageService.getProjectDeviceCount(id);
+ return R.ok(list);
}
@@ -137,7 +160,7 @@
}
- @ApiOperation(value = "获取设备详情检查列表")
+ @ApiOperation(value = "获取设备详情检查列表",response = DeviceDetailCheckListVo.class)
@PostMapping("/getDeviceDetailCheckList")
public R<Page<DeviceDetailCheckListVo>> getDeviceDetailCheckList(@RequestBody DeviceDetailCheckListQuery query) {
Page<DeviceDetailCheckListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
@@ -145,4 +168,106 @@
page.setRecords(list);
return R.ok(page);
}
+
+
+ @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));
+ return R.ok(list);
+ }
+
+ @ApiOperation(value = "获取设备详情检查资料详情")
+ @GetMapping("/getDeviceDetailCheckPlanDetail")
+ public R<Check> getDeviceDetailCheckPlanDetail(@RequestParam Integer id) {
+ Check check = checkService.getDeviceDetailCheckPlanDetail(id);
+ return R.ok(check);
+ }
+
+
+
+ @ApiOperation(value = "获取大屏人员在岗信息")
+ @GetMapping("/getProjectPersonInfo")
+ public R<List<ProjectPersonInfoVo>> getProjectPersonInfo(@RequestParam Integer projectId) {
+ List<OnDuty> list = onDutyService.list(new LambdaQueryWrapper<OnDuty>().eq(OnDuty::getProjectId,projectId));
+ Map<Integer, List<OnDuty>> map = list.stream().collect(groupingBy(OnDuty::getPositionId));
+ List<ProjectPersonInfoVo> resultList = new ArrayList<>();
+ // map循环
+ for (Map.Entry<Integer, List<OnDuty>> entry : map.entrySet()){
+ Integer key = entry.getKey();
+ Position position = positionService.getById(key);
+ ProjectPersonInfoVo projectPersonInfoVo = new ProjectPersonInfoVo();
+ projectPersonInfoVo.setPostName(position.getName());
+ List<OnDuty> onDuties = entry.getValue();
+ long count = onDuties.stream().filter(e -> e.getState() == 1).count();
+ int size = onDuties.size();
+ BigDecimal rate = BigDecimal.valueOf(count).divide(BigDecimal.valueOf(size), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
+ projectPersonInfoVo.setRate(rate.toString());
+ resultList.add(projectPersonInfoVo);
+ }
+
+ return R.ok(resultList);
+ }
+
+
+ @ApiOperation(value = "获取岗位下拉框信息",response = Position.class)
+ @GetMapping("/getPositionList")
+ public R<List<Position>> getPositionList() {
+ List<Position> list = positionService.list(new LambdaQueryWrapper<Position>().eq(Position::getDeleted, false));
+ return R.ok(list);
+ }
+
+
+ @ApiOperation(value = "获取计划下拉框信息",response = Plan.class)
+ @GetMapping("/getPlanList")
+ public R<List<Plan>> getPlanList() {
+ List<Plan> list = planService.list(new LambdaQueryWrapper<Plan>().eq(Plan::getDeleted, false));
+ return R.ok(list);
+ }
+
+ @ApiOperation(value = "获取人员在岗列表",response = ProjectPersonOnDutyListVo.class)
+ @PostMapping("/getProjectOnDutyList")
+ public R<Page<ProjectPersonOnDutyListVo>> getProjectOnDutyList(@RequestBody @Valid ProjectPersonListQuery query) {
+ Page<ProjectPersonOnDutyListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<ProjectPersonOnDutyListVo> list = onDutyService.getProjectOnDutyList(page,query);
+ page.setRecords(list);
+ return R.ok(page);
+ }
+
+
+ @ApiOperation(value = "获取人员在岗详情")
+ @GetMapping("/getProjectOnDutyDetail/{id}")
+ public R<?> getProjectOnDutyDetail(@PathVariable Integer id) {
+ ProjectPersonOnDutyListVo vo = onDutyService.getProjectOnDutyDetail(id);
+ return R.ok(vo);
+ }
+
+
+ @ApiOperation(value = "获取项目大屏最新重大风险源",response = ProjectInfo.class)
+ @GetMapping("/getProjectDangerousSource")
+ public R<ProjectInfo> getProjectDangerousSource(@RequestParam Integer projectId) {
+ ProjectInfo projectInfo = projectInfoService.getOne(new LambdaQueryWrapper<ProjectInfo>().eq(ProjectInfo::getProjectId,projectId).eq(ProjectInfo::getDeleted, false).orderByDesc(ProjectInfo::getCreateTime).last("limit 1"));
+ return R.ok(projectInfo);
+ }
+
+
+
+ @ApiOperation(value = "获取项目重大风险源列表")
+ @PostMapping("/getProjectDangerousSourceList")
+ public R<Page<ProjectInfo>> getProjectDangerousSourceList(@RequestBody @Valid ProjectDangerousSourceListQuery query) {
+ Page<ProjectInfo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ LambdaQueryWrapper<ProjectInfo> wrapper = new LambdaQueryWrapper<ProjectInfo>().eq(ProjectInfo::getProjectId, query.getProjectId()).eq(ProjectInfo::getDeleted, false);
+ if(query.getStartTime()!=null && !query.getStartTime().isEmpty()){
+ wrapper.ge(ProjectInfo::getCreateTime, query.getStartTime());
+ }
+ if(query.getEndTime()!=null && !query.getEndTime().isEmpty()){
+ wrapper.le(ProjectInfo::getCreateTime, query.getEndTime());
+ }
+ if(query.getContent()!=null && !query.getContent().isEmpty()){
+ wrapper.like(ProjectInfo::getDetail, query.getContent());
+ }
+ Page<ProjectInfo> list = projectInfoService.page(page,wrapper);
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1