diff --git a/src/main/java/com/xydl/cac/entity/IedDlConfig.java b/src/main/java/com/xydl/cac/entity/IedDlConfig.java index a783753..0c468e3 100644 --- a/src/main/java/com/xydl/cac/entity/IedDlConfig.java +++ b/src/main/java/com/xydl/cac/entity/IedDlConfig.java @@ -40,6 +40,10 @@ public class IedDlConfig { @Column(name = "path") private String path; + @ApiModelProperty("包含名字") + @Column(name = "contain") + private String contain; + @ApiModelProperty("后缀名") @Column(name = "suffix") private String suffix; diff --git a/src/main/java/com/xydl/cac/iec/IEDCollectService.java b/src/main/java/com/xydl/cac/iec/IEDCollectService.java index b16af7d..5d81d77 100644 --- a/src/main/java/com/xydl/cac/iec/IEDCollectService.java +++ b/src/main/java/com/xydl/cac/iec/IEDCollectService.java @@ -178,8 +178,8 @@ public class IEDCollectService { for (FileInformation file : fileList) { String filename = file.getFilename(); if (!filename.endsWith("/")) { - if (StringUtils.isBlank(config.getSuffix()) || - filename.toLowerCase().endsWith(config.getSuffix().toLowerCase())) { + if (matchSuffix(filename, config.getSuffix()) + && matchContain(filename, config.getContain())) { IedDlRecord record = new IedDlRecord(); record.setConfigId(config.getId()); record.setFilename(filename); @@ -207,6 +207,28 @@ public class IEDCollectService { } } + private boolean matchSuffix(String filename, String suffix) { + if (StringUtils.isBlank(suffix)) { + return true; + } else { + if (filename.toLowerCase().endsWith(suffix.toLowerCase())) { + return true; + } + return false; + } + } + + private boolean matchContain(String filename, String contain) { + if (StringUtils.isBlank(contain)) { + return true; + } else { + if (filename.toLowerCase().contains(contain.toLowerCase())) { + return true; + } + return false; + } + } + public static void updateLastData(Integer eqmid, String colname, String value, String time) { HashMap map = StaticVariable.sensorLastDataMap.get(eqmid); if (map == null) {