From 7f4a845cfefaf715edf02dde0f2a5b1ac3750d29 Mon Sep 17 00:00:00 2001
From: liangdaliang <liangdaliang@wondersoft.cn>
Date: Wed, 5 Mar 2025 15:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=BB=E5=8A=A1=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E7=BC=96=E6=8E=92=E6=8B=96=E6=9B=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TestTaskCaseController.java    | 23 +++---
 .../mapper/test/TestTaskCaseMapper.xml        |  3 +-
 test-ui/src/api/test/taskCase.js              |  9 +++
 .../src/views/test/task/edit/taskDetails.vue  | 75 ++++++++++++++++---
 4 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/test-test/src/main/java/com/test/test/controller/TestTaskCaseController.java b/test-test/src/main/java/com/test/test/controller/TestTaskCaseController.java
index 8d45427..d879d98 100644
--- a/test-test/src/main/java/com/test/test/controller/TestTaskCaseController.java
+++ b/test-test/src/main/java/com/test/test/controller/TestTaskCaseController.java
@@ -3,20 +3,14 @@ package com.test.test.controller;
 import com.test.common.annotation.Log;
 import com.test.common.core.controller.BaseController;
 import com.test.common.core.domain.AjaxResult;
-import com.test.common.core.page.TableDataInfo;
 import com.test.common.enums.BusinessType;
-import com.test.common.utils.DateUtils;
-import com.test.test.domain.TestTask;
 import com.test.test.domain.TestTaskCase;
-import com.test.test.domain.qo.GroupIdQO;
-import com.test.test.domain.qo.IDQO;
 import com.test.test.service.ITestTaskCaseService;
-import com.test.test.service.ITestTaskService;
 import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 定时任务用例关联Controller
@@ -44,4 +38,13 @@ public class TestTaskCaseController extends BaseController {
     public AjaxResult remove(@RequestBody TestTaskCase testTaskCase) {
         return toAjax(testTaskCaseService.deleteTestTaskCase(testTaskCase));
     }
+
+    /**
+     * 更新定时任务用例关联
+     */
+    @Log(title = "更新任务用例关联", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody TestTaskCase testTaskCase) {
+        return toAjax(testTaskCaseService.updateTestTaskCase(testTaskCase));
+    }
 }
diff --git a/test-test/src/main/resources/mapper/test/TestTaskCaseMapper.xml b/test-test/src/main/resources/mapper/test/TestTaskCaseMapper.xml
index b158cac..02a9b91 100644
--- a/test-test/src/main/resources/mapper/test/TestTaskCaseMapper.xml
+++ b/test-test/src/main/resources/mapper/test/TestTaskCaseMapper.xml
@@ -43,10 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTestTaskCase" parameterType="TestTaskCase">
         update test_task_case
         <trim prefix="SET" suffixOverrides=",">
-            <if test="caseId != null">case_id = #{caseId},</if>
             <if test="sort != null">sort = #{sort},</if>
         </trim>
-        where task_id = #{taskId}
+        where task_id = #{taskId} and case_id = #{caseId}
     </update>
 
     <delete id="deleteTestTaskCaseByTaskId" parameterType="Long">
diff --git a/test-ui/src/api/test/taskCase.js b/test-ui/src/api/test/taskCase.js
index 69e218c..809dc6d 100644
--- a/test-ui/src/api/test/taskCase.js
+++ b/test-ui/src/api/test/taskCase.js
@@ -9,6 +9,15 @@ export function addTaskCase(data) {
   })
 }
 
+// 修改用例
+export function updateTaskCase(data) {
+  return request({
+    url: '/test/taskCase/edit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除用例
 export function delTaskCase(data) {
   return request({
diff --git a/test-ui/src/views/test/task/edit/taskDetails.vue b/test-ui/src/views/test/task/edit/taskDetails.vue
index a88def3..08852db 100644
--- a/test-ui/src/views/test/task/edit/taskDetails.vue
+++ b/test-ui/src/views/test/task/edit/taskDetails.vue
@@ -75,17 +75,29 @@
           </el-col>
           <right-toolbar @queryTable="getCaseList"></right-toolbar>
         </el-row>
-        <el-table :data="caseList">
-          <el-table-column label="用例名称" align="center" prop="name"/>
-          <el-table-column label="执行顺序" sortable align="center" prop="sort"/>
-          <el-table-column label="创建人" align="center" prop="createBy"/>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="delCase(scope.row.id)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <!-- 表格头部 -->
+        <div class="table-header">
+          <span>用例名称</span>
+          <span>执行顺序</span>
+          <span>创建人</span>
+          <span>操作</span>
+        </div>
+        <!-- 使用 draggable 控制数据列表 -->
+        <draggable v-model="caseList" @end="onDragEnd">
+          <transition-group>
+            <div v-for="item in caseList" :key="item.id" class="table-row">
+              <!-- 手动构建表格行的内容 -->
+              <span>{{ item.name }}</span>
+              <span>{{ item.sort }}</span>
+              <span>{{ item.createBy }}</span>
+              <span>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="delCase(item.id)">删除</el-button>
+          </span>
+            </div>
+          </transition-group>
+        </draggable>
       </div>
+
     </div>
     <el-dialog :visible.sync="dialogFormVisible" title="添加用例" width="80%">
       <caseTable :caseList="caseList" :taskId="form.id" @success="getCaseList"/>
@@ -100,13 +112,15 @@
 </template>
 
 <script>
+import draggable from "vuedraggable";
 import cronParser from "cron-parser";
 import caseTable from "./caseTable.vue";
-import {delTaskCase} from "@/api/test/taskCase";
+import {delTaskCase, updateTaskCase} from "@/api/test/taskCase";
 
 export default {
   components: {
     caseTable,
+    draggable,
   },
   props: {
     task: {
@@ -197,6 +211,21 @@ export default {
     };
   },
   methods: {
+    // 拖拽结束后更新排序值
+    onDragEnd() {
+      this.updateSortValues();
+    },
+    // 更新每行数据的 sort 值
+    updateSortValues() {
+      this.caseList.forEach((item, index) => {
+        item.sort = index + 1;
+        updateTaskCase({
+          taskId: this.form.id,
+          caseId: item.id,
+          sort: item.sort,
+        })
+      });
+    },
     // 根据crontab表达式更新执行时间
     updateExecutionTimes() {
       const crontab = this.form.crontab.trim();
@@ -262,6 +291,30 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.table-header, .table-row {
+  display: flex;
+  justify-content: space-between;
+  padding: 8px;
+}
+
+.table-header {
+  font-weight: bold;
+  background-color: #f5f7fa;
+  border-bottom: 1px solid #EBEEF5;
+}
+
+.table-row {
+  border-bottom: 1px solid #EBEEF5;
+}
+
+.table-header span, .table-row span {
+  width: 25%;
+  text-align: center;
+}
+
+.drag-handler {
+  cursor: move; /* 改变鼠标手势 */
+}
 .headline {
   color: #4f597f;
   font-size: 14px;