From 4ac23e086b841f224f64fa5c30f1fbf244f962b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Thu, 30 May 2024 16:52:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=8F=92=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModelDependencyDaoMapper.xml | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml index 250a0f4..83f8a1c 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml @@ -139,22 +139,23 @@ state ) values ( - #{currentModelId}, - #{parentModels}, - #{refItem}, - #{trainTask}, - #{trainDataset}, - #{testDataset}, - #{projectDependency}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{state} + #{modelDependency.currentModelId}, + #{modelDependency.parentModels}, + #{modelDependency.refItem}, + #{modelDependency.trainTask}, + #{modelDependency.trainDataset}, + #{modelDependency.testDataset}, + #{modelDependency.projectDependency}, + #{modelDependency.createBy}, + #{modelDependency.createTime}, + #{modelDependency.updateBy}, + #{modelDependency.updateTime}, + #{modelDependency.state} ) + insert into model_dependency ( current_model_id, From 12b91800b9120988fde2351903fcb9b22f484bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Thu, 30 May 2024 19:20:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=8F=92=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/ModelDependencyController.java | 9 ++--- .../ModelDependencyDaoMapper.xml | 36 +++---------------- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java index 3daa6b8..5ab168d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java @@ -62,7 +62,7 @@ public class ModelDependencyController extends BaseController { * @return 新增结果 */ @PostMapping - public GenericsAjaxResult add(ModelDependency modelDependency) { + public GenericsAjaxResult add(@RequestBody ModelDependency modelDependency) { return genericsSuccess(this.modelDependencyService.insert(modelDependency)); } @@ -73,7 +73,7 @@ public class ModelDependencyController extends BaseController { * @return 编辑结果 */ @PutMapping - public GenericsAjaxResult edit(ModelDependency modelDependency) { + public GenericsAjaxResult edit(@RequestBody ModelDependency modelDependency) { return genericsSuccess(this.modelDependencyService.update(modelDependency)); } @@ -83,8 +83,9 @@ public class ModelDependencyController extends BaseController { * @param id 主键 * @return 删除是否成功 */ - @DeleteMapping - public GenericsAjaxResult deleteById(Integer id) { + @DeleteMapping("{id}") + @ApiOperation("删除模型依赖") + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { return genericsSuccess(this.modelDependencyService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml index 83f8a1c..f31a75a 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml @@ -122,40 +122,12 @@ - + - insert into model_dependency ( - current_model_id, - parent_models, - ref_item, - train_task, - train_dataset, - test_dataset, - project_dependency, - create_by, - create_time, - update_by, - update_time, - state - ) - values ( - #{modelDependency.currentModelId}, - #{modelDependency.parentModels}, - #{modelDependency.refItem}, - #{modelDependency.trainTask}, - #{modelDependency.trainDataset}, - #{modelDependency.testDataset}, - #{modelDependency.projectDependency}, - #{modelDependency.createBy}, - #{modelDependency.createTime}, - #{modelDependency.updateBy}, - #{modelDependency.updateTime}, - #{modelDependency.state} - ) + insert into model_dependency (current_model_id, parent_models, ref_item, train_task, train_dataset, test_dataset, project_dependency, create_by, create_time, update_by, update_time, state) + values (#{modelDependency.currentModelId}, #{modelDependency.parentModels}, #{modelDependency.refItem}, #{modelDependency.trainTask}, #{modelDependency.trainDataset}, #{modelDependency.testDataset}, #{modelDependency.projectDependency}, #{modelDependency.createBy}, #{modelDependency.createTime}, #{modelDependency.updateBy}, #{modelDependency.updateTime}, #{modelDependency.state}) - - insert into model_dependency ( current_model_id, @@ -242,7 +214,7 @@ current_model_id = values(current_model_id)parent_models = values(parent_models) state = #{modelDependency.state}, - where id = #{id} + where id = #{modelDependency.id}