| ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/mapper/ProjectMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/query/DeviceDetailCheckListQuery.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceDetailCheckListVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -7,6 +7,7 @@ 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.service.*; @@ -134,4 +135,14 @@ page.setRecords(list); return R.ok(page); } @ApiOperation(value = "获取设备详情检查列表") @PostMapping("/getDeviceDetailCheckList") public R<Page<DeviceDetailCheckListVo>> getDeviceDetailCheckList(@RequestBody DeviceDetailCheckListQuery query) { Page<DeviceDetailCheckListVo> page = new Page<>(query.getPageNum(), query.getPageSize()); List<DeviceDetailCheckListVo> list = projectService.getDeviceDetailCheckList(page,query); page.setRecords(list); return R.ok(page); } } ruoyi-system/src/main/java/com/ruoyi/system/mapper/ProjectMapper.java
@@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.system.model.Project; import com.ruoyi.system.vo.DeviceDetailCheckListVo; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -14,4 +19,7 @@ */ public interface ProjectMapper extends BaseMapper<Project> { List<DeviceDetailCheckListVo> getDeviceDetailCheckList(@Param("page") Page<DeviceDetailCheckListVo> page, @Param("projectId") Integer projectId); } ruoyi-system/src/main/java/com/ruoyi/system/query/DeviceDetailCheckListQuery.java
New file @@ -0,0 +1,14 @@ 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; @Data @ApiModel("设备详情检查列表查询query") public class DeviceDetailCheckListQuery extends BasePage { @ApiModelProperty("项目id") private Integer projectId; } ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectService.java
@@ -1,8 +1,13 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.model.Project; import com.ruoyi.system.query.DeviceDetailCheckListQuery; import com.ruoyi.system.vo.DeviceDetailCheckListVo; import java.util.List; /** * <p> @@ -14,4 +19,7 @@ */ public interface ProjectService extends IService<Project> { List<DeviceDetailCheckListVo> getDeviceDetailCheckList(Page<DeviceDetailCheckListVo> page, DeviceDetailCheckListQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectServiceImpl.java
@@ -1,11 +1,21 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.mapper.ProjectMapper; import com.ruoyi.system.model.Client; import com.ruoyi.system.model.ClientParam; import com.ruoyi.system.model.Project; import com.ruoyi.system.query.DeviceDetailCheckListQuery; import com.ruoyi.system.service.ClientParamService; import com.ruoyi.system.service.ProjectService; import com.ruoyi.system.vo.DeviceDetailCheckListVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -18,4 +28,23 @@ @Service public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService { @Autowired private ClientParamService clientParamService; @Override public List<DeviceDetailCheckListVo> getDeviceDetailCheckList(Page<DeviceDetailCheckListVo> page, DeviceDetailCheckListQuery query) { Project project = this.getById(query.getProjectId()); Integer clientId = project.getClientId(); List<DeviceDetailCheckListVo> deviceDetailCheckList = this.baseMapper.getDeviceDetailCheckList(page, query.getProjectId()); ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, clientId)); if(param!=null){ deviceDetailCheckList.forEach(item -> { item.setCommentType(param.getCommentType()); }); } return deviceDetailCheckList; } } ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceDetailCheckListVo.java
New file @@ -0,0 +1,39 @@ package com.ruoyi.system.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; @Data @ApiModel("设备详情检查列表信息Vo") public class DeviceDetailCheckListVo { private Integer id; @ApiModelProperty("检查计划名称") private String planName; @ApiModelProperty("计划类型") private Integer planType; @ApiModelProperty("检查时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDateTime checkTime; @ApiModelProperty("模糊分数") private String fuzzyScore; @ApiModelProperty("打分分数") private String score; @ApiModelProperty("风险类型") private Integer riskLevel; @ApiModelProperty(value = "1模糊评价 2打分评价") private Integer commentType=1; } ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml
@@ -24,5 +24,15 @@ <result column="client_id" property="clientId" /> <result column="premission" property="premission" /> </resultMap> <select id="getDeviceDetailCheckList" resultType="com.ruoyi.system.vo.DeviceDetailCheckListVo"> select t1.id,t2.name planName,t2.type planType,t1.date checkTime,t2.system_fuzzy fuzzyScore,t2.system_score score,t3.risk_level riskLevel from task t1 left join plan t2 on t1.plan_id = t2.id left join eval_result t3 on t1.id = t3.check_task_id where t1.project_id = #{projectId} order by t1.date desc </select> </mapper>