From 95e7b2fc8639bb452f97a661ce28454da26a9c4a Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Fri, 25 Jul 2025 11:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=A4=96=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=9AfileType=EF=BC=88imgType?= =?UTF-8?q?=EF=BC=89=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolResultController.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 68c3d5c..5326032 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1405,7 +1405,13 @@ public class PatrolResultController extends BaseController { } if (StringUtils.isNotEmpty(patrolResult.getFileType())) { - patrolResult2.setFileType(patrolResult.getFileType()); + String fileType = patrolResult.getFileType(); + if (fileType.indexOf(",") > 0 && fileType.endsWith(",")) { + // 去掉最后一个逗号 + patrolResult2.setFileType(fileType.substring(0, fileType.lastIndexOf(","))); + } else { + patrolResult2.setFileType(fileType); + } } if (StringUtils.isNotEmpty(patrolResult.getTime())) { @@ -1489,6 +1495,16 @@ public class PatrolResultController extends BaseController { } } + if (StringUtils.isNotEmpty(patrolResult.getFileType())) { + String fileType = patrolResult.getFileType(); + if (fileType.indexOf(",") > 0 && fileType.endsWith(",")) { + // 去掉最后一个逗号 + patrolResult.setFileType(fileType.substring(0, fileType.lastIndexOf(","))); + } else { + patrolResult.setFileType(fileType); + } + } + Map valueMap = patrolResultService.getPatrolResultValue(patrolResult); if (null != valueMap && !valueMap.isEmpty()) { logger.info("valueMap:" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit"));