From c0ae1b1744843c8ce117b25f3448202919bc266d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Wed, 24 Apr 2024 17:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=9F=A5=E8=AF=A2=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=B1=BB=E5=88=AB=E4=BB=A5=E5=8F=8ATag=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/domain/Models.java     | 26 +++++++++++++++++++
 .../service/impl/DatasetServiceImpl.java      |  1 -
 .../service/impl/ModelsServiceImpl.java       | 15 ++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java
index b79caea6..87eadc37 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java
@@ -52,6 +52,16 @@ public class Models implements Serializable {
     private Integer state;
 
 
+    @ApiModelProperty(value = "模型类型名")
+    private String modelTypeName;
+
+
+
+    @ApiModelProperty(value = "模型tag名")
+    private String modelTagName;
+
+
+
     public Integer getId() {
         return id;
     }
@@ -158,5 +168,21 @@ public class Models implements Serializable {
         this.state = state;
     }
 
+    public String getModelTagName() {
+        return modelTagName;
+    }
+
+    public void setModelTagName(String modelTagName) {
+        this.modelTagName = modelTagName;
+    }
+
+    public String getModelTypeName() {
+        return modelTypeName;
+    }
+
+    public void setModelTypeName(String modelTypeName) {
+        this.modelTypeName = modelTypeName;
+    }
+
 }
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
index 1f27995c..1268fa27 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
@@ -82,7 +82,6 @@ public class DatasetServiceImpl implements DatasetService {
      */
     @Override
     public Dataset queryById(Integer id) {
-
         Dataset dataset = this.datasetDao.queryById(id);
         String dataType = dataset.getDataType();
         String dataTag = dataset.getDataTag();
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
index 653e9b76..e3b65b1f 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
@@ -1,10 +1,12 @@
 package com.ruoyi.platform.service.impl;
 
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.platform.domain.AssetIcon;
 import com.ruoyi.platform.domain.Models;
 import com.ruoyi.platform.domain.ModelsVersion;
 import com.ruoyi.platform.mapper.ModelsDao;
 import com.ruoyi.platform.mapper.ModelsVersionDao;
+import com.ruoyi.platform.service.AssetIconService;
 import com.ruoyi.platform.service.MinioService;
 import com.ruoyi.platform.service.ModelsService;
 import com.ruoyi.platform.service.ModelsVersionService;
@@ -57,6 +59,9 @@ public class ModelsServiceImpl implements ModelsService {
     @Resource
     private MinioService minioService;
 
+    @Resource
+    private AssetIconService assetIconService;
+
 
     // 固定存储桶名
     private final String bucketName = "platform-data";
@@ -72,7 +77,15 @@ public class ModelsServiceImpl implements ModelsService {
      */
     @Override
     public Models queryById(Integer id) {
-        return this.modelsDao.queryById(id);
+        Models models = this.modelsDao.queryById(id);
+        String dataType = models.getModelType();
+        String dataTag = models.getModelTag();
+        //去资产管理表中查询对应的图标名
+        AssetIcon dataTypeAssetIcon = assetIconService.queryByPath(dataType);
+        AssetIcon dataTagAssetIcon = assetIconService.queryByPath(dataTag);
+        models.setModelTypeName(dataTypeAssetIcon.getName());
+        models.setModelTagName(dataTagAssetIcon.getName());
+        return models;
     }
 
     /**