Commit 03a9f981 authored by duanruiming's avatar duanruiming

Merge remote-tracking branch 'origin/master'

parents 71d21d66 55696847
...@@ -667,6 +667,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService { ...@@ -667,6 +667,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
} }
private void metricTimeStampCross(MainlineEvaluateBottomCurveVO vo, List<CrossDataHistPOExt> filteredList) { private void metricTimeStampCross(MainlineEvaluateBottomCurveVO vo, List<CrossDataHistPOExt> filteredList) {
if (CollectionUtil.isEmpty(filteredList)) {
vo.setMetricTimeStamp(0L);
return;
}
CrossDataHistPOExt po = filteredList.get(0); CrossDataHistPOExt po = filteredList.get(0);
if (po != null) { if (po != null) {
Integer batchTime = po.getBatchTime(); Integer batchTime = po.getBatchTime();
...@@ -690,6 +694,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService { ...@@ -690,6 +694,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
} }
private void metricTimeStampDir(MainlineEvaluateBottomCurveVO vo, List<CrossDirDataHistPO> filteredList) { private void metricTimeStampDir(MainlineEvaluateBottomCurveVO vo, List<CrossDirDataHistPO> filteredList) {
if (CollectionUtil.isEmpty(filteredList)) {
vo.setMetricTimeStamp(0L);
return;
}
CrossDirDataHistPO po = filteredList.get(0); CrossDirDataHistPO po = filteredList.get(0);
if (po != null) { if (po != null) {
Integer batchTime = po.getBatchTime(); Integer batchTime = po.getBatchTime();
...@@ -714,6 +722,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService { ...@@ -714,6 +722,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
} }
private void metricTimeStampTurn(MainlineEvaluateBottomCurveVO vo, List<CrossTurnDataHistPO> filteredList) { private void metricTimeStampTurn(MainlineEvaluateBottomCurveVO vo, List<CrossTurnDataHistPO> filteredList) {
if (CollectionUtil.isEmpty(filteredList)) {
vo.setMetricTimeStamp(0L);
return;
}
CrossTurnDataHistPO po = filteredList.get(0); CrossTurnDataHistPO po = filteredList.get(0);
if (po != null) { if (po != null) {
Integer batchTime = po.getBatchTime(); Integer batchTime = po.getBatchTime();
...@@ -738,6 +750,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService { ...@@ -738,6 +750,10 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
} }
private void metricTimeStampLane(MainlineEvaluateBottomCurveVO vo, List<CrossLaneDataHistPOExt> filteredList) { private void metricTimeStampLane(MainlineEvaluateBottomCurveVO vo, List<CrossLaneDataHistPOExt> filteredList) {
if (CollectionUtil.isEmpty(filteredList)) {
vo.setMetricTimeStamp(0L);
return;
}
CrossLaneDataHistPOExt po = filteredList.get(0); CrossLaneDataHistPOExt po = filteredList.get(0);
if (po != null) { if (po != null) {
Integer batchTime = po.getBatchTime(); Integer batchTime = po.getBatchTime();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment