Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_sc...

liujie

2026-01-22 dea26c4551583250a43566a2cef6c0ad7580b4f1

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java

@@ -64,6 +64,14 @@
    private PlanService planService;


    @ApiOperation(value = "获取项目列表",response = Project.class)
    @GetMapping("/getProjectList")
    public R<List<Project>> getProjectList(@RequestParam Integer clientId) {
        List<Project> list = projectService.list(new LambdaQueryWrapper<Project>().eq(Project::getDeleted, false).eq(Project::getClientId, clientId).orderByDesc(Project::getCreateTime));
        return R.ok(list);
    }



    @ApiOperation(value = "获取项目详情",response = Project.class)
    @GetMapping("/getProjectDetail/{id}")
@@ -272,6 +280,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) {
@@ -308,4 +323,12 @@
        return  R.ok(list);
    }


    @ApiOperation(value = "大屏风险趋势")
    @PostMapping("/getProjectDangerousTrend")
    public R<List<ProjectDangerousTrendVo>> getProjectDangerousTrend(@RequestBody @Valid ProjectDangerousTrendQuery query) {
        List<ProjectDangerousTrendVo> list = projectInfoService.getProjectDangerousTrend(query);
        return R.ok(list);
    }

}