ci4s
/
ci4sManagement-cloud
0
0
Fork 7
Code Issues Pull Requests 1 Packages Projects Releases 1 Wiki Activity

优化

This commit is contained in:
chenzhihang 2026-03-19 19:22:15 +08:00
parent b6aab16c7f
commit c8a4b3edb8
7 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java
View File

@ -60,7 +60,7 @@ public class NewDatasetFromGitController {
@PutMapping("/updateDataset")
@ApiOperation("修改数据集")
@OperationNotification("修改数据集:#{#datasetVo.name}")
public AjaxResult updateDataset(@RequestBody NewDatasetVo datasetVo) {
public AjaxResult updateDataset(@RequestBody NewDatasetVo datasetVo) throws Exception {
return AjaxResult.success(newDatasetService1.updateDataset(datasetVo));
}

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/NewModelFromGitController.java
View File

@ -46,7 +46,7 @@ public class NewModelFromGitController extends BaseController {
@PutMapping("/updateModel")
@ApiOperation("修改模型")
@OperationNotification("修改模型:#{#modelsVo.name}")
public AjaxResult updateDataset(@RequestBody ModelsVo modelsVo) {
public AjaxResult updateDataset(@RequestBody ModelsVo modelsVo) throws Exception {
return AjaxResult.success(newModelService.updateModel(modelsVo));
}

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService1.java
View File

@ -83,7 +83,7 @@ public interface NewDatasetService1 {
*/
int updateState(Integer id, Integer state, String updateBy);
NewDatasetVo updateDataset(NewDatasetVo datasetVo);
NewDatasetVo updateDataset(NewDatasetVo datasetVo) throws Exception;
int deleteByIdentifier(String identifier);
}

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewModelService.java
View File

@ -93,7 +93,7 @@ public interface NewModelService {
*/
List<NewModel> getLatestModels(int limit);
ModelsVo updateModel(ModelsVo modelsVo);
ModelsVo updateModel(ModelsVo modelsVo) throws Exception;
int deleteByIdentifier(String identifier);

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

@ -330,20 +330,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
datasetVo.setOwner((String) userInfo.get("login"));
datasetVo.setDescription((String) projectDetail.get("description"));
// List<Map> topics = (List<Map>) projectDetail.get("topics");
// if (topics != null && topics.size() > 0) {
// for (Map topic : topics) {
// String topicName = (String) topic.get("name");
// if (topicName.startsWith("datatag-")) {
// datasetVo.setDataTag(topicName.substring("datatag-".length()));
// }
// if (topicName.startsWith("datatype-")) {
// datasetVo.setDataType(topicName.substring("datatype-".length()));
// }
// }
// }
datasetVo.setRelativePaths(relatePath + "/dataset");
datasetVo = addDatasetSourceToDataVo(datasetVo);
YamlUtils.generateYamlFile(JsonUtils.objectToMap(datasetVo), localPath, "dataset");

17
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl1.java
View File

@ -48,7 +48,7 @@ public class NewDatasetServiceImpl1 implements NewDatasetService1 {
@Transactional
public NewDataset save(NewDataset dataset) {
int save = datasetDao.save(dataset);
if(save > 0){
if (save > 0) {
return dataset;
}
return null;
@ -161,27 +161,21 @@ public class NewDatasetServiceImpl1 implements NewDatasetService1 {
}
@Override
public NewDatasetVo updateDataset(NewDatasetVo datasetVo) {
public NewDatasetVo updateDataset(NewDatasetVo datasetVo) throws Exception {
NewDataset newDataset = new NewDataset();
//modelsVo复制信息到newModel
BeanUtils.copyProperties(datasetVo, newDataset);
newDataset.setId((Integer) datasetVo.getId());
newDataset.setDataType(JsonUtils.commaToJsonArray(datasetVo.getDataType()));
setCommonFields(newDataset,false);
setCommonFields(newDataset, false);
edit(newDataset);
taskExecutor.execute(() -> {
try {
newDatasetService.updateDataset(datasetVo);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
});
newDatasetService.updateDataset(datasetVo);
return datasetVo;
}
@Override
public int deleteByIdentifier(String identifier) {
return datasetDao.updateStateByIdentifier(identifier,0);
return datasetDao.updateStateByIdentifier(identifier, 0);
}
@ -207,6 +201,7 @@ public class NewDatasetServiceImpl1 implements NewDatasetService1 {
setFieldIfExists(target, "updateBy", loginUser.getUsername());
setFieldIfExists(target, "updateTime", new Date());
}
private void setFieldIfExists(Object target, String fieldName, Object value) {
// 查找字段
Field field = ReflectionUtils.findField(target.getClass(), fieldName);

10
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewModelServiceImpl.java
View File

@ -175,7 +175,7 @@ public class NewModelServiceImpl implements NewModelService {
}
@Override
public ModelsVo updateModel(ModelsVo modelsVo) {
public ModelsVo updateModel(ModelsVo modelsVo) throws Exception {
NewModel newModel = new NewModel();
//modelsVo复制信息到newModel
BeanUtils.copyProperties(modelsVo, newModel);
@ -183,13 +183,7 @@ public class NewModelServiceImpl implements NewModelService {
newModel.setModelType(JsonUtils.commaToJsonArray(modelsVo.getModelType()));
setCommonFields(newModel,false);
edit(newModel);
taskExecutor.execute(() -> {
try {
modelsService.updateModel(modelsVo);
} catch (Exception e) {
log.error("异步创建模型失败: {}", modelsVo.getName(), e);
}
});
modelsService.updateModel(modelsVo);
return modelsVo;
}