修改BUG
This commit is contained in:
parent
ba3cf16b38
commit
a0ee128924
|
@ -91,7 +91,7 @@ public class DatasetController {
|
|||
* @return 新增结果
|
||||
*/
|
||||
@PostMapping("/addDatesetAndVesion")
|
||||
@ApiOperation("添加数据集")
|
||||
@ApiOperation("添加数据集和版本")
|
||||
public AjaxResult addDatesetAndVesion(@RequestBody DatasetVo datasetVo) throws Exception {
|
||||
return AjaxResult.success(this.datasetService.insertDatesetAndVesion(datasetVo));
|
||||
|
||||
|
|
|
@ -24,8 +24,11 @@ public class Dataset implements Serializable {
|
|||
@ApiModelProperty(name = "description")
|
||||
private String description;
|
||||
|
||||
@ApiModelProperty(name = "range")
|
||||
private String range;
|
||||
/**
|
||||
* 是否公开1公开,0私有
|
||||
*/
|
||||
@ApiModelProperty(name = "available_range")
|
||||
private int availableRange;
|
||||
@ApiModelProperty(name = "data_type")
|
||||
private Integer dataType;
|
||||
@ApiModelProperty(name = "data_tag")
|
||||
|
@ -73,29 +76,22 @@ public class Dataset implements Serializable {
|
|||
this.name = name;
|
||||
}
|
||||
|
||||
// public String getVersion() {
|
||||
// return version;
|
||||
// }
|
||||
//
|
||||
// public void setVersion(String version) {
|
||||
// this.version = version;
|
||||
// }
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public int getAvailableRange() {
|
||||
return availableRange;
|
||||
}
|
||||
|
||||
public void setAvailableRange(int availableRange) {
|
||||
this.availableRange = availableRange;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getRange() {
|
||||
return range;
|
||||
}
|
||||
|
||||
public void setRange(String range) {
|
||||
this.range = range;
|
||||
}
|
||||
|
||||
public Integer getDataType() {
|
||||
return dataType;
|
||||
|
|
|
@ -324,7 +324,7 @@ public class DatasetServiceImpl implements DatasetService {
|
|||
Dataset dataset = new Dataset();
|
||||
dataset.setName(datasetVo.getName());
|
||||
dataset.setDescription(datasetVo.getDescription());
|
||||
dataset.setRange(datasetVo.getRange());
|
||||
dataset.setAvailableRange(datasetVo.getAvailableRange());
|
||||
dataset.setDataType(datasetVo.getDataType());
|
||||
dataset.setDataTag(datasetVo.getDataTag());
|
||||
Dataset insert = this.insert(dataset);
|
||||
|
|
|
@ -18,8 +18,8 @@ public class DatasetVo implements Serializable {
|
|||
/**
|
||||
* 是否公开1公开,0私有
|
||||
*/
|
||||
@ApiModelProperty(name = "range")
|
||||
private String range;
|
||||
@ApiModelProperty(name = "available_range")
|
||||
private int availableRange;
|
||||
@ApiModelProperty(name = "data_type")
|
||||
private Integer dataType;
|
||||
@ApiModelProperty(name = "data_tag")
|
||||
|
@ -66,12 +66,12 @@ public class DatasetVo implements Serializable {
|
|||
this.description = description;
|
||||
}
|
||||
|
||||
public String getRange() {
|
||||
return range;
|
||||
public int getAvailableRange() {
|
||||
return availableRange;
|
||||
}
|
||||
|
||||
public void setRange(String range) {
|
||||
this.range = range;
|
||||
public void setAvailableRange(int availableRange) {
|
||||
this.availableRange = availableRange;
|
||||
}
|
||||
|
||||
public Integer getDataType() {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<result property="id" column="id" jdbcType="INTEGER"/>
|
||||
<result property="name" column="name" jdbcType="VARCHAR"/>
|
||||
<result property="description" column="description" jdbcType="VARCHAR"/>
|
||||
<result property="range" column="range" jdbcType="INTEGER"/>
|
||||
<result property="availableRange" column="available_range" jdbcType="INTEGER"/>
|
||||
<result property="dataType" column="data_type" jdbcType="INTEGER"/>
|
||||
<result property="dataTag" column="data_tag" jdbcType="INTEGER"/>
|
||||
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
|
||||
|
@ -19,7 +19,7 @@
|
|||
<!--查询单个-->
|
||||
<select id="queryById" resultMap="DatasetMap">
|
||||
select
|
||||
id,name,description,range,data_type,data_tag,create_by,create_time,update_by,update_time,state
|
||||
id,name,description,available_range,data_type,data_tag,create_by,create_time,update_by,update_time,state
|
||||
from dataset
|
||||
where id = #{id} and state = 1
|
||||
</select>
|
||||
|
@ -27,7 +27,7 @@
|
|||
<!--查询指定行数据-->
|
||||
<select id="queryAllByLimit" resultMap="DatasetMap">
|
||||
select
|
||||
id,name,description,range,data_type,data_tag,create_by,create_time,update_by,update_time,state
|
||||
id,name,description,available_range,data_type,data_tag,create_by,create_time,update_by,update_time,state
|
||||
from dataset
|
||||
<where>
|
||||
state = 1
|
||||
|
@ -40,8 +40,8 @@
|
|||
<if test="dataset.description != null and dataset.description != ''">
|
||||
and description = #{dataset.description}
|
||||
</if>
|
||||
<if test="dataset.range != null and dataset.range != ''">
|
||||
and range = #{dataset.range}
|
||||
<if test="dataset.availableRange != null and dataset.availableRange != ''">
|
||||
and available_range = #{dataset.availableRange}
|
||||
</if>
|
||||
<if test="dataset.dataType != null">
|
||||
and data_type = #{dataset.dataType}
|
||||
|
@ -83,8 +83,8 @@
|
|||
<if test="dataset.description != null and dataset.description != ''">
|
||||
and description = #{dataset.description}
|
||||
</if>
|
||||
<if test="dataset.range != null and dataset.range != ''">
|
||||
and range = #{dataset.range}
|
||||
<if test="dataset.availableRange != null and dataset.availableRange != ''">
|
||||
and available_range = #{dataset.availableRange}
|
||||
</if>
|
||||
<if test="dataset.dataType != null">
|
||||
and data_type = #{dataset.dataType}
|
||||
|
@ -112,26 +112,26 @@
|
|||
|
||||
<!--新增所有列-->
|
||||
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
||||
insert into dataset(name,description,range,data_type,data_tag,create_by,create_time,update_by,update_time,state)
|
||||
values (#{dataset.name},#{dataset.description},#{dataset.range},#{dataset.dataType},#{dataset.dataTag},#{dataset.createBy},#{dataset.createTime},#{dataset.updateBy},#{dataset.updateTime},#{dataset.state})
|
||||
insert into dataset(name,description,available_range,data_type,data_tag,create_by,create_time,update_by,update_time,state)
|
||||
values (#{dataset.name},#{dataset.description},#{dataset.availableRange},#{dataset.dataType},#{dataset.dataTag},#{dataset.createBy},#{dataset.createTime},#{dataset.updateBy},#{dataset.updateTime},#{dataset.state})
|
||||
</insert>
|
||||
|
||||
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
|
||||
insert into dataset(name,description,range,data_type,data_tag,create_by,create_time,update_by,update_time,state)
|
||||
insert into dataset(name,description,available_range,data_type,data_tag,create_by,create_time,update_by,update_time,state)
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
(#{entity.name}#{entity.description}#{entity.range}#{entity.dataType}#{entity.dataTag}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
|
||||
(#{entity.name}#{entity.description}#{entity.availableRange}#{entity.dataType}#{entity.dataTag}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
|
||||
insert into dataset(name,description,range,data_type,data_tag,create_by,create_time,update_by,update_time,state)
|
||||
insert into dataset(name,description,available_range,data_type,data_tag,create_by,create_time,update_by,update_time,state)
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
(#{entity.name}#{entity.description}#{entity.range#{entity.dataType}#{entity.dataTag}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
|
||||
(#{entity.name}#{entity.description}#{entity.availableRange#{entity.dataType}#{entity.dataTag}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
|
||||
</foreach>
|
||||
on duplicate key update
|
||||
name = values(name)description = values(description)range = values(range)data_type = values(data_type)data_tag = values(data_tag)create_by = values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
|
||||
name = values(name)description = values(description)available_range = values(available_range)data_type = values(data_type)data_tag = values(data_tag)create_by = values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
|
||||
</insert>
|
||||
|
||||
<!--通过主键修改数据-->
|
||||
|
@ -144,8 +144,8 @@
|
|||
<if test="dataset.description != null and dataset.description != ''">
|
||||
description = #{dataset.description},
|
||||
</if>
|
||||
<if test="dataset.range != null and dataset.range != ''">
|
||||
range = #{dataset.range}
|
||||
<if test="dataset.availableRange != null and dataset.availableRange != ''">
|
||||
available_range = #{dataset.availableRange}
|
||||
</if>,
|
||||
<if test="dataset.dataType != null">
|
||||
data_type = #{dataset.dataType},
|
||||
|
|
Loading…
Reference in New Issue