|
|
|
@ -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<String, String> map = StaticVariable.sensorLastDataMap.get(eqmid);
|
|
|
|
|
if (map == null) {
|
|
|
|
|