diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java index 1f1122d..5715a1d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java @@ -254,9 +254,7 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard BigDecimal standardTakt = getStandardTakt(workStandard, workCenterExtDb); - log.info("嘉兴产线运行看板 --- center03 --- curWorkOrder:{} --- THREAD:{}", null == curWorkOrder ? null : curWorkOrder.get().getPartNo(), Thread.currentThread().getName()); - - log.info("嘉兴产线运行看板 --- center03 --- partStandardWorkMap:{} --- THREAD:{}", CollectionUtils.isEmpty(partStandardWorkMap) ? null : JSONObject.toJSONString(partStandardWorkMap), Thread.currentThread().getName()); + log.info("嘉兴产线运行看板 --- center03 --- curWorkOrder:{} --- THREAD:{}", (null == curWorkOrder || !curWorkOrder.isPresent()) ? null : curWorkOrder.get().getPartNo(), Thread.currentThread().getName()); log.info("嘉兴产线运行看板 --- center03 --- workStandard:{} --- standardTakt:{} --- THREAD:{}", workStandard, standardTakt, Thread.currentThread().getName()); @@ -357,7 +355,6 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard private Double getStopTime(List shiftProdCenterRecordList, String curTime, String lastHourTime) { if (CollectionUtils.isEmpty(shiftProdCenterRecordList)) return new Double(0); - log.info("嘉兴产线运行看板 --- center03 --- shiftProdCenterRecordList:{} --- THREAD:{}", JSONObject.toJSONString(shiftProdCenterRecordList), Thread.currentThread().getName()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(MesExtConstWords.DATETIME_FORMAT); List timeSlots = new ArrayList<>(); for (MesShiftProdCenterRecord shiftProdCenterRecord : shiftProdCenterRecordList) { @@ -368,7 +365,6 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard log.info("嘉兴产线运行看板 --- center03 --- timeSlots:{} --- THREAD:{}", JSONObject.toJSONString(timeSlots), Thread.currentThread().getName()); Double stopTime = CollectionUtils.isEmpty(timeSlots) ? new Double(0) : timeSlots.stream().filter(o -> null != o).mapToDouble(o -> (MathOperation.div((double)(o.getEndDate().getTime() - o.getStartDate().getTime()), new Double(60000)))).sum(); - log.info("嘉兴产线运行看板 --- center03 --- stopTime:{} --- THREAD:{}", stopTime, Thread.currentThread().getName()); return stopTime; }