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

dbm-ui/backend/db_monitor/views/notice_group.py

@@ -99,8 +99,7 @@ class MonitorNoticeGroupViewSet(viewsets.AuditedModelViewSet):
     serializer_class = NoticeGroupSerializer
     pagination_class = AuditedLimitOffsetPagination
     filter_class = MonitorGroupListFilter
-
-    default_permission_class = DBManagePermission()
+    default_permission_class = [DBManagePermission()]
 
     def get_action_permission_map(self):
         return {
@@ -145,8 +144,9 @@ def list_group_name(self, request, *args, **kwargs):
         return Response(group_name_infos)
 
     @common_swagger_auto_schema(operation_summary=_("获取默认告警组名称"), tags=[SWAGGER_TAG])
-    @action(methods=["GET"], detail=False, filter_class=None, pagination_class=None)
+    @action(methods=["GET"], detail=False, filter_class=MonitorGroupListFilter, pagination_class=None)
     def list_default_group(self, request, *args, **kwargs):
-        default_groups = list(self.get_queryset().exclude(db_type="").values("id", "name", "db_type"))
+        queryset = self.filter_queryset(self.get_queryset())
+        default_groups = list(queryset.exclude(db_type="").values("id", "name", "db_type"))
         default_group_map = {group.pop("db_type"): group for group in default_groups}
         return Response(default_group_map)

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