liujie
2026-01-20 e01bf35d3d0256ed2e889e24d8ff9f541032551b
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -12,7 +12,6 @@
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;
@@ -74,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());
        }
@@ -243,4 +242,32 @@
        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);
    }
}