feat: 可配置仅下载文件名包含特定文字的功能

main
huangfeng 7 months ago
parent 2ff458c992
commit cc1e9a75fe

@ -40,6 +40,10 @@ public class IedDlConfig {
@Column(name = "path") @Column(name = "path")
private String path; private String path;
@ApiModelProperty("包含名字")
@Column(name = "contain")
private String contain;
@ApiModelProperty("后缀名") @ApiModelProperty("后缀名")
@Column(name = "suffix") @Column(name = "suffix")
private String suffix; private String suffix;

@ -178,8 +178,8 @@ public class IEDCollectService {
for (FileInformation file : fileList) { for (FileInformation file : fileList) {
String filename = file.getFilename(); String filename = file.getFilename();
if (!filename.endsWith("/")) { if (!filename.endsWith("/")) {
if (StringUtils.isBlank(config.getSuffix()) || if (matchSuffix(filename, config.getSuffix())
filename.toLowerCase().endsWith(config.getSuffix().toLowerCase())) { && matchContain(filename, config.getContain())) {
IedDlRecord record = new IedDlRecord(); IedDlRecord record = new IedDlRecord();
record.setConfigId(config.getId()); record.setConfigId(config.getId());
record.setFilename(filename); 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) { public static void updateLastData(Integer eqmid, String colname, String value, String time) {
HashMap<String, String> map = StaticVariable.sensorLastDataMap.get(eqmid); HashMap<String, String> map = StaticVariable.sensorLastDataMap.get(eqmid);
if (map == null) { if (map == null) {

Loading…
Cancel
Save