吉林市政府网站可用性实时监测

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -223,8 +223,8 @@ public class SysIndexController extends BaseController {
     @GetMapping("/usability")
     public Object usability(ModelMap mmap) {
         ModelAndView modelAndView = new ModelAndView("usability.html");
-        modelAndView.addObject("dataSource",websiteAvailabilityMonitorService.selectWebsiteAvailabilityMonitorList());
-        modelAndView.addObject("dataAccess",unableToAccessWebsiteListTodayService.selectUnableToAccessWebsiteListTodayList());
+        modelAndView.addObject("dataSourceOne",websiteAvailabilityMonitorService.selectWebsiteAvailabilityMonitorList());
+        modelAndView.addObject("dataSourceTwo",unableToAccessWebsiteListTodayService.selectUnableToAccessWebsiteListTodayList());
         mmap.put("version", RuoYiConfig.getVersion());
         return modelAndView;
     }

ruoyi-admin/src/main/resources/templates/usability.html

@@ -46,9 +46,9 @@
                     <div class="w25"><h5>监测时间</h5></div>
                     <div class="w25"><h5>网站状态</h5></div>
                   </li>
-                  <li th:each="item : ${dataSource}">
+                  <li th:each="item : ${dataSourceOne}">
                       <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
-                    <div class="w25"><span class="h-span" th:text="${item.monitorTime}"></span></div>
+                      <div class="w25"><span class="h-span" th:text="${item.monitorTime}"></span></div>
                       <div class="w25"><span class="h-span" th:text="${item.status}"></span></div>
                       <img class="table-triangle-top" src="img/triangle.png">
                       <img class="table-triangle-btm" src="img/triangle.png">
@@ -65,10 +65,10 @@
                     <div class="w25"><h5>最近一次检测时间</h5></div>
                     <div class="w25"><h5>本日无法访问次数</h5></div>
                   </li>
-                    <li th:each="item : ${dataAccess}">
+                    <li th:each="item : ${dataSourceTwo}">
                         <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
-                        <div class="w25"><span class="h-span" th:text="${item.accessCountFail}"></span></div>
                         <div class="w25"><span class="h-span" th:text="${item.lastMonitorTime}"></span></div>
+                        <div class="w25"><span class="h-span" th:text="${item.accessCountFail}"></span></div>
                         <img class="table-triangle-top" src="img/triangle.png">
                         <img class="table-triangle-btm" src="img/triangle.png">
                     </li>
@@ -85,38 +85,41 @@
     <script>
         socket.onMessage = function (res) {
             let message = []
-            message = JSON.parse(res).data
-            // 处理接收到的消息
-            document.getElementById("messageUlOne").innerHTML = "<li class=\"content-list-body-tit\">\n" +
-                "                            <div class=\"w50\"><h5>站点名称</h5></div>\n" +
-                "                            <div class=\"w15\"><h5>监测时间</h5></div>\n" +
-                "                            <div class=\"w15\"><h5>网站状态</h5></div>\n" +
-                "                        </li>";
-            for (let i = 0; i < message.length; i++) {
-                document.getElementById("messageUlOne").innerHTML += "<li>\n" +
-                    `                  <div class="w50"><span>${message[i].siteName}</span></div>\n` +
-                    `                  <div class="w15"><span>${message[i].monitorTime}</span></div>\n` +
-                    `                  <div class="w15"><span>${message[i].status}</span></div>\n` +
-                    `                  <img class="table-triangle-top" src="img/triangle.png"/>\n` +
-                    `                  <img class="table-triangle-btm" src="img/triangle.png"/>\n` +
-                    `                </li>`
+            if (10014 == JSON.parse(res).code) {
+                message = JSON.parse(res).data
+                // 处理接收到的消息
+                document.getElementById("messageUlOne").innerHTML = "<li class=\"content-list-body-tit\">\n" +
+                    "                            <div class=\"w50\"><h5>站点名称</h5></div>\n" +
+                    "                            <div class=\"w25\"><h5>监测时间</h5></div>\n" +
+                    "                            <div class=\"w25\"><h5>网站状态</h5></div>\n" +
+                    "                        </li>";
+                for (let i = 0; i < message.length; i++) {
+                    document.getElementById("messageUlOne").innerHTML += "<li>\n" +
+                        `                  <div class="w50"><span>${message[i].siteName}</span></div>\n` +
+                        `                  <div class="w15"><span>${message[i].monitorTime}</span></div>\n` +
+                        `                  <div class="w15"><span>${message[i].status}</span></div>\n` +
+                        `                  <img class="table-triangle-top" src="img/triangle.png"/>\n` +
+                        `                  <img class="table-triangle-btm" src="img/triangle.png"/>\n` +
+                        `                </li>`
+                }
             }
-        };
-        socket.onMessage1 = function (res) {
-            let message = []
-            message = JSON.parse(res).data
-            // 处理接收到的消息
-            document.getElementById("messageUlTwo").innerHTML = "<li class=\"content-list-body-tit\">\n" +
-                "              <div class=\"w20\"><h5>站点名称</h5></div>\n" +
-                "              <div class=\"w10 j-left\"><span>最近一次检测时间</span></div>\n" +
-                "              <div class=\"w10\"><span>本日无法访问次数</span></div>\n" +
-                "            </li";
-            for (let i = 0; i < message.length; i++) {
-                document.getElementById("messageUlTwo").innerHTML += "<li>\n" +
-                    `                  <div class=\"w20\"><span>${message[i].siteName}</span></div>\n` +
-                    `                  <div class=\"w10 j-left\"><span>${message[i].accessCountFail}</span></div>\n` +
-                    `                  <div class=\"w10\"><span>${message[i].lastMonitorTime}</span></div>\n` +
-                    `                </li>`
+            if (10015 == JSON.parse(res).code) {
+                message = JSON.parse(res).data
+                // 处理接收到的消息
+                document.getElementById("messageUlTwo").innerHTML = "<li class=\"content-list-body-tit\">\n" +
+                    "              <div class=\"w50\"><h5>站点名称</h5></div>\n" +
+                    "              <div class=\"w25\"><h5>最近一次检测时间</h5></div>\n" +
+                    "              <div class=\"w25\"><h5>本日无法访问次数</h5></div>\n" +
+                    "            </li";
+                for (let i = 0; i < message.length; i++) {
+                    document.getElementById("messageUlTwo").innerHTML += "<li>\n" +
+                        `                  <div class=\"w20\"><span>${message[i].siteName}</span></div>\n` +
+                        `                  <div class=\"w10\"><span>${message[i].lastMonitorTime}</span></div>\n` +
+                        `                  <div class=\"w10 j-left\"><span>${message[i].accessCountFail}</span></div>\n` +
+                        `                  <img class="table-triangle-top" src="img/triangle.png">\n` +
+                        `                  <img class="table-triangle-btm" src="img/triangle.png">\n` +
+                        `                </li>`
+                }
             }
         };
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnableToAccessWebsiteListTodayImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
 import com.ruoyi.system.domain.WebSiteTenDaysHits;
 import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
@@ -17,6 +18,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
 
 @Service
 public class UnableToAccessWebsiteListTodayImpl implements IUnableToAccessWebsiteListTodayService {
@@ -37,6 +40,6 @@ public class UnableToAccessWebsiteListTodayImpl implements IUnableToAccessWebsit
             unableToAccessWebsiteListTodayMapper.deleteUnableToAccessWebsiteListTodayAll();
         }
         unableToAccessWebsiteListTodayMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(list));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_FIFTEEN,list)));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WebsiteAvailabilityMonitorServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
 import com.ruoyi.system.mapper.WebsiteAvailabilityMonitorMapper;
 import com.ruoyi.system.service.IWebsiteAvailabilityMonitorService;
@@ -38,7 +39,7 @@ public class WebsiteAvailabilityMonitorServiceImpl implements IWebsiteAvailabili
             websiteAvailabilityMonitorMapper.deleteWebsiteAvailabilityMonitorAll();
         }
         websiteAvailabilityMonitorMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_FOURTEEN,list)));
     }
 
 }