fix(backend): 补充部署类单据详情信息 #10195

ygcyao · ygcyao · commit ee23143b4538 · 2025-04-22T09:27:02.000+08:00
# Reviewed, transaction id: 39725
diff --git a/dbm-ui/backend/ticket/builders/common/bigdata.py b/dbm-ui/backend/ticket/builders/common/bigdata.py
@@ -21,6 +21,7 @@
 from backend.db_meta.models.cluster import Cluster
 from backend.db_meta.models.instance import StorageInstance
 from backend.db_services.dbbase.constants import IpSource
+from backend.db_services.ipchooser.query.resource import ResourceQueryHelper
 from backend.ticket.builders import BuilderFactory, TicketFlowBuilder
 from backend.ticket.builders.common.base import (
     BaseOperateResourceParamBuilder,
@@ -126,6 +127,18 @@ class BigDataApplyDetailsSerializer(BigDataDetailsSerializer):
     bk_cloud_id = serializers.IntegerField(help_text=_("云区域ID"))
     resource_spec = serializers.JSONField(help_text=_("资源申请规格"), required=False)
 
+    # display fields
+    bk_cloud_name = serializers.SerializerMethodField(help_text=_("云区域"), read_only=True)
+    city_name = serializers.SerializerMethodField(help_text=_("城市名"), read_only=True)
+
+    def get_bk_cloud_name(self, obj):
+        clouds = ResourceQueryHelper.search_cc_cloud(get_cache=True)
+        return clouds[str(obj["bk_cloud_id"])]["bk_cloud_name"]
+
+    def get_city_name(self, obj):
+        city_code = obj["city_code"]
+        return self.context["ticket_ctx"].city_map.get(city_code, city_code)
+
     def get_node_count(self, attrs, role):
         if attrs["ip_source"] == IpSource.MANUAL_INPUT:
             return len(attrs["nodes"].get(role) or [])
diff --git a/dbm-ui/backend/ticket/builders/mysql/mysql_ha_apply.py b/dbm-ui/backend/ticket/builders/mysql/mysql_ha_apply.py
@@ -14,7 +14,7 @@
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 
-from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, SLAVE_DOMAIN_INITIAL_VALUE, AffinityEnum
+from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, SLAVE_DOMAIN_INITIAL_VALUE
 from backend.db_meta.enums import ClusterType
 from backend.db_meta.models import AppCache, DBModule
 from backend.db_services.dbbase.constants import IpSource
@@ -33,9 +33,6 @@
 
 
 class MysqlHAApplyDetailSerializer(MysqlSingleApplyDetailSerializer):
-    disaster_tolerance_level = serializers.ChoiceField(
-        help_text=_("容灾级别"), choices=AffinityEnum.get_choices(), required=False, default=AffinityEnum.NONE.value
-    )
     start_proxy_port = serializers.IntegerField(
         help_text=_("Proxy起始端口"),
         required=False,
diff --git a/dbm-ui/backend/ticket/builders/mysql/mysql_single_apply.py b/dbm-ui/backend/ticket/builders/mysql/mysql_single_apply.py
@@ -18,10 +18,11 @@
 from backend.bk_web.constants import LEN_MIDDLE, SMALLEST_POSITIVE_INTEGER
 from backend.components import DBConfigApi
 from backend.components.dbconfig import constants as dbconf_const
-from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE
+from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, AffinityEnum
 from backend.db_meta.enums import ClusterType
 from backend.db_meta.models import AppCache, DBModule
 from backend.db_services.dbbase.constants import IpSource
+from backend.db_services.ipchooser.query.resource import ResourceQueryHelper
 from backend.db_services.mysql.constants import DEFAULT_ORIGIN_MYSQL_PORT, SERVER_PORT_LIMIT_MAX, SERVER_PORT_LIMIT_MIN
 from backend.exceptions import ValidationError
 from backend.flow.engine.controller.mysql import MySQLController
@@ -66,6 +67,7 @@ class MysqlSingleApplyDetailSerializer(serializers.Serializer):
     db_module_name = serializers.SerializerMethodField(help_text=_("DB模块名"))
     city_name = serializers.SerializerMethodField(help_text=_("城市名"))
     spec_display = serializers.SerializerMethodField(help_text=_("机器规格展示名"))
+    bk_cloud_name = serializers.SerializerMethodField(help_text=_("云区域"), read_only=True)
 
     start_mysql_port = serializers.IntegerField(
         help_text=_("MySQL起始端口"),
@@ -74,6 +76,9 @@ class MysqlSingleApplyDetailSerializer(serializers.Serializer):
         max_value=SERVER_PORT_LIMIT_MAX,
         default=DEFAULT_ORIGIN_MYSQL_PORT,
     )
+    disaster_tolerance_level = serializers.ChoiceField(
+        help_text=_("容灾级别"), choices=AffinityEnum.get_choices(), required=False, default=AffinityEnum.NONE.value
+    )
 
     def to_representation(self, instance):
         representation = super().to_representation(instance)
@@ -107,6 +112,10 @@ def validate(self, attrs):
 
         return attrs
 
+    def get_bk_cloud_name(self, obj):
+        clouds = ResourceQueryHelper.search_cc_cloud(get_cache=True)
+        return clouds[str(obj["bk_cloud_id"])]["bk_cloud_name"]
+
     def get_db_module_name(self, obj):
         db_module_id = obj["db_module_id"]
         return self.context["ticket_ctx"].db_module_map.get(db_module_id) or f"db-module-{db_module_id}"
diff --git a/dbm-ui/backend/ticket/builders/redis/redis_cluster_apply.py b/dbm-ui/backend/ticket/builders/redis/redis_cluster_apply.py
@@ -15,6 +15,7 @@
 from backend.configuration.handlers.password import DBPasswordHandler
 from backend.db_meta.enums import ClusterType
 from backend.db_services.dbbase.constants import IpSource
+from backend.db_services.ipchooser.query.resource import ResourceQueryHelper
 from backend.flow.engine.controller.redis import RedisController
 from backend.ticket import builders
 from backend.ticket.builders.common.base import CommonValidate, SkipToRepresentationMixin
@@ -48,6 +49,13 @@ class RedisClusterApplyDetailSerializer(SkipToRepresentationMixin, serializers.S
     resource_spec = serializers.JSONField(help_text=_("proxy部署方案"), required=False)
     cluster_shard_num = serializers.IntegerField(help_text=_("集群分片数"), required=False)
 
+    # display fields
+    bk_cloud_name = serializers.SerializerMethodField(help_text=_("云区域"), read_only=True)
+
+    def get_bk_cloud_name(self, obj):
+        clouds = ResourceQueryHelper.search_cc_cloud(get_cache=True)
+        return clouds[str(obj["bk_cloud_id"])]["bk_cloud_name"]
+
     def get_city_name(self, obj):
         city_code = obj["city_code"]
         return self.context["ticket_ctx"].city_map.get(city_code, city_code)
diff --git a/dbm-ui/backend/ticket/builders/redis/redis_instance_apply.py b/dbm-ui/backend/ticket/builders/redis/redis_instance_apply.py
@@ -17,6 +17,7 @@
 from backend.configuration.handlers.password import DBPasswordHandler
 from backend.db_meta.models import Cluster, Machine, StorageInstance
 from backend.db_services.dbbase.constants import IpSource
+from backend.db_services.ipchooser.query.resource import ResourceQueryHelper
 from backend.flow.engine.controller.redis import RedisController
 from backend.iam_app.dataclass.actions import ActionEnum
 from backend.ticket import builders
@@ -50,6 +51,13 @@ class InstanceInfoSerializer(serializers.Serializer):
 
     city_name = serializers.SerializerMethodField(help_text=_("城市名"))
 
+    # display fields
+    bk_cloud_name = serializers.SerializerMethodField(help_text=_("云区域"), read_only=True)
+
+    def get_bk_cloud_name(self, obj):
+        clouds = ResourceQueryHelper.search_cc_cloud(get_cache=True)
+        return clouds[str(obj["bk_cloud_id"])]["bk_cloud_name"]
+
     def get_city_name(self, obj):
         city_code = obj["city_code"]
         return self.context["ticket_ctx"].city_map.get(city_code, city_code)
diff --git a/dbm-ui/backend/ticket/builders/sqlserver/sqlserver_ha_apply.py b/dbm-ui/backend/ticket/builders/sqlserver/sqlserver_ha_apply.py
@@ -13,7 +13,7 @@
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 
-from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, SLAVE_DOMAIN_INITIAL_VALUE, AffinityEnum
+from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, SLAVE_DOMAIN_INITIAL_VALUE
 from backend.db_meta.enums import ClusterType
 from backend.db_meta.models import AppCache, DBModule
 from backend.db_services.dbbase.constants import IpSource
@@ -30,10 +30,6 @@
 
 
 class SQLServerHAApplyDetailSerializer(SQLServerSingleApplyDetailSerializer):
-    disaster_tolerance_level = serializers.ChoiceField(
-        help_text=_("容灾级别"), choices=AffinityEnum.get_choices(), required=False, default=AffinityEnum.NONE.value
-    )
-
     def validate(self, attrs):
         super().validate(attrs)
 
diff --git a/dbm-ui/backend/ticket/builders/sqlserver/sqlserver_single_apply.py b/dbm-ui/backend/ticket/builders/sqlserver/sqlserver_single_apply.py
@@ -16,11 +16,12 @@
 from rest_framework import serializers
 
 from backend.bk_web.constants import LEN_MIDDLE, SMALLEST_POSITIVE_INTEGER
-from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE
+from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, AffinityEnum
 from backend.db_meta.enums import ClusterType
 from backend.db_meta.models import AppCache, DBModule
 from backend.db_services.dbbase.constants import IpSource
 from backend.db_services.ipchooser.constants import BkOsType
+from backend.db_services.ipchooser.query.resource import ResourceQueryHelper
 from backend.exceptions import ValidationError
 from backend.flow.consts import DEFAULT_SQLSERVER_PORT
 from backend.flow.engine.controller.sqlserver import SqlserverController
@@ -70,6 +71,17 @@ class DomainSerializer(serializers.Serializer):
         help_text=_("SQLServer起始端口"), required=False, default=DEFAULT_SQLSERVER_PORT
     )
 
+    disaster_tolerance_level = serializers.ChoiceField(
+        help_text=_("容灾级别"), choices=AffinityEnum.get_choices(), required=False, default=AffinityEnum.NONE.value
+    )
+
+    # display fields
+    bk_cloud_name = serializers.SerializerMethodField(help_text=_("云区域"), read_only=True)
+
+    def get_bk_cloud_name(self, obj):
+        clouds = ResourceQueryHelper.search_cc_cloud(get_cache=True)
+        return clouds[str(obj["bk_cloud_id"])]["bk_cloud_name"]
+
     def to_representation(self, instance):
         representation = super().to_representation(instance)
         self._format_domains(representation["domains"], instance)
diff --git a/dbm-ui/backend/ticket/builders/tendbcluster/tendb_apply.py b/dbm-ui/backend/ticket/builders/tendbcluster/tendb_apply.py
@@ -30,6 +30,7 @@ class TenDBClusterApplyDetailSerializer(serializers.Serializer):
     bk_cloud_id = serializers.IntegerField(help_text=_("云区域ID"))
     db_app_abbr = serializers.CharField(help_text=_("业务英文缩写"))
     cluster_name = serializers.CharField(help_text=_("集群名"))
+    cluster_alias = serializers.CharField(help_text=_("集群别名（一般为中文别名）"), required=False, allow_blank=True)
     city_code = serializers.CharField(
         help_text=_("城市代码"), required=False, allow_blank=True, allow_null=True, default=""
     )

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ class TenDBClusterApplyDetailSerializer(serializers.Serializer):`
`30`	`30`	`bk_cloud_id = serializers.IntegerField(help_text=_("云区域ID"))`
`31`	`31`	`db_app_abbr = serializers.CharField(help_text=_("业务英文缩写"))`
`32`	`32`	`cluster_name = serializers.CharField(help_text=_("集群名"))`
	`33`	`+ cluster_alias = serializers.CharField(help_text=_("集群别名（一般为中文别名）"), required=False, allow_blank=True)`
`33`	`34`	`city_code = serializers.CharField(`
`34`	`35`	`help_text=_("城市代码"), required=False, allow_blank=True, allow_null=True, default=""`
`35`	`36`	`)`