Commit 382a9994 authored by linpeiqin's avatar linpeiqin

修改一些小BUG

parent 896875f7
......@@ -53,7 +53,6 @@ public class DatasetManageController {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
DatasetManage datasetManage = MyModelUtil.copyTo(datasetManageDto, DatasetManage.class);
// datasetManage = datasetManageService.saveNew(datasetManage);
datasetManage = datasetManageService.saveAndCreateVersion(datasetManage);
return ResponseResult.success(datasetManage.getDatasetId());
}
......
......@@ -245,9 +245,7 @@ public class DatasetVersionController {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST, errorMessage);
}
DatasetVersion datasetVersion = this.datasetVersionService.getById(versionId);
DatasetManage datasetManage = this.datasetManageService.getById(datasetId);
String versionName = datasetManage.getDatasetName() + "_V" + datasetVersion.getDatasetVersion();
String fullName = this.saveDatasetFile(importFile, versionName);
String fullName = this.saveDatasetFile(importFile, datasetVersion.getVersionName());
datasetVersion.setFileUrl(fullName);
datasetVersion.setInputStatus(1);
datasetVersion.setDataVolume(Long.valueOf(JSON.parseArray(new String(importFile.getBytes(), StandardCharsets.UTF_8)).size()));
......@@ -285,6 +283,7 @@ public class DatasetVersionController {
if (rootNode == null || rootNode.isNull() || rootNode.size() < 1) {
rootNode = objectMapper.createObjectNode();
}
//此处应该要做键值映射关系,目前没做,后面需要修改
String fieldValue = "{\"file_name\":\"" + versionName + ".json\",\"file_sha1\":\"" + Sha1Util.getSha1(versionName) + "\"}";
((ObjectNode) rootNode).put(versionName, objectMapper.readTree(fieldValue));
objectMapper.writeValue(new File(pythonConfig.getDatasetFileBaseDir(), pythonConfig.getDatasetInfo()), rootNode);
......
package com.yice.webadmin.app.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.page.PageMethod;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
......@@ -11,14 +13,11 @@ import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.config.PythonConfig;
import com.yice.webadmin.app.dto.ModelEstimateDto;
import com.yice.webadmin.app.dto.ModelTaskDto;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelEstimateService;
import com.yice.webadmin.app.service.ModelTaskService;
import com.yice.webadmin.app.service.ModelVersionService;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.vo.ModelEstimateVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
......@@ -45,6 +44,15 @@ public class ModelEstimateController {
private ModelTaskService modelTaskService;
@Autowired
private ModelVersionService modelVersionService;
@Autowired
private DatasetVersionService datasetVersionService;
@Autowired
private DatasetManageService datasetManageService;
@Autowired
private ModelManageService modelManageService;
@Autowired
private PythonConfig pythonConfig;
/**
* 新增模型评估数据,及其关联的从表数据。
......@@ -76,7 +84,43 @@ public class ModelEstimateController {
modelEstimate = modelEstimateService.saveNewWithRelation(modelEstimate, bizData.getSecond());
return ResponseResult.success(modelEstimate.getTaskId());
}
/**
* 获取预览命令。
*
* @param taskId 任务ID。
* @return 应答结果对象。
*/
@GetMapping("/getPreviewCommand")
public ResponseResult<String> getPreviewCommand(@RequestParam Long taskId) {
ModelEstimate modelEstimate = this.modelEstimateService.getById(taskId);
ModelVersion modelVersion = this.modelVersionService.getById(modelEstimate.getModelVersionId());
DatasetVersion datasetVersion = this.datasetVersionService.getById(modelEstimate.getDatasetVersionId());
ModelManage modelManage = this.modelManageService.getById(modelVersion.getModelId());
JSONObject jsonObject = (JSONObject) JSON.parse(modelEstimate.getConfiguration());
JSONArray array = new JSONArray();
array.add("zh");
array.add(modelManage.getModelName());
array.add(modelVersion.getModelUrl());
array.add("");
array.add(new JSONArray());
array.add(jsonObject.get("quantizationLevel"));
array.add(jsonObject.get("promptTemplate"));
array.add("");
array.add(false);
array.add(false);
array.add("none");
array.add(pythonConfig.getDatasetFileMenu());
array.add(datasetVersion.getVersionName());
array.add(jsonObject.get("truncationLength"));
array.add(jsonObject.get("maximumSampleSize"));
array.add(jsonObject.get("batchSize"));
array.add(true);
array.add(jsonObject.get("maximumGeneratingLength"));
array.add(jsonObject.get("ToppSamplingValue"));
array.add(jsonObject.get("temperatureCoefficient"));
System.out.println(array.toJSONString());
return ResponseResult.success(array.toJSONString());
}
/**
* 修改模型评估数据,及其关联的从表数据。
*
......
......@@ -21,6 +21,7 @@
<result column="is_inherit" jdbcType="TINYINT" property="isInherit"/>
<result column="his_version" jdbcType="TINYINT" property="hisVersion"/>
<result column="file_url" jdbcType="VARCHAR" property="fileUrl"/>
<result column="version_name" jdbcType="VARCHAR" property="versionName"/>
</resultMap>
<insert id="insertList">
......@@ -42,7 +43,8 @@
dimension_type,
template,
is_inherit,
his_version)
his_version,
version_name)
VALUES
<foreach collection="list" index="index" item="item" separator=",">
(#{item.versionId},
......@@ -62,7 +64,8 @@
#{item.dimensionType},
#{item.template},
#{item.isInherit},
#{item.hisVersion}
#{item.hisVersion},
#{item.versionName}
)
</foreach>
</insert>
......
......@@ -24,7 +24,6 @@ public class DatasetVersionDto {
@NotNull(message = "数据验证失败,版本ID不能为空!", groups = {UpdateGroup.class})
private Long versionId;
/**
* 版本。
*/
......@@ -109,4 +108,10 @@ public class DatasetVersionDto {
*/
@ApiModelProperty(value = "文件地址")
private String fileUrl;
/**
* 版本名称。
*/
@ApiModelProperty(value = "版本名称")
private String versionName;
}
......@@ -98,6 +98,11 @@ public class DatasetVersion extends BaseModel {
*/
private String fileUrl;
/**
* 版本名称。
*/
private String versionName;
@RelationOneToOne(
masterIdField = "versionId",
......
......@@ -146,16 +146,6 @@ public class DatasetManageServiceImpl extends BaseService<DatasetManage, Long> i
DatasetManage reDatasetManage = this.saveNew(datasetManage);
DatasetVersion datasetVersion = new DatasetVersion();
datasetVersion.setDatasetId(reDatasetManage.getDatasetId());
datasetVersion.setDatasetVersion(1);
datasetVersion.setCleanStatus(0);
datasetVersion.setDataVolume(0L);
datasetVersion.setEnhanceStatus(0);
datasetVersion.setInputStatus(0);
datasetVersion.setMarkProgress(0);
datasetVersion.setOutputStatus(0);
datasetVersion.setReleaseStatus(0);
datasetVersion.setTemplate(datasetManage.getTemplate());
datasetVersion.setDimensionType(datasetManage.getDimensionType());
this.datasetVersionService.saveNew(datasetVersion);
return reDatasetManage;
}
......
......@@ -10,9 +10,12 @@ import com.yice.common.core.object.CallResult;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.yice.webadmin.app.controller.DatasetManageController;
import com.yice.webadmin.app.dao.DatasetVersionMapper;
import com.yice.webadmin.app.model.DatasetDetail;
import com.yice.webadmin.app.model.DatasetManage;
import com.yice.webadmin.app.model.DatasetVersion;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.DatasetDetailService;
import com.yice.webadmin.app.service.DatasetManageService;
import com.yice.webadmin.app.service.DatasetVersionService;
......@@ -61,6 +64,26 @@ public class DatasetVersionServiceImpl extends BaseService<DatasetVersion, Long>
@Transactional(rollbackFor = Exception.class)
@Override
public DatasetVersion saveNew(DatasetVersion datasetVersion) {
DatasetManage reDatasetManage = this.datasetManageService.getById(datasetVersion.getDatasetId());
DatasetVersion datasetVersionFilter = new DatasetVersion();
datasetVersionFilter.setDatasetId(datasetVersion.getDatasetId());
List<DatasetVersion> datasetVersionList = this.getDatasetVersionList(datasetVersionFilter,"dataset_version");
Integer version = 1;
if (datasetVersionList != null && datasetVersionList.size() != 0) {
version = datasetVersionList.get(datasetVersionList.size() - 1).getDatasetVersion() + 1;
}
datasetVersion.setDatasetVersion(version);
datasetVersion.setVersionName(reDatasetManage.getDatasetName()+"_V"+datasetVersion.getDatasetVersion());
datasetVersion.setDatasetId(reDatasetManage.getDatasetId());
datasetVersion.setCleanStatus(0);
datasetVersion.setDataVolume(0L);
datasetVersion.setEnhanceStatus(0);
datasetVersion.setInputStatus(0);
datasetVersion.setMarkProgress(0);
datasetVersion.setOutputStatus(0);
datasetVersion.setReleaseStatus(0);
datasetVersion.setTemplate(reDatasetManage.getTemplate());
datasetVersion.setDimensionType(reDatasetManage.getDimensionType());
datasetVersionMapper.insert(this.buildDefaultValue(datasetVersion));
return datasetVersion;
}
......
......@@ -109,6 +109,12 @@ public class DatasetVersionVo extends BaseVo {
@ApiModelProperty(value = "文件地址")
private String fileUrl;
/**
* 版本名称。
*/
@ApiModelProperty(value = "版本名称")
private String versionName;
/**
* versionId 的一对一关联数据对象,数据对应类型为DatasetDetailVo。
......
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