|
|
|
|
@ -10,6 +10,7 @@ import com.xydl.cac.repository.*;
|
|
|
|
|
import com.xydl.cac.service.DataService;
|
|
|
|
|
import com.xydl.cac.service.IedDlRecordService;
|
|
|
|
|
import com.xydl.cac.socket.WebSocketServer;
|
|
|
|
|
import com.xydl.cac.util.DateUtil;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
@ -33,6 +34,7 @@ public class IEDCollectService {
|
|
|
|
|
BizConfig _bizConfig;
|
|
|
|
|
|
|
|
|
|
String folder = "/record";
|
|
|
|
|
HashMap<Integer, String> eqmidTimeMap = new HashMap<>();
|
|
|
|
|
|
|
|
|
|
public IEDCollectService(IcdConfigTypeRepository configRepository, IcdConfigTypeAttRepository attRepository,
|
|
|
|
|
IcdConfigTypeInstRepository instRepository, RptparamindexRepository rptparamindexRepository,
|
|
|
|
|
@ -69,6 +71,7 @@ public class IEDCollectService {
|
|
|
|
|
try {
|
|
|
|
|
log.info("61850开始采集数据, ied=" + ied.getName() + ", ip=" + ied.getIp() + ", port=" + ied.getPort());
|
|
|
|
|
this.connect();
|
|
|
|
|
eqmidTimeMap.clear();
|
|
|
|
|
if (!CollectionUtils.isEmpty(rptList)) {
|
|
|
|
|
this.doCollectAndSave(configTypeList, rptList);
|
|
|
|
|
}
|
|
|
|
|
@ -116,7 +119,8 @@ public class IEDCollectService {
|
|
|
|
|
String value = iecClient.getValue(paramindexNew, fc);
|
|
|
|
|
String time = iecClient.getValue(paramindexT, fc);
|
|
|
|
|
log.info("采集到" + fc + " " + paramindexNew + "=" + value + ", t=" + time);
|
|
|
|
|
time = time.replace("T", " ").replace("Z", "").replace("z", "");
|
|
|
|
|
time = DateUtil.fromZoneUTCToLocal(time);
|
|
|
|
|
time = this.makeSameTime(rpt.getEqmid(), time);
|
|
|
|
|
_dataService.insertData(rpt.getTablename(), rpt.getEqmid(), time, rpt.getColname(), value);
|
|
|
|
|
|
|
|
|
|
// 更新最新数据缓存
|
|
|
|
|
@ -131,6 +135,15 @@ public class IEDCollectService {
|
|
|
|
|
StaticVariable.paramRelationMap.put(key, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private String makeSameTime(Integer eqmid, String time) {
|
|
|
|
|
String sameTime = eqmidTimeMap.get(eqmid);
|
|
|
|
|
if (StringUtils.isBlank(sameTime)) {
|
|
|
|
|
sameTime = time;
|
|
|
|
|
eqmidTimeMap.put(eqmid, sameTime);
|
|
|
|
|
}
|
|
|
|
|
return sameTime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private Rptparamindex findRpt(List<Rptparamindex> rptList, String paramindex) {
|
|
|
|
|
for (Rptparamindex rpt : rptList) {
|
|
|
|
|
if (rpt.getParamindex().equals(paramindex)) {
|
|
|
|
|
@ -153,6 +166,9 @@ public class IEDCollectService {
|
|
|
|
|
if (StringUtils.isBlank(config.getPath())) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (!config.getPath().endsWith("/")) {
|
|
|
|
|
config.setPath(config.getPath() + "/");
|
|
|
|
|
}
|
|
|
|
|
if (config.getDevId() == null) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
@ -162,18 +178,20 @@ 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);
|
|
|
|
|
record.setRemotePath(config.getPath() + filename);
|
|
|
|
|
boolean exist = _dlRecordService.exist(record);
|
|
|
|
|
if (!exist) {
|
|
|
|
|
String localFilePath = localPath + "/" + filename;
|
|
|
|
|
iecClient.getFile(config.getPath(), filename, _bizConfig.getDatapath() + localFilePath, config.getTodel());
|
|
|
|
|
iecClient.getFile(record.getRemotePath(), _bizConfig.getDatapath() + localFilePath, config.getTodel());
|
|
|
|
|
record.setPath(_bizConfig.getDataNginxPath() + localFilePath);
|
|
|
|
|
record.setCreateTime(new Date());
|
|
|
|
|
_dlRecordService.add(record);
|
|
|
|
|
log.info("采集到" + record.getRemotePath());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -189,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) {
|
|
|
|
|
@ -212,7 +252,7 @@ public class IEDCollectService {
|
|
|
|
|
String colname = str[1];
|
|
|
|
|
value = bda.getValueString();
|
|
|
|
|
if ("acquisitionTime".equals(colname)) {
|
|
|
|
|
value = value.replace("T", " ").replace("Z", "").replace("z", "");
|
|
|
|
|
value = DateUtil.fromZoneUTCToLocal(value);
|
|
|
|
|
}
|
|
|
|
|
updateLastData(eqmid, colname, value, null);
|
|
|
|
|
}
|
|
|
|
|
|
