Merge pull request 'bug fix' (#328) from zhangweiii/pcm-coordinator:master into master

Former-commit-id: a2dffbc562

desc/pcm.api

@@ -13,18 +13,18 @@ import (
 	"inference/inference.api"
 )
 
-info (
-	title:   "pcm api service"
-	desc:    "type desc here"
-	author:  "type author here"
-	email:   "type email here"
+info(
+	title: "pcm api service"
+	desc: "type desc here"
+	author: "type author here"
+	email: "type email here"
 	version: "type version here"
 )
 
 //core端接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  core
+	group: core
 )
 service pcm {
 	@doc "查询P端服务列表"
@@ -177,9 +177,9 @@ service pcm {
 }
 
 //hpc二级接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  hpc
+	group: hpc
 )
 service pcm {
 	@doc "提交超算任务"
@@ -212,9 +212,9 @@ service pcm {
 }
 
 //cloud二级接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  cloud
+	group: cloud
 )
 service pcm {
 	@doc "云算任务列表"
@@ -250,9 +250,9 @@ service pcm {
 }
 
 //智算二级接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  ai
+	group: ai
 )
 service pcm {
 	@doc "训练任务统计"
@@ -399,13 +399,13 @@ service pcm {
 	@doc "文本识别"
 	@handler ChatHandler
 	post /ai/chat (ChatReq) returns (ChatResult)
-/******chat end***********/
+	/******chat end***********/
 }
 
 //screen接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  storage
+	group: storage
 )
 service pcm {
 	@doc "日常算力查询"
@@ -418,9 +418,9 @@ service pcm {
 }
 
 //openstack 接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  vm
+	group: vm
 )
 service pcm {
 	@doc "openstack计算中心概览"
@@ -817,9 +817,9 @@ service pcm {
 }
 
 //存算联动 接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  storelink
+	group: storelink
 )
 service pcm {
 	@handler UploadLinkImageHandler
@@ -848,9 +848,9 @@ service pcm {
 }
 
 // 接口
-@server (
+@server(
 	prefix: pcm/v1
-	group:  adapters
+	group: adapters
 )
 service pcm {
 	@handler AdaptersListHandler
@@ -893,9 +893,9 @@ service pcm {
 	get /adapter/getAdapterInfo (adapterInfoNameReq) returns (adapterInfoNameReqResp)
 }
 
-@server (
+@server(
 	prefix: pcm/v1
-	group:  schedule
+	group: schedule
 )
 service pcm {
 	@handler ScheduleGetAiResourceTypesHandler
@@ -935,9 +935,9 @@ service pcm {
 	get /schedule/getClusterBalanceById/:adapterId/:clusterId (GetClusterBalanceByIdReq) returns (GetClusterBalanceByIdResp)
 }
 
-@server (
+@server(
 	prefix: pcm/v1
-	group:  inference
+	group: inference
 )
 service pcm {
 	@handler TextToTextInferenceHandler
@@ -992,9 +992,9 @@ service pcm {
 	get /inference/getAdaptersByModel (GetAdaptersByModelReq) returns (GetAdaptersByModelResp)
 }
 
-@server (
+@server(
 	prefix: pcm/v1
-	group:  dictionary
+	group: dictionary
 )
 service pcm {
 	@handler GetDict
@@ -1031,9 +1031,9 @@ service pcm {
 	get /dictItem/code/:dictCode (DictCodeReq) returns (PageResult)
 }
 
-@server (
+@server(
 	prefix: pcm/v1
-	group:  monitoring
+	group: monitoring
 )
 service pcm {
 	@handler CreateAlertRuleHandler
@@ -1070,5 +1070,4 @@ service pcm {
 
 	@handler scheduleSituationHandler
 	get /monitoring/schedule/situation returns (scheduleSituationResp)
-}
-
+}

internal/logic/hpc/commithpctasklogic.go

@@ -30,7 +30,7 @@ func NewCommitHpcTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Com
 func (l *CommitHpcTaskLogic) CommitHpcTask(req *types.CommitHpcTaskReq) (resp *types.CommitHpcTaskResp, err error) {
 
 	var clusterInfo types.ClusterInfo
-	l.svcCtx.DbEngin.Raw("SELECT * FROM `t_cluster` where id = ? and label = ?", req.ClusterId, req.ClusterType).First(&clusterInfo)
+	l.svcCtx.DbEngin.Raw("SELECT * FROM `t_cluster` where id = ?", req.ClusterId).First(&clusterInfo)
 
 	if len(clusterInfo.Id) == 0 {
 		resp.Code = 400