fix(backend): 修复flow的时间戳问题 #3921

dbm-ui/backend/flow/engine/bamboo/engine.py

@@ -185,9 +185,9 @@ def recursion_nodes_status(self, node: FlowNode, status: str, raw_data: Dict):
         for key, values in raw_data.items():
             if key == node.node_id:
                 raw_data[key]["status"] = status
-                raw_data[key]["created_at"] = datetime2timestamp(node.created_at)
-                raw_data[key]["started_at"] = datetime2timestamp(node.started_at)
-                raw_data[key]["updated_at"] = datetime2timestamp(node.updated_at)
+                raw_data[key]["created_at"] = int(datetime2timestamp(node.created_at))
+                raw_data[key]["started_at"] = int(datetime2timestamp(node.started_at))
+                raw_data[key]["updated_at"] = int(datetime2timestamp(node.updated_at))
                 raw_data[key]["hosts"] = node.hosts
                 continue
 

dbm-ui/backend/utils/time.py

@@ -9,7 +9,6 @@
 specific language governing permissions and limitations under the License.
 """
 import datetime
-import time
 from bisect import bisect_right
 from typing import List, Optional, Union
 
@@ -91,8 +90,11 @@ def standardized_time_str(datetime_str: str):
 
 
 def datetime2timestamp(o_datetime: Optional[datetime.datetime]) -> float:
+    # time.mktime(o_datetime.timetuple())
+    # 这样转换有问题: time.mktime()函数默认假设时间元组是本地时间，而不是UTC时间。
+    # 直接用datetime的时间戳转换即可
     if o_datetime:
-        return time.mktime(o_datetime.timetuple())
+        return o_datetime.timestamp()
     return 0.0