diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 309269f..0714bba 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -119,7 +119,7 @@ public class PatrolTaskController extends BaseController { @GetMapping("/list") public TableDataInfo list(PatrolTask patrolTask) { - startPage(); +// startPage(); List taskList = patrolTaskService.selectPatrolTaskList(patrolTask); logger.debug("[TASK] patrolTask: {}, taskList: {}", patrolTask, taskList); for (PatrolTask task : taskList) { @@ -147,22 +147,27 @@ public class PatrolTaskController extends BaseController { // } // } } - + List taskListEx = taskList; if (StringUtils.isNotEmpty(patrolTask.getAreaName())) { - List taskListEx = new ArrayList<>(); + taskListEx = new ArrayList<>(); for (PatrolTask task : taskList) { if (StringUtils.isNotEmpty(task.getAreaName()) && task.getAreaName().contains(patrolTask.getAreaName())) { taskListEx.add(task); } } - PageDomain pageDomain = TableSupport.buildPageRequest(); - int pageNum = pageDomain.getPageNum(); - int pageSize = pageDomain.getPageSize(); - int toNum = Math.min(taskListEx.size(), pageNum * pageSize); - List pageList = taskListEx.subList((pageNum - 1) * pageSize, toNum); - return getDataTable(0, pageList, taskListEx); +// PageDomain pageDomain = TableSupport.buildPageRequest(); +// int pageNum = pageDomain.getPageNum(); +// int pageSize = pageDomain.getPageSize(); +// int toNum = Math.min(taskListEx.size(), pageNum * pageSize); +// List pageList = taskListEx.subList((pageNum - 1) * pageSize, toNum); +// return getDataTable(0, pageList, taskListEx); } - return getDataTable(taskList); + PageDomain pageDomain = TableSupport.buildPageRequest(); + int pageNum = pageDomain.getPageNum(); + int pageSize = pageDomain.getPageSize(); + int toNum = Math.min(taskListEx.size(), pageNum * pageSize); + List pageList = taskListEx.subList((pageNum - 1) * pageSize, toNum); + return getDataTable(0, pageList, taskListEx); } @GetMapping({"/taskInfo"}) @@ -2601,6 +2606,9 @@ public class PatrolTaskController extends BaseController { Set uniqueImages = new HashSet<>(); for (PatrolData data : newList) { + if (StringUtils.isNotEmpty(data.getImageNormalUrlPath())) { + Collections.addAll(uniqueImages, data.getImageNormalUrlPath().split(StringUtils.COMMA)); + } if (StringUtils.isNotEmpty(data.getImg())) { Collections.addAll(uniqueImages, data.getImg().split(StringUtils.COMMA)); } @@ -2709,7 +2717,7 @@ public class PatrolTaskController extends BaseController { private void createHeaderRow(Sheet sheet) { String[] headers = { "编号", "设备", "相机名", "系统", "点位id", "点位名称", "状态", - "算法名称", "读数", "初筛图片", "初筛结果", "分析图片", "分析结果", + "算法名称", "读数", "基准图", "初筛图片", "初筛结果", "分析图片", "分析结果", "复核结果", "复核详情" }; @@ -2744,9 +2752,9 @@ public class PatrolTaskController extends BaseController { row.createCell(col++).setCellValue(item.getAlgName()); row.createCell(col++).setCellValue(item.getResValue()); // 文本信息 - row.createCell(10).setCellValue(item.getFilterDesc()); // 筛选结果 - row.createCell(12).setCellValue(item.getDesc()); // 分析结果 - row.createCell(13).setCellValue(item.getBrightResStatus()); // 复核结果 + row.createCell(11).setCellValue(item.getFilterDesc()); // 筛选结果 + row.createCell(13).setCellValue(item.getDesc()); // 分析结果 + row.createCell(14).setCellValue(item.getBrightResStatus()); // 复核结果 // row.createCell(14).setCellValue(item.getBrightDesc()); // 复核详情 } @@ -2754,12 +2762,20 @@ public class PatrolTaskController extends BaseController { Row row, PatrolData item, Map imageCache) { try { + // 获取第一张基准图片(如果有) + String firstImageNormal = getFirstImage(item.getImageNormalUrlPath()); + if (firstImageNormal != null) { + byte[] imageData = imageCache.getOrDefault(firstImageNormal, new byte[0]); + // 插入基准图片(第9列) + insertImage(workbook, drawing, row, 9, imageData); + } + // 获取第一张初筛图片(如果有) String firstImage = getFirstImage(item.getImg()); if (firstImage != null) { byte[] imageData = imageCache.getOrDefault(firstImage, new byte[0]); // 插入筛选图片(第9列) - insertImage(workbook, drawing, row, 9, imageData); + insertImage(workbook, drawing, row, 10, imageData); } // 获取第一张分析图片(如果有) @@ -2767,7 +2783,7 @@ public class PatrolTaskController extends BaseController { if (firstImgAnalyse != null) { byte[] imageData = imageCache.getOrDefault(firstImgAnalyse, new byte[0]); // 插入分析图片(第11列) - insertImage(workbook, drawing, row, 11, imageData); + insertImage(workbook, drawing, row, 12, imageData); } // 获取第一张光明大模型复核结果图(如果有) @@ -2775,7 +2791,7 @@ public class PatrolTaskController extends BaseController { if (firstBrightImgAnalyse != null) { byte[] imageData = imageCache.getOrDefault(firstBrightImgAnalyse, new byte[0]); // 插入筛选图片(第14列) - insertImage(workbook, drawing, row, 14, imageData); + insertImage(workbook, drawing, row, 15, imageData); } } catch (Exception e) { logger.warn("图片插入失败", e);