From 1d999710bb877e4f0f094313a53bf6c0181b564a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
 <806783409@qq.com>
Date: Sat, 23 Oct 2021 23:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SwaggerDocumentController.java | 14 +++++++++++++-
 .../swagger-ui/src/views/doc/DocManage.vue    | 19 ++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java
index 76cd5cfd..4051c66c 100644
--- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java
+++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java
@@ -108,7 +108,19 @@ public class SwaggerDocumentController {
 	@ResponseBody
 	@PostMapping(value = "/update")
 	public ResponseJson<List<SwaggerDoc>> update(SwaggerDoc swaggerDoc) {
-		swaggerDocService.saveOrUpdate(swaggerDoc);
+		if (swaggerDoc.getId() == null) {
+			return DocResponseJson.warn("请指定修改的记录ID");
+		}
+		SwaggerDoc swaggerDocUp = new SwaggerDoc();
+		swaggerDocUp.setId(swaggerDoc.getId());
+		swaggerDocUp.setDocStatus(swaggerDoc.getDocStatus());
+		swaggerDocUp.setDocUrl(swaggerDoc.getDocUrl());
+		swaggerDocUp.setJsonContent(swaggerDoc.getJsonContent());
+		swaggerDocUp.setName(swaggerDoc.getName());
+		swaggerDocUp.setOpenVisit(swaggerDoc.getOpenVisit());
+		swaggerDocUp.setRewriteDomain(swaggerDoc.getRewriteDomain());
+		swaggerDocUp.setYn(swaggerDoc.getYn());
+		swaggerDocService.updateById(swaggerDocUp);
 		return DocResponseJson.ok();
 	}
 	
diff --git a/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue b/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue
index 30540fc0..b8cedd5f 100644
--- a/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue
+++ b/zyplayer-doc-ui/swagger-ui/src/views/doc/DocManage.vue
@@ -30,10 +30,10 @@
         <a-table :dataSource="docList" :columns="docListColumns" size="middle"
                  :loading="docListLoading"
                  :scroll="{ x: 1200, y: 'calc(100vh - 340px)' }">
-            <template #bodyCell="{ column, text, row }">
+            <template #bodyCell="{ column, text, record }">
                 <template v-if="column.dataIndex === 'operation'">
                     <a-button type="link">编辑</a-button>
-                    <a-button type="link" danger @click="updateDocStatus(row)">删除</a-button>
+                    <a-button type="link" danger @click="deleteDoc(record)">删除</a-button>
                 </template>
                 <template v-if="column.dataIndex === 'docType'">
                     <a-tag color="red" v-if="text === 1">URL添加</a-tag>
@@ -98,7 +98,7 @@
                     setTimeout(() => docListLoading.value = false, 500);
                     docList.value = res.data || [];
                 });
-            }
+            };
             let docEdit = ref({});
             let newDocFormRef = ref();
             let newDocVisible = ref(false);
@@ -111,18 +111,19 @@
                 }).catch(error => {
                     console.log('error', error);
                 });
-            }
+            };
             const openNewDoc = async () => {
                 newDocVisible.value = true;
                 docEdit.value = {
                     docType: 1, openVisit: 0, docStatus: 1,
                 };
-            }
-            const updateDocStatus = async (row) => {
-                zyplayerApi.swaggerDocUpdate({docStatus: 1}).then(res => {
+            };
+            const updateDoc = async (id, docStatus, yn) => {
+                zyplayerApi.swaggerDocUpdate({id, docStatus, yn}).then(res => {
                     searchDocList();
                 });
-            }
+            };
+            const deleteDoc = async (row) => updateDoc(row.id, null, 0);
             onMounted(() => {
                 searchDocList();
             });
@@ -136,7 +137,7 @@
                 searchDocList,
                 openNewDoc,
                 handleNewDocOk,
-                updateDocStatus,
+                deleteDoc,
                 newDocRules: {
                     name: [{required: true, message: '请输入文档名称', trigger: 'change'}],
                     docUrl: [{required: true, message: '请输入文档地址', trigger: 'change'}],