修改实验实例表字段,修改实体类及其相应mapper文件
This commit is contained in:
parent
7040966054
commit
b48953f420
|
@ -71,6 +71,7 @@ public class DatasetController {
|
||||||
@ApiOperation("添加数据集")
|
@ApiOperation("添加数据集")
|
||||||
public ResponseEntity<Dataset> add(Dataset dataset) {
|
public ResponseEntity<Dataset> add(Dataset dataset) {
|
||||||
return ResponseEntity.ok(this.datasetService.insert(dataset));
|
return ResponseEntity.ok(this.datasetService.insert(dataset));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -31,6 +31,8 @@ public class ExperimentIns implements Serializable {
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
private String nodesStatus;
|
private String nodesStatus;
|
||||||
|
|
||||||
|
private String nodesLogs;
|
||||||
/**
|
/**
|
||||||
* 创建者
|
* 创建者
|
||||||
*/
|
*/
|
||||||
|
@ -105,6 +107,14 @@ public class ExperimentIns implements Serializable {
|
||||||
this.nodesStatus = nodesStatus;
|
this.nodesStatus = nodesStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getNodesLogs() {
|
||||||
|
return nodesLogs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNodesLogs(String nodesLogs) {
|
||||||
|
this.nodesLogs = nodesLogs;
|
||||||
|
}
|
||||||
|
|
||||||
public String getCreateBy() {
|
public String getCreateBy() {
|
||||||
return createBy;
|
return createBy;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
<result property="argoInsNs" column="argo_ins_ns" jdbcType="VARCHAR"/>
|
<result property="argoInsNs" column="argo_ins_ns" jdbcType="VARCHAR"/>
|
||||||
<result property="status" column="status" jdbcType="VARCHAR"/>
|
<result property="status" column="status" jdbcType="VARCHAR"/>
|
||||||
<result property="nodesStatus" column="nodes_status" jdbcType="VARCHAR"/>
|
<result property="nodesStatus" column="nodes_status" jdbcType="VARCHAR"/>
|
||||||
|
<result property="nodesLogs" column="nodes_logs" jdbcType="VARCHAR"/>
|
||||||
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
|
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
|
||||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||||
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
|
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
|
||||||
|
@ -22,21 +23,21 @@
|
||||||
|
|
||||||
<!--查询单个-->
|
<!--查询单个-->
|
||||||
<select id="queryById" resultMap="ExperimentInsMap">
|
<select id="queryById" resultMap="ExperimentInsMap">
|
||||||
select id,experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,create_by,create_time,update_by,update_time,state
|
select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, create_by, create_time, update_by, update_time, state
|
||||||
from experiment_ins
|
from experiment_ins
|
||||||
where id = #{id} and state = 1
|
where id = #{id} and state = 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!--查询列表-->
|
<!--查询列表-->
|
||||||
<select id="getByExperimentId" resultMap="ExperimentInsMap">
|
<select id="getByExperimentId" resultMap="ExperimentInsMap">
|
||||||
select id,experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,create_by,create_time,update_by,update_time,state
|
select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, create_by, create_time, update_by, update_time, state
|
||||||
from experiment_ins
|
from experiment_ins
|
||||||
where experiment_id = #{experiment_id} and state = 1 order by create_time limit 5
|
where experiment_id = #{experiment_id} and state = 1 order by create_time limit 5
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="queryByExperiment" resultMap="ExperimentInsMap">
|
<select id="queryByExperiment" resultMap="ExperimentInsMap">
|
||||||
select
|
select
|
||||||
id,experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,create_by,create_time,update_by,update_time,state
|
id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, create_by, create_time, update_by, update_time, state
|
||||||
from experiment_ins
|
from experiment_ins
|
||||||
<where>
|
<where>
|
||||||
state = 1
|
state = 1
|
||||||
|
@ -58,6 +59,9 @@
|
||||||
<if test="experimentIns.nodesStatus != null and experimentIns.nodesStatus != ''">
|
<if test="experimentIns.nodesStatus != null and experimentIns.nodesStatus != ''">
|
||||||
and nodes_status = #{experimentIns.nodesStatus}
|
and nodes_status = #{experimentIns.nodesStatus}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="experimentIns.nodesLogs != null and experimentIns.nodesLogs != ''">
|
||||||
|
and nodes_logs = #{experimentIns.nodesLogs}
|
||||||
|
</if>
|
||||||
<if test="experimentIns.createBy != null and experimentIns.createBy != ''">
|
<if test="experimentIns.createBy != null and experimentIns.createBy != ''">
|
||||||
and create_by = #{experimentIns.createBy}
|
and create_by = #{experimentIns.createBy}
|
||||||
</if>
|
</if>
|
||||||
|
@ -72,10 +76,11 @@
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!--查询指定行数据-->
|
<!--查询指定行数据-->
|
||||||
<select id="queryAllByLimit" resultMap="ExperimentInsMap">
|
<select id="queryAllByLimit" resultMap="ExperimentInsMap">
|
||||||
select
|
select
|
||||||
id,experiment_id,argo_ins_name,argo_ins_ns,status,create_by,create_time,update_by,update_time,state
|
id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, create_by, create_time, update_by, update_time, state
|
||||||
from experiment_ins
|
from experiment_ins
|
||||||
<where>
|
<where>
|
||||||
state = 1
|
state = 1
|
||||||
|
@ -97,6 +102,9 @@
|
||||||
<if test="experimentIns.nodesStatus != null and experimentIns.nodesStatus != ''">
|
<if test="experimentIns.nodesStatus != null and experimentIns.nodesStatus != ''">
|
||||||
and nodes_status = #{experimentIns.nodesStatus}
|
and nodes_status = #{experimentIns.nodesStatus}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="experimentIns.nodesLogs != null and experimentIns.nodesLogs != ''">
|
||||||
|
and nodes_logs = #{experimentIns.nodesLogs}
|
||||||
|
</if>
|
||||||
<if test="experimentIns.createBy != null and experimentIns.createBy != ''">
|
<if test="experimentIns.createBy != null and experimentIns.createBy != ''">
|
||||||
and create_by = #{experimentIns.createBy}
|
and create_by = #{experimentIns.createBy}
|
||||||
</if>
|
</if>
|
||||||
|
@ -137,6 +145,9 @@
|
||||||
<if test="experimentIns.nodesStatus != null and experimentIns.nodesStatus != ''">
|
<if test="experimentIns.nodesStatus != null and experimentIns.nodesStatus != ''">
|
||||||
and nodes_status = #{experimentIns.nodesStatus}
|
and nodes_status = #{experimentIns.nodesStatus}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="experimentIns.nodesLogs != null and experimentIns.nodesLogs != ''">
|
||||||
|
and nodes_logs = #{experimentIns.nodesLogs}
|
||||||
|
</if>
|
||||||
<if test="experimentIns.createBy != null and experimentIns.createBy != ''">
|
<if test="experimentIns.createBy != null and experimentIns.createBy != ''">
|
||||||
and create_by = #{experimentIns.createBy}
|
and create_by = #{experimentIns.createBy}
|
||||||
</if>
|
</if>
|
||||||
|
@ -154,16 +165,16 @@
|
||||||
|
|
||||||
<!--新增所有列-->
|
<!--新增所有列-->
|
||||||
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
||||||
insert into experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,create_by,create_time,update_by,update_time,state)
|
insert into experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_logs,create_by,create_time,update_by,update_time,state)
|
||||||
values (#{experimentId},#{argoInsName},#{argoInsNs},#{status},#{nodesStatus},#{createBy},#{createTime},#{updateBy},#{updateTime},#{state})
|
values (#{experimentIns.experimentId},#{experimentIns.argoInsName},#{experimentIns.argoInsNs},#{experimentIns.status},#{experimentIns.nodesStatus},#{experimentIns.nodesLogs},#{experimentIns.createBy},#{experimentIns.createTime},#{experimentIns.updateBy},#{experimentIns.updateTime},#{experimentIns.state})
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
|
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
|
||||||
insert into
|
insert into
|
||||||
experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,create_by,create_time,update_by,update_time,state)
|
experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_logs,create_by,create_time,update_by,update_time,state)
|
||||||
values
|
values
|
||||||
<foreach collection="entities" item="entity" separator=",">
|
<foreach collection="entities" item="entity" separator=",">
|
||||||
(#{entity.experimentId},#{entity.argoInsName},#{entity.argoInsNs},#{entity.status},#{entity.nodesStatus}#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
|
(#{entity.experimentId},#{entity.argoInsName},#{entity.argoInsNs},#{entity.status},#{entity.nodesStatus},#{entity.nodesStatus},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
|
||||||
</foreach>
|
</foreach>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
@ -180,44 +191,47 @@
|
||||||
values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
|
values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<!--通过主键修改数据-->
|
|
||||||
<update id="update">
|
<update id="update">
|
||||||
update experiment_ins
|
update experiment_ins
|
||||||
<set>
|
<set>
|
||||||
<if test="experimentId != null">
|
<if test="experimentIns.experimentId != null">
|
||||||
experiment_id = #{experimentId},
|
experiment_id = #{experimentIns.experimentId},
|
||||||
</if>
|
</if>
|
||||||
<if test="argoInsName != null and argoInsName != ''">
|
<if test="experimentIns.argoInsName != null and experimentIns.argoInsName != ''">
|
||||||
argo_ins_name = #{argoInsName},
|
argo_ins_name = #{experimentIns.argoInsName},
|
||||||
</if>
|
</if>
|
||||||
<if test="argoInsNs != null and argoInsNs != ''">
|
<if test="experimentIns.argoInsNs != null and experimentIns.argoInsNs != ''">
|
||||||
argo_ins_ns = #{argoInsNs},
|
argo_ins_ns = #{experimentIns.argoInsNs},
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null and status != ''">
|
<if test="experimentIns.status != null and experimentIns.status != ''">
|
||||||
status = #{status},
|
status = #{experimentIns.status},
|
||||||
</if>
|
</if>
|
||||||
<if test="nodesStatus != null and nodesStatus != ''">
|
<if test="experimentIns.nodesStatus != null and experimentIns.nodesStatus != ''">
|
||||||
nodes_status = #{nodesStatus},
|
nodes_status = #{experimentIns.nodesStatus},
|
||||||
</if>
|
</if>
|
||||||
<if test="createBy != null and createBy != ''">
|
<if test="experimentIns.nodesLogs != null and experimentIns.nodesLogs != ''">
|
||||||
create_by = #{createBy},
|
nodes_logs = #{experimentIns.nodesLogs},
|
||||||
</if>
|
</if>
|
||||||
<if test="createTime != null">
|
<if test="experimentIns.createBy != null and experimentIns.createBy != ''">
|
||||||
create_time = #{createTime},
|
create_by = #{experimentIns.createBy},
|
||||||
</if>
|
</if>
|
||||||
<if test="updateBy != null and updateBy != ''">
|
<if test="experimentIns.createTime != null">
|
||||||
update_by = #{updateBy},
|
create_time = #{experimentIns.createTime},
|
||||||
</if>
|
</if>
|
||||||
<if test="updateTime != null">
|
<if test="experimentIns.updateBy != null and experimentIns.updateBy != ''">
|
||||||
update_time = #{updateTime},
|
update_by = #{experimentIns.updateBy},
|
||||||
</if>
|
</if>
|
||||||
<if test="state != null">
|
<if test="experimentIns.updateTime != null">
|
||||||
state = #{state},
|
update_time = #{experimentIns.updateTime},
|
||||||
|
</if>
|
||||||
|
<if test="experimentIns.state != null">
|
||||||
|
state = #{experimentIns.state},
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where id = #{id}
|
where id = #{experimentIns.id}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<!--通过主键删除-->
|
<!--通过主键删除-->
|
||||||
<delete id="deleteById">
|
<delete id="deleteById">
|
||||||
delete
|
delete
|
||||||
|
|
Loading…
Reference in New Issue