From c8a4b3edb8e6aafb05d9a024da8d7041e1c034f2 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 19 Mar 2026 19:22:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/NewDatasetFromGitController.java | 2 +- .../model/NewModelFromGitController.java | 2 +- .../platform/service/NewDatasetService1.java | 2 +- .../ruoyi/platform/service/NewModelService.java | 2 +- .../service/impl/NewDatasetServiceImpl.java | 13 ------------- .../service/impl/NewDatasetServiceImpl1.java | 17 ++++++----------- .../service/impl/NewModelServiceImpl.java | 10 ++-------- 7 files changed, 12 insertions(+), 36 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java index f0b2385a..2e556a4c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java @@ -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)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/NewModelFromGitController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/NewModelFromGitController.java index 3b340fe8..e52cd4c1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/NewModelFromGitController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/NewModelFromGitController.java @@ -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)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService1.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService1.java index d95f6990..81aaeb90 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService1.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService1.java @@ -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); } \ No newline at end of file diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewModelService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewModelService.java index 6b0edf56..ddbc278d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewModelService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewModelService.java @@ -93,7 +93,7 @@ public interface NewModelService { */ List getLatestModels(int limit); - ModelsVo updateModel(ModelsVo modelsVo); + ModelsVo updateModel(ModelsVo modelsVo) throws Exception; int deleteByIdentifier(String identifier); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index 9b612a3c..23ec628e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -330,20 +330,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { datasetVo.setOwner((String) userInfo.get("login")); datasetVo.setDescription((String) projectDetail.get("description")); -// List topics = (List) 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"); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl1.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl1.java index 417b699d..5a99a84e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl1.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl1.java @@ -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); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewModelServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewModelServiceImpl.java index 5d61e09b..53a17162 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewModelServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewModelServiceImpl.java @@ -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; }