diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java index b3b22ac9..9689cda6 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java @@ -17,7 +17,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableRyFeignClients @SpringBootApplication @EnableScheduling -public class RuoYiManagementPlatformApplication { +public class + +RuoYiManagementPlatformApplication { public static void main(String[] args) { SpringApplication.run(RuoYiManagementPlatformApplication.class, args); System.out.println("(♥◠‿◠)ノ゙ 复杂智能软件管理平台启动成功 ლ(´ڡ`ლ)゙ \n" + diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java index 5cad60c3..9e45034a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java @@ -19,8 +19,8 @@ public class AssetIcon implements Serializable { /** * 主键 */ -@ApiModelProperty(value = "资产ID") -private Integer id; + @ApiModelProperty(value = "资产ID") + private Integer id; @ApiModelProperty(value = "资产图标名称") private String name; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java index f55cab11..1c49a7ee 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java @@ -76,6 +76,13 @@ public class Dataset implements Serializable { @ApiModelProperty(value = "状态:0失效,1生效") private Integer state; + @ApiModelProperty(value = "数据集类型名字") + private String datasetTypeName; + + @ApiModelProperty(value = "数据集tag名字") + private String datasetTagName; + + public Integer getId() { return id; @@ -165,5 +172,21 @@ public class Dataset implements Serializable { this.state = state; } + public String getDatasetTypeName() { + return datasetTypeName; + } + + public String getDatasetTagName() { + return datasetTagName; + } + + public void setDatasetTagName(String datasetTagName) { + this.datasetTagName = datasetTagName; + } + + public void setDatasetTypeName(String datasetTypeName) { + this.datasetTypeName = datasetTypeName; + } + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java index 08c5463c..981289a1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java @@ -118,7 +118,7 @@ public class Image implements Serializable { this.updateTime = updateTime; } - // Getter 和 Setter + public Integer getVersionCount() { return versionCount; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java index 6e8fea20..d6379aee 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java @@ -84,5 +84,6 @@ public interface AssetIconDao { List queryByCategoryId(Integer categoryId); + AssetIcon queryByPath(String path); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java index 3dd35a39..7aa8a4ac 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java @@ -22,6 +22,15 @@ public interface AssetIconService { */ AssetIcon queryById(Integer id); + + /** + * 通过path查询单条数据 + * + * @param path 路径 + * @return 实例对象 + */ + AssetIcon queryByPath(String path); + /** * 分页查询 * diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java index 2ba4d300..09610ce8 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java @@ -2,7 +2,6 @@ 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.mapper.AssetIconDao; import com.ruoyi.platform.service.AssetIconService; import com.ruoyi.system.api.model.LoginUser; @@ -38,6 +37,12 @@ public class AssetIconServiceImpl implements AssetIconService { return this.assetIconDao.queryById(id); } + + @Override + public AssetIcon queryByPath(String path) { + return this.assetIconDao.queryByPath(path); + } + /** * 分页查询 * @@ -125,4 +130,6 @@ public class AssetIconServiceImpl implements AssetIconService { public List queryByCategoryId(Integer categoryId) { return this.assetIconDao.queryByCategoryId(categoryId); } + + } 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 58487bd8..1f27995c 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 @@ -3,10 +3,12 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.annotations.CheckDuplicate; +import com.ruoyi.platform.domain.AssetIcon; import com.ruoyi.platform.domain.Dataset; import com.ruoyi.platform.domain.DatasetVersion; import com.ruoyi.platform.mapper.DatasetDao; import com.ruoyi.platform.mapper.DatasetVersionDao; +import com.ruoyi.platform.service.AssetIconService; import com.ruoyi.platform.service.DatasetService; import com.ruoyi.platform.service.DatasetVersionService; import com.ruoyi.platform.service.MinioService; @@ -58,6 +60,9 @@ public class DatasetServiceImpl implements DatasetService { @Resource private DatasetVersionService datasetVersionService; + @Resource + private AssetIconService assetIconService; + @Resource private MinioService minioService; @@ -77,7 +82,17 @@ public class DatasetServiceImpl implements DatasetService { */ @Override public Dataset queryById(Integer id) { - return this.datasetDao.queryById(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; + } /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java index 7b4b7775..76d510f5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java @@ -316,6 +316,7 @@ public class ImageServiceImpl implements ImageService { String filePath = "/data/argo-workflow/" + bucketName + "/" +path; String logs2 = k8sClientUtil.executeCommand(pod,"docker load -i "+filePath); // 在容器里执行 docker tag name:tag nexus3.kube-system.svc:8083/imageName:imageTag + if (StringUtils.isNoneBlank(logs2)){ String substring = logs2.substring(logs2.indexOf(":")+1).trim(); String tagCmd = "docker tag " + substring + " " + harborUrl + "/" + repository + "/" + username + "/" + imageName + ":" + imageTag; diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml index 21422c29..119c5fa4 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml @@ -43,6 +43,13 @@ + + + insert into asset_icon(name, category_id, path, description, create_by, create_time, update_by, update_time, state) values (#{assetIcon.name}, #{assetIcon.categoryId}, #{assetIcon.path}, #{assetIcon.description}, #{assetIcon.createBy}, #{assetIcon.createTime}, #{assetIcon.updateBy}, #{assetIcon.updateTime}, #{assetIcon.state}) diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml index d7a0ec1d..d4bae103 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml @@ -152,13 +152,13 @@ description = #{dataset.description}, - available_range = #{dataset.availableRange} - , + available_range = #{dataset.availableRange}, + data_type = #{dataset.dataType}, - data_tag = #{dataset.dataTag} + data_tag = #{dataset.dataTag}, create_by = #{dataset.createBy}, @@ -179,6 +179,7 @@ where id = #{dataset.id} + delete from dataset where id = #{id} diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml index 672f8a37..776cbbac 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml @@ -154,7 +154,7 @@ description = #{models.description}, - available_range = #{models.availableRange} + available_range = #{models.availableRange}, model_type = #{models.modelType},