From bb4c812c17bd891b559859277fdcd123cd07ef9a Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Sat, 15 Jan 2022 11:51:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A2=84=E8=AD=A6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=B8=85=E7=A9=BA=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/business/warning/apiwarning.js    |  9 ++++++++
 ruoyi-ui/src/layout/components/Navbar.vue     |  4 ++--
 ruoyi-ui/src/utils/socket-server.js           |  2 +-
 .../business/warning/apiwarning/index.vue     | 21 ++++++++++++++++++-
 .../xjs/controller/ApiWarningController.java  | 10 +++++++++
 .../java/com/xjs/mapper/ApiWarningMapper.java |  7 +++++++
 .../java/com/xjs/server/WebSocketServer.java  |  2 +-
 .../com/xjs/service/ApiWarningService.java    |  6 ++++++
 .../service/impl/ApiWarningServiceImpl.java   |  7 +++++++
 ...iEnglishMapper.xml => ApiRecordMapper.xml} |  0
 .../mapper/apiwarning/ApiWarningMapper.xml    | 13 ++++++++++++
 11 files changed, 76 insertions(+), 5 deletions(-)
 rename xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/{ApiEnglishMapper.xml => ApiRecordMapper.xml} (100%)
 create mode 100644 xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiWarningMapper.xml

diff --git a/ruoyi-ui/src/api/business/warning/apiwarning.js b/ruoyi-ui/src/api/business/warning/apiwarning.js
index ec53fdfe..d8ee9597 100644
--- a/ruoyi-ui/src/api/business/warning/apiwarning.js
+++ b/ruoyi-ui/src/api/business/warning/apiwarning.js
@@ -43,3 +43,12 @@ export function handleWarning(id) {
     method: 'put',
   })
 }
+
+
+// 清空预警记录信息
+export function clearAll() {
+  return request({
+    url: '/warning/apiwarning/all',
+    method: 'delete',
+  })
+}
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 52fbb9b3..de5ec376 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -10,7 +10,7 @@
     <div class="right-menu">
 
       <el-badge :value="warnData.count" class=" hover-effect share-button" v-hasPermi="['warning:warning:handle']">
-        <el-popover v-hasPermi="['warning:warning:handle']"
+        <el-popover
           placement="bottom"
           width="220"
           v-model="visible">
@@ -153,7 +153,7 @@ export default {
         var json = eval("(" + str + ")");
         if (json.apiName !== undefined && json.warningMessage !== undefined) {
           let data = json.apiName + "-" + json.warningMessage;
-          this.visible = true
+          // this.visible = true
           return data
         }
       }
diff --git a/ruoyi-ui/src/utils/socket-server.js b/ruoyi-ui/src/utils/socket-server.js
index 2af4148a..432f21a2 100644
--- a/ruoyi-ui/src/utils/socket-server.js
+++ b/ruoyi-ui/src/utils/socket-server.js
@@ -39,7 +39,7 @@ export default class SocketService {
       return console.log("您的浏览器不支持WebSocket");
     }
     //网关转发
-    let wsUrl = 'ws://localhost:8080/warning/warning/api';
+    let wsUrl = 'ws://localhost:8080/warning/webSocket/warning/api';
     wsUrl += `/${store.getters.name}`
     this.ws = new WebSocket(wsUrl)
 
diff --git a/ruoyi-ui/src/views/business/warning/apiwarning/index.vue b/ruoyi-ui/src/views/business/warning/apiwarning/index.vue
index 081d4c47..87be68f0 100644
--- a/ruoyi-ui/src/views/business/warning/apiwarning/index.vue
+++ b/ruoyi-ui/src/views/business/warning/apiwarning/index.vue
@@ -28,6 +28,17 @@
         >导出
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-delete-solid"
+          size="mini"
+          @click="clearAll"
+          v-hasPermi="['warning:warning:remove']"
+        >清空
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -73,7 +84,7 @@
 </template>
 
 <script>
