模型查询返回类别以及Tag名称
This commit is contained in:
parent
3d1317f28a
commit
c0ae1b1744
|
@ -52,6 +52,16 @@ public class Models implements Serializable {
|
||||||
private Integer state;
|
private Integer state;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "模型类型名")
|
||||||
|
private String modelTypeName;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "模型tag名")
|
||||||
|
private String modelTagName;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public Integer getId() {
|
public Integer getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
@ -158,5 +168,21 @@ public class Models implements Serializable {
|
||||||
this.state = state;
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,6 @@ public class DatasetServiceImpl implements DatasetService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Dataset queryById(Integer id) {
|
public Dataset queryById(Integer id) {
|
||||||
|
|
||||||
Dataset dataset = this.datasetDao.queryById(id);
|
Dataset dataset = this.datasetDao.queryById(id);
|
||||||
String dataType = dataset.getDataType();
|
String dataType = dataset.getDataType();
|
||||||
String dataTag = dataset.getDataTag();
|
String dataTag = dataset.getDataTag();
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
package com.ruoyi.platform.service.impl;
|
package com.ruoyi.platform.service.impl;
|
||||||
|
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||||
|
import com.ruoyi.platform.domain.AssetIcon;
|
||||||
import com.ruoyi.platform.domain.Models;
|
import com.ruoyi.platform.domain.Models;
|
||||||
import com.ruoyi.platform.domain.ModelsVersion;
|
import com.ruoyi.platform.domain.ModelsVersion;
|
||||||
import com.ruoyi.platform.mapper.ModelsDao;
|
import com.ruoyi.platform.mapper.ModelsDao;
|
||||||
import com.ruoyi.platform.mapper.ModelsVersionDao;
|
import com.ruoyi.platform.mapper.ModelsVersionDao;
|
||||||
|
import com.ruoyi.platform.service.AssetIconService;
|
||||||
import com.ruoyi.platform.service.MinioService;
|
import com.ruoyi.platform.service.MinioService;
|
||||||
import com.ruoyi.platform.service.ModelsService;
|
import com.ruoyi.platform.service.ModelsService;
|
||||||
import com.ruoyi.platform.service.ModelsVersionService;
|
import com.ruoyi.platform.service.ModelsVersionService;
|
||||||
|
@ -57,6 +59,9 @@ public class ModelsServiceImpl implements ModelsService {
|
||||||
@Resource
|
@Resource
|
||||||
private MinioService minioService;
|
private MinioService minioService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private AssetIconService assetIconService;
|
||||||
|
|
||||||
|
|
||||||
// 固定存储桶名
|
// 固定存储桶名
|
||||||
private final String bucketName = "platform-data";
|
private final String bucketName = "platform-data";
|
||||||
|
@ -72,7 +77,15 @@ public class ModelsServiceImpl implements ModelsService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Models queryById(Integer id) {
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue