From 7d1feae71bfd79b9021e516916b79f918bfcbcd9 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 16:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 c39fc80..5363854 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
@@ -59,9 +59,30 @@
@Autowired
private PositionService positionService;
-
@Autowired
private PlanService planService;
+
+ @Autowired
+ private ScreenAccountService screenAccountService;
+
+
+ @ApiOperation(value = "获取项目/委托方列表",response = LoginNameVo.class)
+ @GetMapping("/getLoginNameVoList")
+ public R<List<LoginNameVo>> getProjectList(@RequestParam Integer userId) {
+ ScreenAccount screenAccount = screenAccountService.getById(userId);
+ String clientProjectIds = screenAccount.getClientProjectIds();
+ if(screenAccount.getType()==1){
+ // 委托方
+ List<LoginNameVo> list = screenAccountService.getLoginClient(clientProjectIds);
+ return R.ok(list);
+ }else {
+ // 项目
+ List<LoginNameVo> list = screenAccountService.getLoginProject(clientProjectIds);
+ return R.ok(list);
+
+ }
+
+ }
@@ -84,6 +105,8 @@
if(task!=null){
projectVo.setCheckTime(task.getUpdateTime());
}
+ List<DeviceCountVo> list = deviceUsageService.getProjectDeviceCount(id);
+ projectVo.setDeviceCountVos(list);
return R.ok(projectVo);
}
@@ -272,6 +295,13 @@
return R.ok(list);
}
+ @ApiOperation(value = "获取项目重大风险源详情")
+ @GetMapping("/getProjectDangerousSourceDetail/{id}")
+ public R<?> getProjectDangerousSourceDetail(@PathVariable Integer id) {
+ ProjectInfo projectInfo = projectInfoService.getById(id);
+ return R.ok(projectInfo);
+ }
+
@ApiOperation(value = "设备类型")
@GetMapping("/deviceTypes")
public R<?> deviceTypeOptions(@RequestParam(value = "title", required = false) String title) {
--
Gitblit v1.7.1