Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java

@@ -308,7 +308,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                     int round = (int) (Math.round(v));
                     vo.setValue(round);
                 }
-
+                // 排序用
+                metricTimeStampCross(vo, filteredList);
                 res.add(vo);
             }
         } else if (scope == 1) { // 进口道
@@ -419,7 +420,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                         int round = (int) (Math.round(v));
                         vo.setValue(round);
                     }
-
+                    // 排序用
+                    metricTimeStampDir(vo, filteredList);
                     res.add(vo);
                 }
             }
@@ -533,7 +535,8 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                         int round = (int) (Math.round(v));
                         vo.setValue(round);
                     }
-
+                    // 排序用
+                    metricTimeStampTurn(vo, filteredList);
                     res.add(vo);
                 }
             }
@@ -652,16 +655,112 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                         int round = (int) (Math.round(v));
                         vo.setValue(round);
                     }
-
+                    // 排序用
+                    metricTimeStampLane(vo, filteredList);
                     res.add(vo);
                 }
             }
         }
 
-        res.sort(Comparator.comparing(MainlineEvaluateBottomCurveVO::getMetricTime));
+        res.sort(Comparator.comparing(MainlineEvaluateBottomCurveVO::getMetricTimeStamp));
         return res;
     }
 
+    private void metricTimeStampCross(MainlineEvaluateBottomCurveVO vo, List<CrossDataHistPOExt> filteredList) {
+        CrossDataHistPOExt po = filteredList.get(0);
+        if (po != null) {
+            Integer batchTime = po.getBatchTime();
+            String metricTime = vo.getMetricTime();
+            long batchTimeMillis = batchTime * 1000L;
+            Date batchDate = new Date(batchTimeMillis);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String datePart = dateFormat.format(batchDate);
+            String combinedDateTime = datePart + " " + metricTime;
+            SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+            try {
+                Date finalDate = dateTimeFormat.parse(combinedDateTime);
+                long metricTimeStamp = finalDate.getTime();
+                vo.setMetricTimeStamp(metricTimeStamp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void metricTimeStampDir(MainlineEvaluateBottomCurveVO vo, List<CrossDirDataHistPO> filteredList) {
+        CrossDirDataHistPO po = filteredList.get(0);
+        if (po != null) {
+            Integer batchTime = po.getBatchTime();
+            String metricTime = vo.getMetricTime();
+            long batchTimeMillis = batchTime * 1000L;
+            Date batchDate = new Date(batchTimeMillis);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); // Set timezone to UTC
+            String datePart = dateFormat.format(batchDate);
+            String combinedDateTime = datePart + " " + metricTime;
+            SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+            try {
+                Date finalDate = dateTimeFormat.parse(combinedDateTime);
+                long metricTimeStamp = finalDate.getTime();
+                vo.setMetricTimeStamp(metricTimeStamp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void metricTimeStampTurn(MainlineEvaluateBottomCurveVO vo, List<CrossTurnDataHistPO> filteredList) {
+        CrossTurnDataHistPO po = filteredList.get(0);
+        if (po != null) {
+            Integer batchTime = po.getBatchTime();
+            String metricTime = vo.getMetricTime();
+            long batchTimeMillis = batchTime * 1000L;
+            Date batchDate = new Date(batchTimeMillis);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); // Set timezone to UTC
+            String datePart = dateFormat.format(batchDate);
+            String combinedDateTime = datePart + " " + metricTime;
+            SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+            try {
+                Date finalDate = dateTimeFormat.parse(combinedDateTime);
+                long metricTimeStamp = finalDate.getTime();
+                vo.setMetricTimeStamp(metricTimeStamp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void metricTimeStampLane(MainlineEvaluateBottomCurveVO vo, List<CrossLaneDataHistPOExt> filteredList) {
+        CrossLaneDataHistPOExt po = filteredList.get(0);
+        if (po != null) {
+            Integer batchTime = po.getBatchTime();
+            String metricTime = vo.getMetricTime();
+            long batchTimeMillis = batchTime * 1000L;
+            Date batchDate = new Date(batchTimeMillis);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); // Set timezone to UTC
+            String datePart = dateFormat.format(batchDate);
+            String combinedDateTime = datePart + " " + metricTime;
+            SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+            try {
+                Date finalDate = dateTimeFormat.parse(combinedDateTime);
+                long metricTimeStamp = finalDate.getTime();
+                vo.setMetricTimeStamp(metricTimeStamp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     /**
      * Rounds the given date to the nearest previous 5-minute interval.
      *

signal-optimize-service/src/main/java/net/wanji/opt/vo/MainlineEvaluateBottomCurveVO.java

@@ -21,4 +21,7 @@ public class MainlineEvaluateBottomCurveVO {
 
     @ApiModelProperty(value = "数值")
     private Integer value;
+
+    @ApiModelProperty(value = "指标时间戳")
+    private Long metricTimeStamp;
 }