Commit a45f00b4 authored by pengxin's avatar pengxin

应用接入与插件编排新增。

parent 2a1e163c
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
<sql id="inputFilterRef"> <sql id="inputFilterRef">
<if test="pluginManageFilter != null"> <if test="pluginManageFilter != null">
<if test="pluginManageFilter.pluginName != null"> <if test="pluginManageFilter.pluginName != null">
AND lmp_plugin_manage.plugin_name = #{pluginManageFilter.pluginName} <bind name="safePluginName" value="'%' + pluginManageFilter.pluginName + '%'"/>
AND lmp_plugin_manage.plugin_name LIKE #{safePluginName}
</if> </if>
<if test="pluginManageFilter.status != null"> <if test="pluginManageFilter.status != null">
AND lmp_plugin_manage.status = #{pluginManageFilter.status} AND lmp_plugin_manage.status = #{pluginManageFilter.status}
......
...@@ -51,4 +51,16 @@ public class ApiManageDto { ...@@ -51,4 +51,16 @@ public class ApiManageDto {
*/ */
@ApiModelProperty(value = "remark") @ApiModelProperty(value = "remark")
private String remark; private String remark;
/**
* 服务列表。
*/
@ApiModelProperty(value = "服务列表")
private Long[] services;
/**
* 插件列表。
*/
@ApiModelProperty(value = "插件列表")
private Long[] plugins;
} }
package com.yice.webadmin.app.model; package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper; import com.yice.common.core.base.mapper.BaseModelMapper;
...@@ -10,6 +11,8 @@ import lombok.EqualsAndHashCode; ...@@ -10,6 +11,8 @@ import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import java.util.List;
/** /**
* ApiManage实体对象。 * ApiManage实体对象。
* *
...@@ -52,6 +55,18 @@ public class ApiManage extends BaseModel { ...@@ -52,6 +55,18 @@ public class ApiManage extends BaseModel {
*/ */
private String remark; private String remark;
/**
* 服务列表。
*/
@TableField(exist = false)
private List<Long> services;
/**
* 插件列表。
*/
@TableField(exist = false)
private List<Long> plugins;
@Mapper @Mapper
public interface ApiManageModelMapper extends BaseModelMapper<ApiManageVo, ApiManage> { public interface ApiManageModelMapper extends BaseModelMapper<ApiManageVo, ApiManage> {
} }
......
...@@ -9,7 +9,11 @@ import com.yice.common.core.object.MyRelationParam; ...@@ -9,7 +9,11 @@ import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil; import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper; import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.yice.webadmin.app.dao.ApiManageMapper; import com.yice.webadmin.app.dao.ApiManageMapper;
import com.yice.webadmin.app.dao.ApiPluginMapper;
import com.yice.webadmin.app.dao.ApiServiceMapper;
import com.yice.webadmin.app.model.ApiManage; import com.yice.webadmin.app.model.ApiManage;
import com.yice.webadmin.app.model.ApiPlugin;
import com.yice.webadmin.app.model.ApiService;
import com.yice.webadmin.app.service.ApiManageService; import com.yice.webadmin.app.service.ApiManageService;
import com.yice.webadmin.app.util.GenerateUtil; import com.yice.webadmin.app.util.GenerateUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -33,7 +37,10 @@ public class ApiManageServiceImpl extends BaseService<ApiManage, Long> implement ...@@ -33,7 +37,10 @@ public class ApiManageServiceImpl extends BaseService<ApiManage, Long> implement
private ApiManageMapper apiManageMapper; private ApiManageMapper apiManageMapper;
@Autowired @Autowired
private IdGeneratorWrapper idGenerator; private IdGeneratorWrapper idGenerator;
@Autowired
private ApiPluginMapper apiPluginMapper;
@Autowired
private ApiServiceMapper apiServiceMapper;
/** /**
* 返回当前Service的主表Mapper对象。 * 返回当前Service的主表Mapper对象。
* *
...@@ -57,6 +64,28 @@ public class ApiManageServiceImpl extends BaseService<ApiManage, Long> implement ...@@ -57,6 +64,28 @@ public class ApiManageServiceImpl extends BaseService<ApiManage, Long> implement
apiManage.setApiKey(GenerateUtil.generateApiKey()); apiManage.setApiKey(GenerateUtil.generateApiKey());
apiManage.setSecretKey(GenerateUtil.generateSecretKey()); apiManage.setSecretKey(GenerateUtil.generateSecretKey());
apiManageMapper.insert(this.buildDefaultValue(apiManage)); apiManageMapper.insert(this.buildDefaultValue(apiManage));
if(CollUtil.isNotEmpty(apiManage.getPlugins())) {
apiManage.getPlugins().stream()
.map(pluginId -> {
ApiPlugin filter = new ApiPlugin();
filter.setApiId(apiManage.getApiId());
filter.setPluginId(pluginId);
return filter;
})
.forEach(apiPluginMapper::insert);
}
if(CollUtil.isNotEmpty(apiManage.getServices())) {
apiManage.getServices().stream()
.map(serviceId -> {
ApiService filter = new ApiService();
filter.setApiId(apiManage.getApiId());
filter.setServiceId(serviceId);
return filter;
})
.forEach(apiServiceMapper::insert);
}
return apiManage; return apiManage;
} }
......
...@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
/** /**
* ApiManageVo视图对象。 * ApiManageVo视图对象。
* *
...@@ -52,4 +54,16 @@ public class ApiManageVo extends BaseVo { ...@@ -52,4 +54,16 @@ public class ApiManageVo extends BaseVo {
*/ */
@ApiModelProperty(value = "remark") @ApiModelProperty(value = "remark")
private String remark; private String remark;
/**
* 服务列表。
*/
@ApiModelProperty(value = "服务列表")
private List<Long> services;
/**
* 插件列表。
*/
@ApiModelProperty(value = "插件列表")
private List<Long> plugins;
} }
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