|
|
@ -119,6 +119,7 @@ public class IEDCollectService {
|
|
|
|
log.info("采集到" + fc + " " + paramindexNew + "=" + value + ", t=" + time);
|
|
|
|
log.info("采集到" + fc + " " + paramindexNew + "=" + value + ", t=" + time);
|
|
|
|
time = time.replace("T", " ").replace("Z", "").replace("z", "");
|
|
|
|
time = time.replace("T", " ").replace("Z", "").replace("z", "");
|
|
|
|
Date date = DateUtil.parse(time);
|
|
|
|
Date date = DateUtil.parse(time);
|
|
|
|
|
|
|
|
date = DateUtil.addHour(date, 8);
|
|
|
|
time = DateUtil.format(date);
|
|
|
|
time = DateUtil.format(date);
|
|
|
|
_dataService.insertData(rpt.getTablename(), rpt.getEqmid(), time, rpt.getColname(), value);
|
|
|
|
_dataService.insertData(rpt.getTablename(), rpt.getEqmid(), time, rpt.getColname(), value);
|
|
|
|
|
|
|
|
|
|
|
@ -216,6 +217,9 @@ public class IEDCollectService {
|
|
|
|
value = bda.getValueString();
|
|
|
|
value = bda.getValueString();
|
|
|
|
if ("acquisitionTime".equals(colname)) {
|
|
|
|
if ("acquisitionTime".equals(colname)) {
|
|
|
|
value = value.replace("T", " ").replace("Z", "").replace("z", "");
|
|
|
|
value = value.replace("T", " ").replace("Z", "").replace("z", "");
|
|
|
|
|
|
|
|
Date date = DateUtil.parse(value);
|
|
|
|
|
|
|
|
date = DateUtil.addHour(date, 8);
|
|
|
|
|
|
|
|
value = DateUtil.format(date);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
updateLastData(eqmid, colname, value, null);
|
|
|
|
updateLastData(eqmid, colname, value, null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|