refactor(dbm-services): 资源池代码优化 TencentBlueKing#15361

Author: ymakedaq

dbm-services/common/db-resource/internal/controller/manage/rs_resource_param.go

@@ -163,26 +163,16 @@ func (h *MachineResourceParamHandler) QueryResourceParam(c *gin.Context) {
 	// Limit request body size
 	c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, 1<<20) // 1MB
 
-	// Parse and validate request parameters
+	// Parse and validate request parameters using Prepare
 	var req QueryResourceParamReq
-	if err := c.ShouldBind(&req); err != nil {
-		logger.Error("ShouldBind Failed: %s", err.Error())
-		c.JSON(http.StatusBadRequest, controller.Response{
-			Code:      http.StatusBadRequest,
-			Message:   "Invalid request parameters",
-			RequestId: c.GetString("request_id"),
-		})
+	if err := h.Prepare(c, &req); err != nil {
 		return
 	}
 
 	// Custom validation
 	if err := req.Validate(); err != nil {
 		logger.Error("Validate Failed: %s", err.Error())
-		c.JSON(http.StatusBadRequest, controller.Response{
-			Code:      http.StatusBadRequest,
-			Message:   err.Error(),
-			RequestId: c.GetString("request_id"),
-		})
+		h.SendResponse(c, err, nil)
 		return
 	}
 
@@ -195,11 +185,7 @@ func (h *MachineResourceParamHandler) QueryResourceParam(c *gin.Context) {
 	requestBodies, err := model.QueryResourceParamByBillOrTask(ctx, req.BillID, req.TaskID, req.Limit, req.Offset)
 	if err != nil {
 		logger.Error("QueryResourceParamByBillOrTask failed: %v, request_id=%s", err, c.GetString("request_id"))
-		c.JSON(http.StatusInternalServerError, controller.Response{
-			Code:      http.StatusInternalServerError,
-			Message:   "Failed to query resource parameters",
-			RequestId: c.GetString("request_id"),
-		})
+		h.SendResponse(c, err, nil)
 		return
 	}
 
@@ -215,14 +201,9 @@ func (h *MachineResourceParamHandler) QueryResourceParam(c *gin.Context) {
 	logger.Info("QueryResourceParam success: found %d records, request_id=%s", len(formattedList),
 		c.GetString("request_id"))
 
-	// Return response
-	c.JSON(http.StatusOK, controller.Response{
-		Code:    http.StatusOK,
-		Message: "success",
-		Data: QueryResourceParamResp{
-			RequestBodyList: formattedList,
-		},
-		RequestId: c.GetString("request_id"),
+	// Return response using SendResponse
+	h.SendResponse(c, nil, QueryResourceParamResp{
+		RequestBodyList: formattedList,
 	})
 }
 

dbm-services/common/db-resource/internal/svr/apply/apply_base.go

@@ -382,7 +382,12 @@ func (a *ObjectDetail) GetDiskMatchInfo() (message string) {
 func (a *ObjectDetail) GetMessage() (message string) {
 	message += fmt.Sprintf(" group: %s\n", a.GroupMark)
 	if len(a.DeviceClass) > 0 {
-		message += fmt.Sprintf("device_class: %v\n", a.DeviceClass)
+		message += fmt.Sprintf("CC机型: %v\n", a.DeviceClass)
+	}
+	if len(a.Labels) > 0 {
+		message += fmt.Sprintf("标签: %v\n", a.Labels)
+	} else {
+		message += "标签: 无\n"
 	}
 	if a.Spec.NotEmpty() {
 		if a.Spec.Cpu.IsNotEmpty() {
@@ -394,7 +399,7 @@ func (a *ObjectDetail) GetMessage() (message string) {
 	}
 	message += a.GetDiskMatchInfo()
 	if !a.LocationSpec.IsEmpty() {
-		message += fmt.Sprintf("city: %s \n", a.LocationSpec.City)
+		message += fmt.Sprintf("城市: %s \n", a.LocationSpec.City)
 		if len(a.LocationSpec.SubZoneIds) > 0 {
 			if a.LocationSpec.IsExclude() {
 				message += fmt.Sprintf("subzoneId 必须不能存在这些园区中: %v", translateSubzoneIdToName(a.LocationSpec.SubZoneIds))