| | |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.ruoyi.system.mapper.RecordImageMapper; |
| | | import com.ruoyi.system.mapper.RecordMapper; |
| | | import com.ruoyi.system.model.ErrorReview; |
| | | import com.ruoyi.system.model.Record; |
| | | import com.ruoyi.system.model.RecordImage; |
| | | import com.ruoyi.system.model.UserFile; |
| | | import com.ruoyi.system.query.HiddenDangerListQuery; |
| | | import com.ruoyi.system.service.RecordImageService; |
| | | import com.ruoyi.system.service.RecordService; |
| | | import com.ruoyi.system.service.TaskService; |
| | | import com.ruoyi.system.service.UserFileService; |
| | | import com.ruoyi.system.vo.HiddenDangerListVo; |
| | | import com.ruoyi.system.vo.ProblemVo; |
| | | import java.util.Map; |
| | |
| | | @Autowired |
| | | private RecordImageService recordImageService; |
| | | |
| | | @Autowired |
| | | private UserFileService userFileService; |
| | | |
| | | |
| | | |
| | |
| | | list.forEach(vo -> { |
| | | List<RecordImage> collect = recordImages.stream().filter(recordImage -> recordImage.getRecordId().equals(vo.getId())).collect(Collectors.toList()); |
| | | vo.setFileNum(collect.size()); |
| | | if(!collect.isEmpty()){ |
| | | List<Integer> fileIds = collect.stream().map(RecordImage::getUserFileId).collect(Collectors.toList()); |
| | | List<UserFile> userFiles = userFileService.listByIds(fileIds); |
| | | vo.setUserFiles(userFiles); |
| | | |
| | | } |
| | | |
| | | }); |
| | | } |
| | | |
| | |
| | | } |
| | | |
| | | @Override |
| | | public ProblemVo getHiddenDangerDetail(Integer problemId) { |
| | | public ProblemVo getHiddenDangerDetail(Integer id) { |
| | | // 根据id找到记录 |
| | | Record record = baseMapper.selectById(id); |
| | | // 直接查询并返回,让前端处理JSON字符串解析 |
| | | ProblemVo hiddenDangerDetail = baseMapper.getHiddenDangerDetail(problemId); |
| | | ProblemVo hiddenDangerDetail = baseMapper.getHiddenDangerDetail(record.getProblemId()); |
| | | String projectName =baseMapper.getProjectName(record.getCheckTaskId()); |
| | | hiddenDangerDetail.setProjectName(projectName); |
| | | |
| | | if(hiddenDangerDetail!=null){ |
| | | if (hiddenDangerDetail.getSpecificTermsStr()!=null && !hiddenDangerDetail.getSpecificTermsStr().isEmpty()) { |
| | | String specificTermsStr = hiddenDangerDetail.getSpecificTermsStr(); |
| | |
| | | hiddenDangerDetail.setNumberFactors(JSON.parseArray(numberFactorsStr, String.class)); |
| | | } |
| | | } |
| | | Integer errorReviewId = record.getErrorReviewId(); |
| | | if(errorReviewId!=null){ |
| | | ErrorReview errorReview = baseMapper.getErrorReview(errorReviewId); |
| | | if(errorReview!=null){ |
| | | // 查询图片 |
| | | List<String> img = baseMapper.findReviewImg(errorReviewId); |
| | | errorReview.setImg(img); |
| | | hiddenDangerDetail.setErrorReview(errorReview); |
| | | } |
| | | } |
| | | |
| | | return hiddenDangerDetail; |
| | | } |
| | | } |