Commit f0765646 authored by pengxin's avatar pengxin

部署接口更改。

parent 56c6e197
package com.yice.webadmin.app.controller; package com.yice.webadmin.app.controller;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.page.PageMethod; import com.github.pagehelper.page.PageMethod;
...@@ -18,8 +19,10 @@ import com.yice.webadmin.app.config.PythonConfig; ...@@ -18,8 +19,10 @@ import com.yice.webadmin.app.config.PythonConfig;
import com.yice.webadmin.app.constant.ModelConstant; import com.yice.webadmin.app.constant.ModelConstant;
import com.yice.webadmin.app.dto.ModelInstanceDto; import com.yice.webadmin.app.dto.ModelInstanceDto;
import com.yice.webadmin.app.model.ModelInstance; import com.yice.webadmin.app.model.ModelInstance;
import com.yice.webadmin.app.model.ModelService;
import com.yice.webadmin.app.model.ModelVersion; import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelInstanceService; import com.yice.webadmin.app.service.ModelInstanceService;
import com.yice.webadmin.app.service.ModelServiceService;
import com.yice.webadmin.app.service.ModelVersionService; import com.yice.webadmin.app.service.ModelVersionService;
import com.yice.webadmin.app.service.ProxyPythonService; import com.yice.webadmin.app.service.ProxyPythonService;
import com.yice.webadmin.app.vo.ModelInstanceVo; import com.yice.webadmin.app.vo.ModelInstanceVo;
...@@ -56,6 +59,8 @@ public class ModelInstanceController { ...@@ -56,6 +59,8 @@ public class ModelInstanceController {
private PythonConfig pythonConfig; private PythonConfig pythonConfig;
@Autowired @Autowired
private ModelVersionService modelVersionService; private ModelVersionService modelVersionService;
@Autowired
private ModelServiceService modelServiceService;
/** /**
* 新增知识图谱管理数据。 * 新增知识图谱管理数据。
...@@ -134,7 +139,12 @@ public class ModelInstanceController { ...@@ -134,7 +139,12 @@ public class ModelInstanceController {
* @return 消息 * @return 消息
*/ */
private ResponseResult<String> doReloadOrStart(ModelInstance modelInstance, String type) { private ResponseResult<String> doReloadOrStart(ModelInstance modelInstance, String type) {
String gps_ids = JSON.parseArray(modelInstance.getResourceInfo()).stream() ModelService filter = new ModelService();
List<ModelService> modelServiceList = modelServiceService.getModelServiceList(filter, null);
if(CollUtil.isEmpty(modelServiceList)) return null;
String resourceInfo = modelServiceList.get(0).getResourceInfo();
String gps_ids = JSON.parseArray(resourceInfo).stream()
.map(obj -> ((JSONObject) obj).getString("gpu_id")) .map(obj -> ((JSONObject) obj).getString("gpu_id"))
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
ModelVersion modelVersion = this.modelVersionService.getById(modelInstance.getVersionId()); ModelVersion modelVersion = this.modelVersionService.getById(modelInstance.getVersionId());
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<id column="instance_id" jdbcType="BIGINT" property="instanceId"/> <id column="instance_id" jdbcType="BIGINT" property="instanceId"/>
<result column="model_id" jdbcType="BIGINT" property="modelId"/> <result column="model_id" jdbcType="BIGINT" property="modelId"/>
<result column="model_name" jdbcType="VARCHAR" property="modelName"/> <result column="model_name" jdbcType="VARCHAR" property="modelName"/>
<result column="service_name" jdbcType="VARCHAR" property="serviceName"/>
<result column="resource_info" jdbcType="VARCHAR" property="resourceInfo"/>
<result column="model_version" jdbcType="TINYINT" property="modelVersion"/> <result column="model_version" jdbcType="TINYINT" property="modelVersion"/>
<result column="version_id" jdbcType="BIGINT" property="versionId"/> <result column="version_id" jdbcType="BIGINT" property="versionId"/>
<result column="version_name" jdbcType="VARCHAR" property="versionName"/> <result column="version_name" jdbcType="VARCHAR" property="versionName"/>
...@@ -57,7 +59,9 @@ ...@@ -57,7 +59,9 @@
</sql> </sql>
<select id="getModelInstanceList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.ModelInstance"> <select id="getModelInstanceList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.ModelInstance">
SELECT * FROM lmp_model_instance SELECT *, lmp_model_service.service_name, lmp_model_service.resource_info
FROM lmp_model_instance
LEFT JOIN lmp_model_service on lmp_model_instance.instance_id = lmp_model_service.instance_id
<where> <where>
<include refid="filterRef"/> <include refid="filterRef"/>
</where> </where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment