|
@@ -109,12 +109,13 @@ public class RemoteOpcLogServiceImpl extends BaseServiceImpl<RemoteOpcLogMapper,
|
|
|
RemoteOpcLogVO vo = remoteOpcLogList.get(0);
|
|
|
String result = vo.getRemark();
|
|
|
String[] resultArr = result.split(";");
|
|
|
+ String date = DateUtils.dateToString(createdTimeEnd, DateUtils.PATTERN_YMD);
|
|
|
for (String str : resultArr) {
|
|
|
String[] item = str.split(",");
|
|
|
String time = item[0];
|
|
|
if (time.compareTo(timeB) >= 0 && time.compareTo(timeA) <= 0) {
|
|
|
RemoteOpcLogHistoryVO remoteOpcLogHistoryVO = new RemoteOpcLogHistoryVO();
|
|
|
- remoteOpcLogHistoryVO.setCreatedTime(item[0]);
|
|
|
+ remoteOpcLogHistoryVO.setCreatedTime(date + " " + item[0]);
|
|
|
remoteOpcLogHistoryVO.setResult(item[1]);
|
|
|
voList.add(remoteOpcLogHistoryVO);
|
|
|
}
|