|
@@ -74,7 +74,7 @@ public class OpcService {
|
|
List<RemoteOpcLog> checkList = remoteOpcLogMapper.selectByExample(weekend);
|
|
List<RemoteOpcLog> checkList = remoteOpcLogMapper.selectByExample(weekend);
|
|
for (RemoteOpcVO result : resultList) {
|
|
for (RemoteOpcVO result : resultList) {
|
|
RemoteOpcLog remoteOpcLog = new RemoteOpcLog();
|
|
RemoteOpcLog remoteOpcLog = new RemoteOpcLog();
|
|
- remoteOpcLog.setPositionNum(result.getId());
|
|
|
|
|
|
+ remoteOpcLog.setPositionNum(result.getPositionNum());
|
|
remoteOpcLog.setResult(result.getResult());
|
|
remoteOpcLog.setResult(result.getResult());
|
|
LocalDateTime localDateTime = DateUtils.strToLocalDateTime(result.getTime(), DateUtils.PATTERN_YMD_HMS);
|
|
LocalDateTime localDateTime = DateUtils.strToLocalDateTime(result.getTime(), DateUtils.PATTERN_YMD_HMS);
|
|
remoteOpcLog.setCreatedTime(localDateTime);
|
|
remoteOpcLog.setCreatedTime(localDateTime);
|
|
@@ -84,7 +84,7 @@ public class OpcService {
|
|
// remoteOpcLog.setHour(localDateTime.getHour());
|
|
// remoteOpcLog.setHour(localDateTime.getHour());
|
|
// remoteOpcLog.setMinute(localDateTime.getMinute());
|
|
// remoteOpcLog.setMinute(localDateTime.getMinute());
|
|
remoteOpcLog.setRemark(result.getTime().split(" ")[1] + "," + result.getResult() + ";");
|
|
remoteOpcLog.setRemark(result.getTime().split(" ")[1] + "," + result.getResult() + ";");
|
|
- List<RemoteOpcLog> findItemList = checkList.stream().filter(remoteOpcLog1 -> remoteOpcLog1.getPositionNum().equals(result.getId())).collect(Collectors.toList());
|
|
|
|
|
|
+ List<RemoteOpcLog> findItemList = checkList.stream().filter(remoteOpcLog1 -> remoteOpcLog1.getPositionNum().equals(result.getPositionNum())).collect(Collectors.toList());
|
|
if (!CollectionUtils.isEmpty(findItemList) && findItemList.size() > 0) {
|
|
if (!CollectionUtils.isEmpty(findItemList) && findItemList.size() > 0) {
|
|
updateRemoteOpcLogList.add(remoteOpcLog);
|
|
updateRemoteOpcLogList.add(remoteOpcLog);
|
|
} else {
|
|
} else {
|