From 667633835d4ef735416453da38b16d84b56de52e Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 8 Nov 2022 11:08:23 +0800
Subject: [PATCH 1/4] #3168 update

---
 routers/admin/resources.go | 20 ++++++++++++++++++++
 routers/routes/routes.go   |  1 +
 2 files changed, 21 insertions(+)

diff --git a/routers/admin/resources.go b/routers/admin/resources.go
index 20638553b8..f6689acd4e 100644
--- a/routers/admin/resources.go
+++ b/routers/admin/resources.go
@@ -136,6 +136,26 @@ func GetResourceSpecificationList(ctx *context.Context) {
 	ctx.JSON(http.StatusOK, response.SuccessWithData(list))
 }
 
+func GetAllResourceSpecificationList(ctx *context.Context) {
+	queue := ctx.QueryInt64("queue")
+	status := ctx.QueryInt("status")
+	cluster := ctx.Query("cluster")
+	available := ctx.QueryInt("available")
+	list, err := resource.GetResourceSpecificationList(models.SearchResourceSpecificationOptions{
+		ListOptions:   models.ListOptions{Page: 1, PageSize: 1000},
+		QueueId:       queue,
+		Status:        status,
+		Cluster:       cluster,
+		AvailableCode: available,
+	})
+	if err != nil {
+		log.Error("GetResourceSpecificationList error.%v", err)
+		ctx.JSON(http.StatusOK, response.ServerError(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, response.SuccessWithData(list))
+}
+
 func GetResourceSpecificationScenes(ctx *context.Context) {
 	specId := ctx.ParamsInt64(":id")
 	list, err := resource.GetResourceSpecificationScenes(specId)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 322f746f45..b121f69dec 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -645,6 +645,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Group("/specification", func() {
 				m.Get("", admin.GetSpecificationPage)
 				m.Get("/list", admin.GetResourceSpecificationList)
+				m.Get("/list/all", admin.GetAllResourceSpecificationList)
 				m.Get("/scenes/:id", admin.GetResourceSpecificationScenes)
 				m.Post("/grampus/sync", admin.SyncGrampusSpecs)
 				m.Post("/add", binding.Bind(models.ResourceSpecificationReq{}), admin.AddResourceSpecification)
-- 
2.34.1


From 26567e319f8959d06f613b1b02f60a735571dad6 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 8 Nov 2022 11:30:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?#3168=20=E8=B5=84=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=BB=BA=E5=BA=94=E7=94=A8=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=89=E5=85=A8=E9=83=A8=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E9=98=9F=E5=88=97=E6=97=B6=E5=BA=94=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E8=B5=84=E6=BA=90=E8=A7=84=E6=A0=BC=E4=B8=94?=
 =?UTF-8?q?=E4=B8=8D=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/vuepages/apis/modules/resources.js          | 13 +++++++++++++
 .../pages/resources/components/SceneDialog.vue      |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/apis/modules/resources.js b/web_src/vuepages/apis/modules/resources.js
index 32a87c53f1..965d5ae04c 100644
--- a/web_src/vuepages/apis/modules/resources.js
+++ b/web_src/vuepages/apis/modules/resources.js
@@ -110,6 +110,19 @@ export const getResSpecificationList = (params) => {
   });
 }
 
+// 查询资源规格列表(所有)
+// cluster 所属集群 ：OpenI 启智集群，C2Net 智算集群
+// queue 所属队列id
+// status 状态 ： 1 待审核 2已上架 3已下架
+export const getResSpecificationListAll = (params) => {
+  return service({
+    url: '/admin/resources/specification/list/all',
+    method: 'get',
+    params,
+    data: {},
+  });
+}
+
 // 同步智算网络资源池（队列）
 export const syncResSpecification = () => {
   return service({
diff --git a/web_src/vuepages/pages/resources/components/SceneDialog.vue b/web_src/vuepages/pages/resources/components/SceneDialog.vue
index cadfb1db1e..fed3f8db0e 100644
--- a/web_src/vuepages/pages/resources/components/SceneDialog.vue
+++ b/web_src/vuepages/pages/resources/components/SceneDialog.vue
@@ -89,7 +89,7 @@
 </template>
 <script>
 import BaseDialog from '~/components/BaseDialog.vue';
-import { getResQueueCode, getResSpecificationList, addResScene, updateResScene } from '~/apis/modules/resources';
+import { getResQueueCode, getResSpecificationListAll, addResScene, updateResScene } from '~/apis/modules/resources';
 import { JOB_TYPE, CLUSTERS, ACC_CARD_TYPE, SPECIFICATION_STATUS } from '~/const';
 import { getListValueWithKey } from '~/utils';
 
@@ -170,9 +170,9 @@ export default {
         cluster: this.dataInfo.Cluster,
         queue: this.dataInfo.QueueId === '-1' ? '' : this.dataInfo.QueueId,
         // status: 2,
-        page: 1,
+        // page: 1,
       };
-      return getResSpecificationList(params).then(res => {
+      return getResSpecificationListAll(params).then(res => {
         res = res.data;
         if (res.Code === 0) {
           const list = res.Data.List;
-- 
2.34.1


From 04b054ef1f7be2276c505e5aa0111feee8b4cfdd Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 8 Nov 2022 15:38:49 +0800
Subject: [PATCH 3/4] #3168 update

---
 routers/routes/routes.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index b121f69dec..9d19d6c5e0 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1488,6 +1488,12 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/record/list", point.GetPointRecordList)
 	}, reqSignIn)
 
+	m.Group("/resources", func() {
+		m.Group("/queue", func() {
+			m.Get("/centers", admin.GetResourceAiCenters)
+		})
+	})
+
 	if setting.API.EnableSwagger {
 		m.Get("/swagger.v1.json", templates.JSONRenderer(), routers.SwaggerV1Json)
 	}
-- 
2.34.1


From c2568fea41bb351b395158b2584305e3ac7261b4 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 8 Nov 2022 17:39:10 +0800
Subject: [PATCH 4/4] #3168 fix bug

---
 routers/admin/resources.go                    |  4 +-
 .../resource/resource_specification.go        | 40 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/routers/admin/resources.go b/routers/admin/resources.go
index f6689acd4e..026c37e528 100644
--- a/routers/admin/resources.go
+++ b/routers/admin/resources.go
@@ -141,8 +141,7 @@ func GetAllResourceSpecificationList(ctx *context.Context) {
 	status := ctx.QueryInt("status")
 	cluster := ctx.Query("cluster")
 	available := ctx.QueryInt("available")
-	list, err := resource.GetResourceSpecificationList(models.SearchResourceSpecificationOptions{
-		ListOptions:   models.ListOptions{Page: 1, PageSize: 1000},
+	list, err := resource.GetAllDistinctResourceSpecification(models.SearchResourceSpecificationOptions{
 		QueueId:       queue,
 		Status:        status,
 		Cluster:       cluster,
@@ -153,6 +152,7 @@ func GetAllResourceSpecificationList(ctx *context.Context) {
 		ctx.JSON(http.StatusOK, response.ServerError(err.Error()))
 		return
 	}
+
 	ctx.JSON(http.StatusOK, response.SuccessWithData(list))
 }
 
diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go
index c3c75419fa..d23fd3aad0 100644
--- a/services/cloudbrain/resource/resource_specification.go
+++ b/services/cloudbrain/resource/resource_specification.go
@@ -130,10 +130,48 @@ func GetResourceSpecificationList(opts models.SearchResourceSpecificationOptions
 	if err != nil {
 		return nil, err
 	}
-
 	return models.NewResourceSpecAndQueueListRes(n, r), nil
 }
 
+//GetAllDistinctResourceSpecification returns specification and queue after distinct
+//totalSize is always 0 here
+func GetAllDistinctResourceSpecification(opts models.SearchResourceSpecificationOptions) (*models.ResourceSpecAndQueueListRes, error) {
+	opts.Page = 0
+	opts.PageSize = 1000
+	_, r, err := models.SearchResourceSpecification(opts)
+	if err != nil {
+		return nil, err
+	}
+	nr := distinctResourceSpecAndQueue(r)
+	return models.NewResourceSpecAndQueueListRes(0, nr), nil
+}
+
+func distinctResourceSpecAndQueue(r []models.ResourceSpecAndQueue) []models.ResourceSpecAndQueue {
+	specs := make([]models.ResourceSpecAndQueue, 0, len(r))
+	sourceSpecIdMap := make(map[string]models.ResourceSpecAndQueue, 0)
+	for i := 0; i < len(r); i++ {
+		spec := r[i]
+		if spec.SourceSpecId == "" {
+			specs = append(specs, spec)
+			continue
+		}
+		if _, has := sourceSpecIdMap[spec.SourceSpecId]; has {
+			//prefer to use on-shelf spec
+			if sourceSpecIdMap[spec.SourceSpecId].Status != spec.Status && spec.Status == models.SpecOnShelf {
+				for k, v := range specs {
+					if v.ResourceSpecification.ID == sourceSpecIdMap[spec.SourceSpecId].ResourceSpecification.ID {
+						specs[k] = spec
+					}
+				}
+			}
+			continue
+		}
+		specs = append(specs, spec)
+		sourceSpecIdMap[spec.SourceSpecId] = spec
+	}
+	return specs
+}
+
 func GetResourceSpecificationScenes(specId int64) ([]models.ResourceSceneBriefRes, error) {
 	r, err := models.GetSpecScenes(specId)
 	if err != nil {
-- 
2.34.1