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"));