type、tag 添加判断

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java

@@ -83,15 +83,26 @@ 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();
-        //去资产管理表中查询对应的图标名
-        AssetIcon dataTypeAssetIcon = assetIconService.queryByPath(dataType);
-        AssetIcon dataTagAssetIcon = assetIconService.queryByPath(dataTag);
-        dataset.setDatasetTypeName(dataTypeAssetIcon.getName());
-        dataset.setDatasetTagName(dataTagAssetIcon.getName());
-        return dataset;
+        if (dataset != null) {
+            String dataType = dataset.getDataType();
+            String dataTag = dataset.getDataTag();
+
+            // 判空逻辑，只有当dataType和dataTag不为空时，才进行查询
+            if (dataType != null && !dataType.isEmpty()) {
+                AssetIcon dataTypeAssetIcon = assetIconService.queryById(Integer.valueOf(dataType));
+                if (dataTypeAssetIcon != null) {
+                    dataset.setDatasetTypeName(dataTypeAssetIcon.getName());
 
+                }
+            }
+            if (dataTag != null && !dataTag.isEmpty()) {
+                AssetIcon dataTagAssetIcon = assetIconService.queryById(Integer.valueOf(dataTag));
+                if (dataTagAssetIcon != null) {
+                    dataset.setDatasetTagName(dataTagAssetIcon.getName());
+                }
+            }
+        }
+        return dataset;
     }
 
     /**

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -78,13 +78,21 @@ public class ModelsServiceImpl implements ModelsService {
     @Override
     public Models queryById(Integer 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());
+        String modelType = models.getModelType();
+        String modelTag = models.getModelTag();
+        //去资产管理表中查询对应的图标名,注意判空逻辑，只有当dataType和dataTag不为空时，才进行查询
+        if(modelType != null && !modelType.isEmpty()){
+            AssetIcon modelTypeAssetIcon = assetIconService.queryById(Integer.valueOf(modelType));
+            if (modelTypeAssetIcon != null){
+                models.setModelTypeName(modelTypeAssetIcon.getName());
+            }
+        }
+        if(modelTag != null && !modelTag.isEmpty()){
+            AssetIcon modelTagAssetIcon = assetIconService.queryById(Integer.valueOf(modelTag));
+            if (modelTagAssetIcon != null){
+                models.setModelTagName(modelTagAssetIcon.getName());
+            }
+        }
         return models;
     }
 
@@ -220,7 +228,6 @@ public class ModelsServiceImpl implements ModelsService {
      */
     @Override
     public List<Map<String, String>> uploadModels(MultipartFile[] files, String uuid) throws Exception {
-
         List<Map<String, String>> results = new ArrayList<>();
         for (MultipartFile file:files) {
             // 构建objectName
@@ -245,7 +252,6 @@ public class ModelsServiceImpl implements ModelsService {
 
         ModelsVersion version = modelsVersionService.queryByModelsVersion(modelsVersion);
 
-
         String url = "";
         if (version == null) {
             //插表,因为这里是一次直接插表所以这里定掉date，然后用DAO插入