Browse Source

修改datasettemp的xml

dev-restore_mount
fanshuai 1 year ago
parent
commit
f4581d5080
3 changed files with 24 additions and 19 deletions
  1. +2
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java
  2. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
  3. +21
    -16
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetTempStorageDao.xml

+ 2
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/jupyter/JupyterController.java View File

@@ -89,7 +89,7 @@ public class JupyterController extends BaseController {
@GetMapping(value = "/testdvc")
public AjaxResult testdvc() throws Exception {
NewDatasetVo datasetVo = new NewDatasetVo();
datasetVo.setName("testdvc90412");
datasetVo.setName("testdvc1992");
datasetVo.setDescription("sss");
datasetVo.setIsPublic(false);
datasetVo.setDataTag("计算机视觉");
@@ -97,7 +97,7 @@ public class JupyterController extends BaseController {
datasetVo.setVersion("dev");
List<VersionVo> datasetVersionVos = new ArrayList<>();
VersionVo versionVo = new VersionVo();
versionVo.setUrl("E:/test/bb/data/xssa.doc");
versionVo.setUrl("E:/test/data/模型任务1季度.zip");
datasetVo.setDescription("this is a test");
datasetVo.setProcessingCode("python code");
datasetVo.setVersionDesc("this is a test");


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java View File

@@ -483,7 +483,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
queryDatasetTempStorage.setName(datasetVo.getName());
queryDatasetTempStorage.setVersion(datasetVo.getVersion());
DatasetTempStorage datasetTempStorage = datasetTempStorageService.queryByDatasetTempStorage(queryDatasetTempStorage);
if (datasetTempStorage == null){
if (datasetTempStorage != null){
String datasetSourceString = datasetTempStorage.getSource();
Map<String, Object> datasetSourceMap = JacksonUtil.parseJSONStr2Map(datasetSourceString);
String preprocessCode = (String) datasetSourceMap.get("preprocess_code");


+ 21
- 16
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetTempStorageDao.xml View File

@@ -16,15 +16,16 @@

<!--查询单个-->
<select id="queryById" resultMap="DatasetTempStorageMap">
select idnameversionsourcestatecreate_bycreate_timeupdate_byupdate_time
select
id, name, version, source, state, create_by, create_time, update_by, update_time
from dataset_temp_storage
where id = #{id}
</select>

<!--查询指定条件的数据-->
<select id="queryByDatasetTempStorage" resultMap="DatasetTempStorageMap">
select
idnameversionsourcestatecreate_bycreate_timeupdate_byupdate_time
id, name, version, source, state, create_by, create_time, update_by, update_time
from dataset_temp_storage
<where>
<if test="id != null">
@@ -57,10 +58,11 @@
</where>
limit 1
</select>

<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="DatasetTempStorageMap">
select
idnameversionsourcestatecreate_bycreate_timeupdate_byupdate_time
id, name, version, source, state, create_by, create_time, update_by, update_time
from dataset_temp_storage
<where>
<if test="id != null">
@@ -131,27 +133,33 @@

<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into dataset_temp_storage(nameversionsourcestatecreate_bycreate_timeupdate_byupdate_time)
values (#{name}#{version}#{source}#{state}#{createBy}#{createTime}#{updateBy}#{updateTime})
insert into dataset_temp_storage(name, version, source, state, create_by, create_time, update_by, update_time)
values (#{name}, #{version}, #{source}, #{state}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime})
</insert>

<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into dataset_temp_storage(nameversionsourcestatecreate_bycreate_timeupdate_byupdate_time)
insert into dataset_temp_storage(name, version, source, state, create_by, create_time, update_by, update_time)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.name}#{entity.version}#{entity.source}#{entity.state}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime})
(#{entity.name}, #{entity.version}, #{entity.source}, #{entity.state}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime})
</foreach>
</insert>

<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into dataset_temp_storage(nameversionsourcestatecreate_bycreate_timeupdate_byupdate_time)
insert into dataset_temp_storage(name, version, source, state, create_by, create_time, update_by, update_time)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.name}#{entity.version}#{entity.source}#{entity.state}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime})
(#{entity.name}, #{entity.version}, #{entity.source}, #{entity.state}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime})
</foreach>
on duplicate key update
name = values(name)version = values(version)source = values(source)state = values(state)create_by =
values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)
name = values(name),
version = values(version),
source = values(source),
state = values(state),
create_by = values(create_by),
create_time = values(create_time),
update_by = values(update_by),
update_time = values(update_time)
</insert>

<!--通过主键修改数据-->
@@ -188,10 +196,7 @@

<!--通过主键删除-->
<delete id="deleteById">
delete
from dataset_temp_storage
where id = #{id}
delete from dataset_temp_storage where id = #{id}
</delete>

</mapper>


Loading…
Cancel
Save