-import {listApiwarning} from "@/api/business/warning/apiwarning";
+import {listApiwarning,clearAll } from "@/api/business/warning/apiwarning";
 
 export default {
   name: "Warning",
@@ -113,6 +124,14 @@ export default {
     this.getList();
   },
   methods: {
+    //清空预警信息
+    clearAll() {
+      clearAll().then(res =>{
+        this.$modal.msgSuccess("清空"+res.data+"条");
+        this.getList();
+      })
+    },
+
     /** 查询api预警列表 */
     getList() {
       this.loading = true;
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/controller/ApiWarningController.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/controller/ApiWarningController.java
index febcb5bd..efe3a572 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/controller/ApiWarningController.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/controller/ApiWarningController.java
@@ -167,6 +167,16 @@ public class ApiWarningController extends BaseController {
         util.exportExcel(response, list, "api预警数据");
     }
 
+    @RequiresPermissions("warning:warning:remove")
+    @Log(title = "api预警", businessType = BusinessType.DELETE)
+    @DeleteMapping("all")
+    @ApiOperation("清空已处理api预警列表")
+    public R<Object> clearAll() {
+        Integer integer = apiWarningService.clearAll();
+        return integer > 0 ? R.ok(integer) : R.fail();
+    }
+
+
 
     //-------------------------代码生成------------------------------------
 
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/mapper/ApiWarningMapper.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/mapper/ApiWarningMapper.java
index 89f95019..580ac909 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/mapper/ApiWarningMapper.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/mapper/ApiWarningMapper.java
@@ -10,4 +10,11 @@ import com.xjs.domain.ApiWarning;
  */
 
 public interface ApiWarningMapper extends BaseMapper<ApiWarning> {
+
+
+    /**
+     * 清空所有已处理
+     * @return Integer
+     */
+    Integer clearAll();
 }
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/WebSocketServer.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/WebSocketServer.java
index efc47439..1f38b0cd 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/WebSocketServer.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/WebSocketServer.java
@@ -28,7 +28,7 @@ import static com.xjs.consts.RedisConst.WEBSOCKET;
  * @since 2022-01-13
  */
 @Log4j2
-@ServerEndpoint("/warning/api/{userId}")
+@ServerEndpoint("/webSocket/warning/api/{userId}")
 @Component
 public class WebSocketServer {
     /**
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/ApiWarningService.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/ApiWarningService.java
index a83dac18..e44e25ae 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/ApiWarningService.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/ApiWarningService.java
@@ -38,6 +38,12 @@ public interface ApiWarningService extends IService<ApiWarning> {
      */
     List<ApiRecord> selectApiRecordListByUrl(ApiRecord apiRecord);
 
+    /**
+     * 清空已处理预警信息数据
+     * @return int
+     */
+    Integer clearAll();
+
     //---------------------代码生成---------------------------------
 
     /**
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java
index 9e466999..7184913e 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java
@@ -24,6 +24,8 @@ public class ApiWarningServiceImpl extends ServiceImpl<ApiWarningMapper, ApiWarn
 
     @Resource
     private ApiRecordMapper apiRecordMapper;
+    @Resource
+    private ApiWarningMapper apiWarningMapper;
 
     @Override
     public Boolean saveApiRecord(ApiRecord apiRecord) {
@@ -52,6 +54,11 @@ public class ApiWarningServiceImpl extends ServiceImpl<ApiWarningMapper, ApiWarn
                         .eq("api_name", apiRecord.getApiName()));
     }
 
+    @Override
+    public Integer clearAll() {
+        return apiWarningMapper.clearAll();
+    }
+
 
     //------------------------代码生成-------------------------------
 
diff --git a/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiEnglishMapper.xml b/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiRecordMapper.xml
similarity index 100%
rename from xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiEnglishMapper.xml
rename to xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiRecordMapper.xml
diff --git a/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiWarningMapper.xml b/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiWarningMapper.xml
new file mode 100644
index 00000000..d0ad46fc
--- /dev/null
+++ b/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiWarningMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjs.mapper.ApiWarningMapper">
+
+
+    <delete id="clearAll">
+        delete
+        from api_warning
+        where handle = 1
+    </delete>
+</mapper>
\ No newline at end of file