liujie
2026-01-20 e01bf35d3d0256ed2e889e24d8ff9f541032551b
大屏项目接口
1个文件已添加
7个文件已修改
70 ■■■■■ 已修改文件
pom.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/PlanMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/ProjectInfo.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectDangerousSourceListQuery.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PlanServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProjectVo.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -16,7 +16,7 @@
        <ruoyi.version>3.8.6</ruoyi.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <java.version>17</java.version>
        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
        <druid.version>1.2.16</druid.version>
        <bitwalker.version>1.21</bitwalker.version>
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);
    }
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/PlanMapper.java
@@ -1,6 +1,9 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.Plan;
/**
 * <p>
 *  Mapper 接口
ruoyi-system/src/main/java/com/ruoyi/system/model/ProjectInfo.java
@@ -44,6 +44,7 @@
    private LocalDateTime updateTime;
    @TableField("dangerous_options")
    @ApiModelProperty(value = "危大工程")
    private String dangerousOptions;
    @TableField("detail")
@@ -56,6 +57,7 @@
    private String progressThisSeason;
    @TableField("super_dangerous_options")
    @ApiModelProperty(value = "超危大工程")
    private String superDangerousOptions;
    @ApiModelProperty(value = "风险源")
ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectDangerousSourceListQuery.java
New file
@@ -0,0 +1,25 @@
package com.ruoyi.system.query;
import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
@ApiModel("项目大屏最新重大风险源列表查询参数")
public class ProjectDangerousSourceListQuery extends BasePage {
    @ApiModelProperty("项目id")
    @NotNull(message = "项目id不能为空")
    private Integer projectId;
    @ApiModelProperty("开始时间")
    private String startTime;
    @ApiModelProperty("结束时间")
    private String endTime;
    @ApiModelProperty("搜索内容")
    private String content;
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PlanServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.PlanMapper;
import com.ruoyi.system.model.Plan;
import com.ruoyi.system.service.PlanService;
import org.springframework.stereotype.Service;
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProjectVo.java
@@ -12,6 +12,7 @@
import java.util.Date;
import java.util.List;
@Data
@ApiModel("项目信息")
public class ProjectVo {
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -16,7 +16,7 @@
        <result column="disabled" property="disabled" />
    </resultMap>
    <select id="getDeviceUsageList" resultType="java.lang.String">
        select t3.properties from device_usage t1
        select t2.properties from device_usage t1
        left join device t2 on t1.device_id = t2.id
        where t1.project_id =#{id}
    </select>
@@ -52,7 +52,7 @@
        from device t1
            left join device_usage t2
        on t1.id = t2.device_id
        where t2.project_id = #{projectId} and t2.deleted = 0
        where t2.project_id = #{id} and t2.deleted = 0
        group by t1.type
    </select>