Commit ea371e58 authored by pengxin's avatar pengxin

新增更新接口。

parent d9667a8a
......@@ -45,10 +45,20 @@ public class DatasetConstant {
/**
* 导出位置
*/
public static final String OUTPUT_POSTION = "导出至本地" ;
public static final String OUTPUT_POSTION = "导出至本地";
/**
* 导出内容
*/
public static final String OUTPUT_CONTENT = "全部数据" ;
public static final String OUTPUT_CONTENT = "全部数据";
/**
* output数据
*/
public static final String OUTPUT = "output";
/**
* 已标记
*/
public static final Integer MARK = 1;
}
package com.yice.webadmin.app.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.page.PageMethod;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
......@@ -18,6 +20,7 @@ import com.yice.webadmin.app.dto.DatasetDataSummaryDto;
import com.yice.webadmin.app.service.DatasetDataService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -46,16 +49,21 @@ public class DatasetDataController {
*/
@OperationLog(type = SysOperationLogType.UPDATE)
@PostMapping("/update")
public ResponseResult<Void> update(@MyRequestBody DatasetDataDto datasetMongoDto) {
public ResponseResult<Void> update(@MyRequestBody DatasetDataDto datasetMongoDto) throws Exception{
String errorMessage = MyCommonUtil.getModelValidationError(datasetMongoDto, true);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
ObjectMapper objectMapper = new ObjectMapper();
JsonNode rootNode = objectMapper.readTree(datasetMongoDto.getData());
String output = rootNode.get(DatasetConstant.OUTPUT).textValue();
DatasetData datasetData = MyModelUtil.copyTo(datasetMongoDto, DatasetData.class);
datasetData.setMarkStatus(StringUtils.isNotBlank(output) ? DatasetConstant.MARK : DatasetConstant.UNMARK);
datasetDataService.update(datasetData);
return ResponseResult.success();
}
/**
* 删除数据集版本数据。
*
......
......@@ -14,6 +14,7 @@
<result column="data_volume" jdbcType="TINYINT" property="dataVolume"/>
<result column="release_status" jdbcType="TINYINT" property="releaseStatus"/>
<result column="input_status" jdbcType="TINYINT" property="inputStatus"/>
<result column="version_id" jdbcType="BIGINT" property="versionId"/>
<result column="dataset_version" jdbcType="TINYINT" property="datasetVersion"/>
</resultMap>
......@@ -101,7 +102,13 @@
</select>
<select id="getDatasetManageGroupList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetManage">
SELECT lmp_dataset_manage.*, version.release_status, version.input_status, version.data_volume, version.dataset_version
SELECT
lmp_dataset_manage.*,
version.release_status,
version.input_status,
version.data_volume,
version.dataset_version,
version.version_id
FROM
lmp_dataset_manage lmp_dataset_manage
JOIN (
......
......@@ -12,7 +12,7 @@ import java.util.Date;
* @author linking
* @date 2023-04-13
*/
@ApiModel("DatasetMongoDto视图对象")
@ApiModel("DatasetDataDto视图对象")
@Data
public class DatasetDataDto {
......
......@@ -72,6 +72,12 @@ public class DatasetManageDto {
@ApiModelProperty(value = "版本")
private Integer datasetVersion;
/**
* 版本ID。
*/
@ApiModelProperty(value = "版本ID")
private Long versionId;
/**
* dataset_name LIKE搜索字符串。
*/
......
......@@ -86,6 +86,12 @@ public class DatasetManage extends BaseModel {
@TableField(exist = false)
private String searchString;
/**
* 版本ID。
*/
@TableField(exist = false)
private Long versionId;
/**
* 创建人名称字典。
*/
......
......@@ -74,6 +74,12 @@ public class DatasetManageVo extends BaseVo {
@ApiModelProperty(value = "版本")
private Integer datasetVersion;
/**
* 版本ID。
*/
@ApiModelProperty(value = "版本ID")
private Long versionId;
/**
* DatasetVersion 的一对多关联表数据对象。数据对应类型为DatasetVersion。
*/
......
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