服务发布回显模型名称和版本

This commit is contained in:
2025-07-14 15:54:51 +08:00
parent e6e1bee8df
commit f499e53dad
7 changed files with 49 additions and 4 deletions

View File

@ -2,6 +2,7 @@ package com.bipt.intelligentapplicationorchestrationservice.controller;
import com.bipt.intelligentapplicationorchestrationservice.config.IpConfig; import com.bipt.intelligentapplicationorchestrationservice.config.IpConfig;
import com.bipt.intelligentapplicationorchestrationservice.entity.DeployRequest; import com.bipt.intelligentapplicationorchestrationservice.entity.DeployRequest;
import com.bipt.intelligentapplicationorchestrationservice.entity.ModelSelectVO;
import com.bipt.intelligentapplicationorchestrationservice.mapper.ModelMapper; import com.bipt.intelligentapplicationorchestrationservice.mapper.ModelMapper;
import com.bipt.intelligentapplicationorchestrationservice.pojo.*; import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
import com.bipt.intelligentapplicationorchestrationservice.service.ModelDeployer; import com.bipt.intelligentapplicationorchestrationservice.service.ModelDeployer;
@ -48,7 +49,7 @@ public class PublishController {
//调用模型部署 //调用模型部署
DeployRequest request = new DeployRequest(); DeployRequest request = new DeployRequest();
Long modelId = servicePublishDTO.getModelId(); Long modelId = servicePublishDTO.getModelId();
ModelVersion modelVersion = modelMapper.selectById(modelId); ModelVersion modelVersion = modelMapper.selectByModelId(modelId);
String modelConfig = modelVersion.getModelConfig(); String modelConfig = modelVersion.getModelConfig();
//假设modelConfig只存GPU数据 //假设modelConfig只存GPU数据
request.setModelId(String.valueOf(modelId)); request.setModelId(String.valueOf(modelId));
@ -107,4 +108,10 @@ public class PublishController {
log.info("返回列表;{}",ips); log.info("返回列表;{}",ips);
return OptResult.success(ips); return OptResult.success(ips);
} }
@GetMapping("/config/ids")
public OptResult<List<ModelSelectVO>> getModelNames(){
List<ModelSelectVO> modelSelectVOS = publishService.getModelNames();
log.info("获取到模型列表:{}",modelSelectVOS);
return OptResult.success(modelSelectVOS);
}
} }

View File

@ -0,0 +1,10 @@
package com.bipt.intelligentapplicationorchestrationservice.entity;
import lombok.Data;
@Data
public class ModelSelectVO {
private Long modelId; // 模型ID即modelId对应ModelVersion的id
private String modelName; // 模型名称(如"图像识别模型"
private String version; // 版本信息(如"v1.0.0"
}

View File

@ -76,4 +76,6 @@ public interface ModelMapper {
*/ */
@Select("select dataset_id,dataset_name from dataset") @Select("select dataset_id,dataset_name from dataset")
List<DatasetEntity> listDataset(); List<DatasetEntity> listDataset();
ModelVersion selectByModelId(Long modelId);
} }

View File

@ -1,6 +1,6 @@
package com.bipt.intelligentapplicationorchestrationservice.mapper; package com.bipt.intelligentapplicationorchestrationservice.mapper;
import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion; import com.bipt.intelligentapplicationorchestrationservice.entity.ModelSelectVO;
import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO; import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO;
import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO; import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -19,4 +19,11 @@ public interface PublishMapper {
@Select("SELECT model_id,api_url,ip FROM service_publish") @Select("SELECT model_id,api_url,ip FROM service_publish")
List<ServicePublishVO> listPublishedServices(); List<ServicePublishVO> listPublishedServices();
@Select("SELECT " +
"mv.model_id AS modelId, " +
"m.model_name AS modelName, " +
"mv.version AS version " +
"FROM model_version mv " +
"LEFT JOIN model_info m ON mv.model_id = m.id")
List<ModelSelectVO> selectModelSelectList();
} }

View File

@ -1,5 +1,6 @@
package com.bipt.intelligentapplicationorchestrationservice.service.Impl; package com.bipt.intelligentapplicationorchestrationservice.service.Impl;
import com.bipt.intelligentapplicationorchestrationservice.entity.ModelSelectVO;
import com.bipt.intelligentapplicationorchestrationservice.mapper.PublishMapper; import com.bipt.intelligentapplicationorchestrationservice.mapper.PublishMapper;
import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO; import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO;
import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO; import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO;
@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -33,8 +35,6 @@ public class PublishServiceImpl implements PublishService {
throw new IllegalArgumentException("请求已存在: " + apiUrl); throw new IllegalArgumentException("请求已存在: " + apiUrl);
} }
//todo调用服务部署
publishMapper.insert(servicePublishDTO); publishMapper.insert(servicePublishDTO);
} }
@ -43,5 +43,10 @@ public class PublishServiceImpl implements PublishService {
return publishMapper.listPublishedServices(); return publishMapper.listPublishedServices();
} }
@Override
public List<ModelSelectVO> getModelNames() {
return publishMapper.selectModelSelectList();
}
} }

View File

@ -1,5 +1,6 @@
package com.bipt.intelligentapplicationorchestrationservice.service; package com.bipt.intelligentapplicationorchestrationservice.service;
import com.bipt.intelligentapplicationorchestrationservice.entity.ModelSelectVO;
import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO; import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO;
import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO; import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO;
@ -11,4 +12,6 @@ public interface PublishService {
List<ServicePublishVO> listPublishedServices(); List<ServicePublishVO> listPublishedServices();
List<ModelSelectVO> getModelNames();
} }

View File

@ -39,6 +39,17 @@
FROM model_info t1 JOIN model_version t2 ON t1.id = t2.model_id FROM model_info t1 JOIN model_version t2 ON t1.id = t2.model_id
where t2.id = #{id} where t2.id = #{id}
</select> </select>
<select id="selectByModelId"
resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion">
SELECT
t1.model_name,
t2.version, t2.dataset_id, t2.model_config,
t2.model_path, t2.status, t2.create_time, t2.update_time, t2.model_size,
t2.data_pre_handle_file, t2.model_super_args, t2.model_args_size, t2.model_source_code_url, t2.model_file,
t2.model_design_document, t2.life_cycle, t2.operate_user
FROM model_info t1 JOIN model_version t2 ON t1.id = t2.model_id
where t2.model_id = #{id}
</select>
<!--更新模型信息--> <!--更新模型信息-->
<update id="update"> <update id="update">