Merge remote-tracking branch 'origin/dev' into dev

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<ModelDependency> add(ModelDependency modelDependency) {
+    public GenericsAjaxResult<ModelDependency> add(@RequestBody ModelDependency modelDependency) {
         return genericsSuccess(this.modelDependencyService.insert(modelDependency));
     }
 
@@ -73,7 +73,7 @@ public class ModelDependencyController extends BaseController {
      * @return 编辑结果
      */
     @PutMapping
-    public GenericsAjaxResult<ModelDependency> edit(ModelDependency modelDependency) {
+    public GenericsAjaxResult<ModelDependency> edit(@RequestBody ModelDependency modelDependency) {
         return genericsSuccess(this.modelDependencyService.update(modelDependency));
     }
 
@@ -83,8 +83,9 @@ public class ModelDependencyController extends BaseController {
      * @param id 主键
      * @return 删除是否成功
      */
-    @DeleteMapping
+    @DeleteMapping("{id}")
-    public GenericsAjaxResult<String> deleteById(Integer id) {
+    @ApiOperation("删除模型依赖")
+    public GenericsAjaxResult<String> deleteById(@PathVariable("id") Integer id) {
         return genericsSuccess(this.modelDependencyService.removeById(id));
     }
 

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml

@@ -122,39 +122,12 @@
         </where>
     </select>
 
-    <!-- 新增所有列 -->
+    <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into model_dependency (
+        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)
-            current_model_id,
+        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})
-            parent_models,
-            ref_item,
-            train_task,
-            train_dataset,
-            test_dataset,
-            project_dependency,
-            create_by,
-            create_time,
-            update_by,
-            update_time,
-            state
-        )
-        values (
-            #{currentModelId},
-            #{parentModels},
-            #{refItem},
-            #{trainTask},
-            #{trainDataset},
-            #{testDataset},
-            #{projectDependency},
-            #{createBy},
-            #{createTime},
-            #{updateBy},
-            #{updateTime},
-            #{state}
-               )
     </insert>
 
-
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
         insert into model_dependency (
         current_model_id,
@@ -241,7 +214,7 @@ current_model_id = values(current_model_id)parent_models = values(parent_models)
                 state = #{modelDependency.state},
             </if>
         </set>
-        where id = #{id}
+        where id = #{modelDependency.id}
     </update>
 
     <!--通过主键删除-->