Skip to content

L
lmp_server
Commit 68d7baf3 authored by pengxin's avatar pengxin
Browse files
Options

模型部署拆分。

parent cba217e2
Hide whitespace changes
Inline Side-by-side
Showing with 386 additions and 59 deletions
application-webadmin/src/main/java/com/yice/webadmin/app/constant/ModelConstant.java 0 → 100644
View file @ 68d7baf3
package com.yice.webadmin.app.constant;
/**
* 模型管理类
*/
public class ModelConstant {
/**
* 部署状态
*/
public static final Integer DEPLOY_STATUS = 3;
}
application-webadmin/src/main/java/com/yice/webadmin/app/constant/PluginConstant.java
View file @ 68d7baf3
package com.yice.webadmin.app.constant;
/**
* 插件编排常量管理类
*/
public class PluginConstant {
/**
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelInstanceController.java
View file @ 68d7baf3
package com.yice.webadmin.app.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.page.PageMethod;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
......@@ -10,15 +12,18 @@ import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.config.OtherConfig;
import com.yice.webadmin.app.dto.ModelInstanceDto;
import com.yice.webadmin.app.model.ModelInstance;
import com.yice.webadmin.app.service.ModelInstanceService;
import com.yice.webadmin.app.service.ProxyPythonService;
import com.yice.webadmin.app.vo.ModelInstanceVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
/**
......@@ -35,7 +40,10 @@ public class ModelInstanceController {
@Autowired
private ModelInstanceService modelInstanceService;
@Autowired
private ProxyPythonService proxyPythonService;
@Autowired
private OtherConfig otherConfig;
/**
* 新增知识图谱管理数据。
*
......@@ -50,9 +58,43 @@ public class ModelInstanceController {
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
ModelInstance instance = MyModelUtil.copyTo(modelInstanceDto, ModelInstance.class);
CallResult callResult = modelInstanceService.verifyRelatedData(instance, null);
if (!callResult.isSuccess()) {
return ResponseResult.errorFrom(callResult);
}
ModelInstance filter = new ModelInstance();
filter.setVersionId(modelInstanceDto.getVersionId());
if(modelInstanceService.getCountByFilter(filter) > 0) {
return ResponseResult.error(ErrorCodeEnum.DUPLICATED_UNIQUE_KEY, "同一个模型只能部署一次！");
}
ModelInstance modelInstance = MyModelUtil.copyTo(modelInstanceDto, ModelInstance.class);
modelInstance = modelInstanceService.saveNew(modelInstance);
return ResponseResult.success(modelInstance.getDeployId());
modelInstanceService.saveNew(modelInstance);
return ResponseResult.success(modelInstance.getInstanceId());
}
/**
* 获取GPU信息。
*
* @return 应答结果对象，包含查询结果集。
*/
@PostMapping("/getGpuInfo")
public ResponseResult<String> getGpuInfo() {
try {
String result = proxyPythonService.predictPost(
otherConfig.getOtherInterface() + otherConfig.getGetGpuInfo(), "");
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
String data = jo.getString("data");
if (code != null && code == 200) {
return ResponseResult.success(data);
} else {
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}
/**
......@@ -69,7 +111,7 @@ public class ModelInstanceController {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
ModelInstance modelInstance = MyModelUtil.copyTo(modelInstanceDto, ModelInstance.class);
ModelInstance originalModelInstance = modelInstanceService.getById(modelInstance.getDeployId());
ModelInstance originalModelInstance = modelInstanceService.getById(modelInstance.getInstanceId());
if (originalModelInstance == null) {
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
......@@ -84,16 +126,16 @@ public class ModelInstanceController {
/**
* 删除知识图谱管理数据。
*
* @param deployId 删除对象主键Id。
* @param instanceId 删除对象主键Id。
* @return 应答结果对象。
*/
@OperationLog(type = SysOperationLogType.DELETE)
@PostMapping("/delete")
public ResponseResult<Void> delete(@MyRequestBody Long deployId) {
if (MyCommonUtil.existBlankArgument(deployId)) {
public ResponseResult<Void> delete(@MyRequestBody Long instanceId) {
if (MyCommonUtil.existBlankArgument(instanceId)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
return this.doDelete(deployId);
return this.doDelete(instanceId);
}
/**
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelServiceController.java
View file @ 68d7baf3
......@@ -161,7 +161,6 @@ public class ModelServiceController {
// 验证关联Id的数据合法性
ModelService originalModelService = modelServiceService.getById(serviceId);
if (originalModelService == null) {
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [对象] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/PluginKnowledgeMapper.java 0 → 100644
View file @ 68d7baf3
package com.yice.webadmin.app.dao;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.PluginKnowledge;
import java.util.List;
/**
* 数据操作访问接口。
*
* @author linking
* @date 2023-04-13
*/
public interface PluginKnowledgeMapper extends BaseDaoMapper<PluginKnowledge> {
/**
* 批量插入对象列表。
*
* @param pluginKnowledgeList 新增对象列表。
*/
void insertList(List<PluginKnowledge> pluginKnowledgeList);
}
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelInstanceMapper.xml
View file @ 68d7baf3
......@@ -2,8 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yice.webadmin.app.dao.ModelInstanceMapper">
<resultMap id="BaseResultMap" type="com.yice.webadmin.app.model.ModelInstance">
<id column="deploy_id" jdbcType="BIGINT" property="deployId"/>
<id column="instance_id" jdbcType="BIGINT" property="instanceId"/>
<result column="model_id" jdbcType="BIGINT" property="modelId"/>
<result column="model_name" jdbcType="VARCHAR" property="modelName"/>
<result column="model_version" jdbcType="TINYINT" property="modelVersion"/>
<result column="version_id" jdbcType="BIGINT" property="versionId"/>
<result column="version_name" jdbcType="VARCHAR" property="versionName"/>
<result column="deploy_status" jdbcType="TINYINT" property="deployStatus"/>
......@@ -15,8 +17,10 @@
<insert id="insertList">
INSERT INTO lmp_model_instance
(deploy_id,
(instance_id,
model_id,
model_name,
model_version,
version_id,
version_name,
deploy_status,
......@@ -26,8 +30,10 @@
update_time)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
(#{item.deployId},
(#{item.instanceId},
#{item.modelId},
#{item.modelName},
#{item.modelVersion},
#{item.versionId},
#{item.versionName},
#{item.deployStatus},
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelServiceMapper.xml
View file @ 68d7baf3
......@@ -3,10 +3,10 @@
<mapper namespace="com.yice.webadmin.app.dao.ModelServiceMapper">
<resultMap id="BaseResultMap" type="com.yice.webadmin.app.model.ModelService">
<id column="service_id" jdbcType="BIGINT" property="serviceId"/>
<result column="model_id" jdbcType="BIGINT" property="modelId"/>
<result column="instance_id" jdbcType="BIGINT" property="instanceId"/>
<result column="service_name" jdbcType="VARCHAR" property="serviceName"/>
<result column="service_version" jdbcType="TINYINT" property="serviceVersion"/>
<result column="resource_info" jdbcType="VARCHAR" property="resourceInfo"/>
<result column="api_url" jdbcType="VARCHAR" property="apiUrl"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
......@@ -17,10 +17,10 @@
<insert id="insertList">
INSERT INTO lmp_model_service
(service_id,
model_id,
instance_id,
service_name,
service_version,
resource_info,
api_url,
remark,
create_user_id,
create_time,
......@@ -29,10 +29,10 @@
VALUES
<foreach collection="list" index="index" item="item" separator="," >
(#{item.serviceId},
#{item.modelId},
#{item.instanceId},
#{item.serviceName},
#{item.serviceVersion},
#{item.resourceInfo},
#{item.apiUrl},
#{item.remark},
#{item.createUserId},
#{item.createTime},
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/PluginKnowledgeMapper.xml 0 → 100644
View file @ 68d7baf3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yice.webadmin.app.dao.PluginKnowledgeMapper">
<resultMap id="BaseResultMap" type="com.yice.webadmin.app.model.PluginKnowledge">
<id column="plugin_knowledge_id" jdbcType="BIGINT" property="pluginKnowledgeId"/>
<id column="config_id" jdbcType="BIGINT" property="configId"/>
<id column="knowledge_id" jdbcType="BIGINT" property="knowledgeId"/>
</resultMap>
<insert id="insertList">
INSERT INTO lmp_plugin_knowledge
(plugin_knowledge_id,
config_id,
knowledge_id)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
(#{item.pluginKnowledgeId},
#{item.configId},
#{item.knowledgeId})
</foreach>
</insert>
</mapper>
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelInstanceDto.java
View file @ 68d7baf3
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* 知识图谱管理Dto对象。
......@@ -22,8 +21,8 @@ public class ModelInstanceDto {
* 部署ID。
*/
@ApiModelProperty(value = "部署ID", required = true)
@NotNull(message = "数据验证失败，部署ID不能为空！", groups = {UpdateGroup.class})
private Long deployId;
@NotNull(message = "数据验证失败，部署实例ID不能为空！", groups = {UpdateGroup.class})
private Long instanceId;
/**
* 模型ID，外键。
......@@ -48,4 +47,40 @@ public class ModelInstanceDto {
*/
@ApiModelProperty(value = "部署状态")
private Integer deployStatus;
/**
* 模型名称。
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/**
* 模型版本号。
*/
@ApiModelProperty(value = "模型版本号")
private Integer modelVersion;
/**
* 服务名称。
*/
@ApiModelProperty(value = "服务名称")
private String serviceName;
/**
* 资源信息。
*/
@ApiModelProperty(value = "资源信息")
private String resourceInfo;
/**
* 服务描述。
*/
@ApiModelProperty(value = "服务描述")
private String remark;
/**
* 服务地址。
*/
@ApiModelProperty(value = "服务地址")
private String apiUrl;
}
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelServiceDto.java
View file @ 68d7baf3
......@@ -28,7 +28,7 @@ public class ModelServiceDto {
* 模型实例ID，外键。
*/
@ApiModelProperty(value = "模型实例ID，外键")
private Long modelId;
private Long instanceId;
/**
* 服务名称。
......@@ -36,12 +36,6 @@ public class ModelServiceDto {
@ApiModelProperty(value = "服务名称")
private String serviceName;
/**
* 服务版本。
*/
@ApiModelProperty(value = "服务版本")
private Integer serviceVersion;
/**
* 资源信息。
*/
......@@ -53,4 +47,10 @@ public class ModelServiceDto {
*/
@ApiModelProperty(value = "服务描述")
private String remark;
/**
* 服务地址。
*/
@ApiModelProperty(value = "服务地址")
private String apiUrl;
}
application-webadmin/src/main/java/com/yice/webadmin/app/dto/PluginConfigDto.java
View file @ 68d7baf3
......@@ -7,6 +7,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
/**
* 知识图谱管理Dto对象。
......@@ -67,6 +68,12 @@ public class PluginConfigDto {
@ApiModelProperty(value = "插件编排知识库ID，外键")
private Long pluginKnowledgeId;
/**
* 多个知识库ids。
*/
@ApiModelProperty(value = "多个知识库ids")
private List<Long> knowledgeIds;
/**
* 最长上下文。
*/
......
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelInstance.java
View file @ 68d7baf3
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper;
......@@ -24,8 +25,8 @@ public class ModelInstance extends BaseModel {
/**
* 部署ID。
*/
@TableId(value = "deploy_id")
private Long deployId;
@TableId(value = "instance_id")
private Long instanceId;
/**
* 模型ID，外键。
......@@ -42,11 +43,45 @@ public class ModelInstance extends BaseModel {
*/
private String versionName;
/**
* 模型名称。
*/
private String modelName;
/**
* 模型版本号。
*/
private Integer modelVersion;
/**
* 部署状态。
*/
private Integer deployStatus;
/**
* 服务名称。
*/
@TableField(exist = false)
private String serviceName;
/**
* 资源信息。
*/
@TableField(exist = false)
private String resourceInfo;
/**
* 服务地址。
*/
@TableField(exist = false)
private String apiUrl;
/**
* 服务描述。
*/
@TableField(exist = false)
private String remark;
@Mapper
public interface ModelInstanceMapper extends BaseModelMapper<ModelInstanceVo, ModelInstance> {
}
......
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelService.java
View file @ 68d7baf3
......@@ -30,7 +30,7 @@ public class ModelService extends BaseModel {
/**
* 模型实例ID，外键。
*/
private Long modelId;
private Long instanceId;
/**
* 服务名称。
......@@ -38,9 +38,9 @@ public class ModelService extends BaseModel {
private String serviceName;
/**
* 服务版本。
* 服务API。
*/
private Integer serviceVersion;
private String apiUrl;
/**
* 资源信息。
......
application-webadmin/src/main/java/com/yice/webadmin/app/model/PluginConfig.java
View file @ 68d7baf3
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper;
......@@ -11,6 +12,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.math.BigDecimal;
import java.util.List;
/**
* 实体对象。
......@@ -79,6 +81,12 @@ public class PluginConfig extends BaseModel {
*/
private String remark;
/**
* 多个知识库ids。
*/
@TableField(exist = false)
private List<Long> knowledgeIds;
@Mapper
public interface PluginConfigMapper extends BaseModelMapper<PluginConfigVo, PluginConfig> {
}
......
application-webadmin/src/main/java/com/yice/webadmin/app/model/PluginKnowledge.java 0 → 100644
View file @ 68d7baf3
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* 实体对象。
*
* @author linking
* @date 2023-04-13
*/
@Data
@TableName(value = "lmp_plugin_knowledge")
public class PluginKnowledge {
/**
* 主键Id。
*/
@TableId(value = "plugin_knowledge_id")
private Long pluginKnowledgeId;
/**
* 插件编排配置ID，外键。
*/
private Long configId;
/**
* 知识库ID，外键。
*/
private Long knowledgeId;
}
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ApiManageServiceImpl.java
View file @ 68d7baf3
......@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
/**
* 应用接入数据操作服务类。
......@@ -66,25 +67,28 @@ public class ApiManageServiceImpl extends BaseService<ApiManage, Long> implement
apiManageMapper.insert(this.buildDefaultValue(apiManage));
if(CollUtil.isNotEmpty(apiManage.getPlugins())) {
apiManage.getPlugins().stream()
List<ApiPlugin> filters = apiManage.getPlugins().stream()
.map(pluginId -> {
ApiPlugin filter = new ApiPlugin();
filter.setApiId(apiManage.getApiId());
filter.setPluginId(pluginId);
return filter;
})
.forEach(apiPluginMapper::insert);
.collect(Collectors.toList());
apiPluginMapper.insertList(filters);
}
if(CollUtil.isNotEmpty(apiManage.getServices())) {
apiManage.getServices().stream()
List<ApiService> filters = apiManage.getServices().stream()
.map(serviceId -> {
ApiService filter = new ApiService();
filter.setApiId(apiManage.getApiId());
filter.setServiceId(serviceId);
return filter;
})
.forEach(apiServiceMapper::insert);
.collect(Collectors.toList());
apiServiceMapper.insertList(filters);
}
return apiManage;
}
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelInstanceServiceImpl.java
View file @ 68d7baf3
......@@ -2,21 +2,28 @@ package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.constant.ModelConstant;
import com.yice.webadmin.app.dao.ModelInstanceMapper;
import com.yice.webadmin.app.dao.ModelServiceMapper;
import com.yice.webadmin.app.model.ModelInstance;
import com.yice.webadmin.app.model.ModelManage;
import com.yice.webadmin.app.model.ModelService;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelInstanceService;
import com.yice.webadmin.app.service.ModelManageService;
import com.yice.webadmin.app.service.ModelVersionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 知识图谱管理数据操作服务类。
......@@ -31,7 +38,13 @@ public class ModelInstanceServiceImpl extends BaseService<ModelInstance, Long> i
@Autowired
private ModelInstanceMapper modelInstanceMapper;
@Autowired
private ModelServiceMapper modelServiceMapper;
@Autowired
private IdGeneratorWrapper idGenerator;
@Autowired
private ModelVersionService modelVersionService;
@Autowired
private ModelManageService modelManageService;
/**
* 返回当前Service的主表Mapper对象。
......@@ -52,7 +65,24 @@ public class ModelInstanceServiceImpl extends BaseService<ModelInstance, Long> i
@Transactional(rollbackFor = Exception.class)
@Override
public ModelInstance saveNew(ModelInstance modelInstance) {
modelInstanceMapper.insert(this.buildDefaultValue(modelInstance));
ModelVersion modelVersion = this.modelVersionService.getById(modelInstance.getVersionId());
if (null != modelVersion) {
Long modelId = modelVersion.getModelId();
ModelManage modelManage = modelManageService.getById(modelId);
modelInstance.setDeployStatus(ModelConstant.DEPLOY_STATUS);
modelInstance.setModelId(modelId);
modelInstance.setVersionName(modelVersion.getVersionName());
modelInstance.setModelVersion(modelVersion.getModelVersion());
modelInstance.setModelName(modelManage.getModelName());
modelInstanceMapper.insert(this.buildDefaultValue(modelInstance));
ModelService modelService = new ModelService();
modelService.setInstanceId(modelInstance.getInstanceId());
modelService.setServiceName(modelInstance.getServiceName());
modelService.setResourceInfo(modelInstance.getResourceInfo());
modelService.setRemark(modelInstance.getRemark());
modelServiceMapper.insert(buildDefaultValue(modelService));
}
return modelInstance;
}
......@@ -82,7 +112,7 @@ public class ModelInstanceServiceImpl extends BaseService<ModelInstance, Long> i
public boolean update(ModelInstance modelInstance, ModelInstance originalModelInstance) {
MyModelUtil.fillCommonsForUpdate(modelInstance, originalModelInstance);
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
UpdateWrapper<ModelInstance> uw = this.createUpdateQueryForNullValue(modelInstance, modelInstance.getDeployId());
UpdateWrapper<ModelInstance> uw = this.createUpdateQueryForNullValue(modelInstance, modelInstance.getInstanceId());
return modelInstanceMapper.update(modelInstance, uw) == 1;
}
......@@ -131,10 +161,18 @@ public class ModelInstanceServiceImpl extends BaseService<ModelInstance, Long> i
}
private ModelInstance buildDefaultValue(ModelInstance modelInstance) {
if (modelInstance.getDeployId() == null) {
modelInstance.setDeployId(idGenerator.nextLongId());
if (modelInstance.getInstanceId() == null) {
modelInstance.setInstanceId(idGenerator.nextLongId());
}
MyModelUtil.fillCommonsForInsert(modelInstance);
return modelInstance;
}
private ModelService buildDefaultValue(ModelService modelService) {
if (modelService.getServiceId() == null) {
modelService.setServiceId(idGenerator.nextLongId());
}
MyModelUtil.fillCommonsForInsert(modelService);
return modelService;
}
}
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/PluginConfigServiceImpl.java
View file @ 68d7baf3
......@@ -9,7 +9,9 @@ import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.yice.webadmin.app.dao.PluginConfigMapper;
import com.yice.webadmin.app.dao.PluginKnowledgeMapper;
import com.yice.webadmin.app.model.PluginConfig;
import com.yice.webadmin.app.model.PluginKnowledge;
import com.yice.webadmin.app.service.PluginConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
/**
* 知识图谱管理数据操作服务类。
......@@ -32,7 +35,8 @@ public class PluginConfigServiceImpl extends BaseService<PluginConfig, Long> imp
private PluginConfigMapper pluginConfigMapper;
@Autowired
private IdGeneratorWrapper idGenerator;
@Autowired
private PluginKnowledgeMapper pluginKnowledgeMapper;
/**
* 返回当前Service的主表Mapper对象。
*
......@@ -53,6 +57,20 @@ public class PluginConfigServiceImpl extends BaseService<PluginConfig, Long> imp
@Override
public PluginConfig saveNew(PluginConfig pluginConfig) {
pluginConfigMapper.insert(this.buildDefaultValue(pluginConfig));
if(CollUtil.isNotEmpty(pluginConfig.getKnowledgeIds())) {
List<PluginKnowledge> filters = pluginConfig.getKnowledgeIds().stream()
.map(knowledgeId -> {
PluginKnowledge filter = new PluginKnowledge();
filter.setKnowledgeId(idGenerator.nextLongId());
filter.setConfigId(pluginConfig.getConfigId());
filter.setKnowledgeId(knowledgeId);
return filter;
})
.collect(Collectors.toList());
pluginKnowledgeMapper.insertList(filters);
}
return pluginConfig;
}
......
application-webadmin/src/main/java/com/yice/webadmin/app/vo/ModelInstanceVo.java
View file @ 68d7baf3
......@@ -20,8 +20,8 @@ public class ModelInstanceVo extends BaseVo {
/**
* 部署ID。
*/
@ApiModelProperty(value = "部署ID")
private Long deployId;
@ApiModelProperty(value = "部署实例ID")
private Long instanceId;
/**
* 模型ID，外键。
......@@ -46,4 +46,40 @@ public class ModelInstanceVo extends BaseVo {
*/
@ApiModelProperty(value = "部署状态")
private Integer deployStatus;
/**
* 模型名称。
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/**
* 模型版本号。
*/
@ApiModelProperty(value = "模型版本号")
private Integer modelVersion;
/**
* 服务名称。
*/
@ApiModelProperty(value = "服务名称")
private String serviceName;
/**
* 资源信息。
*/
@ApiModelProperty(value = "资源信息")
private String resourceInfo;
/**
* 服务描述。
*/
@ApiModelProperty(value = "服务描述")
private String remark;
/**
* 服务地址。
*/
@ApiModelProperty(value = "服务地址")
private String apiUrl;
}
application-webadmin/src/main/java/com/yice/webadmin/app/vo/ModelServiceVo.java
View file @ 68d7baf3
......@@ -29,7 +29,7 @@ public class ModelServiceVo extends BaseVo {
* 模型实例ID，外键。
*/
@ApiModelProperty(value = "模型实例ID，外键")
private Long modelId;
private Long instanceId;
/**
* 服务名称。
......@@ -37,18 +37,18 @@ public class ModelServiceVo extends BaseVo {
@ApiModelProperty(value = "服务名称")
private String serviceName;
/**
* 服务版本。
*/
@ApiModelProperty(value = "服务版本")
private Integer serviceVersion;
/**
* 资源信息。
*/
@ApiModelProperty(value = "资源信息")
private String resourceInfo;
/**
* 服务地址。
*/
@ApiModelProperty(value = "服务地址")
private String apiUrl;
/**
* 服务描述。
*/
......
application-webadmin/src/main/java/com/yice/webadmin/app/vo/PluginConfigVo.java
View file @ 68d7baf3
......@@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List;
/**
* 知识图谱管理VO视图对象。
......@@ -67,6 +68,12 @@ public class PluginConfigVo extends BaseVo {
@ApiModelProperty(value = "插件编排知识库ID，外键")
private Long pluginKnowledgeId;
/**
* 多个知识库ids。
*/
@ApiModelProperty(value = "多个知识库ids")
private List<Long> knowledgeIds;
/**
* 最长上下文。
*/
......
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