修改

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

@@ -34,10 +34,10 @@
                             <div class="w50"><span th:text="${item.siteName}"></span></div>
                             <div class="w15">
                                 <span th:if="${item.result == '1'}">
-                                    <img src="img/yes-img.png" alt="" />
+                                    <img src="img/yes-img.png" alt=""/>
                                 </span>
                                 <span th:if="${item.result == '2'}">
-                                    <img src="img/no-img.png" alt="" />
+                                    <img src="img/no-img.png" alt=""/>
                                 </span>
                             </div>
                             <div class="w15"><span th:text="${item.censusTime}"></span></div>
@@ -86,62 +86,62 @@
 <!-- 内容End -->
 <script type="text/javascript" src="/js/socket.js"></script>
 <script>
-    socket.onMessageOne = function (res) {
+    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" +
-            "                            <div class=\"w15\"><h5>备注</h5></div>\n" +
-            "                        </li>";
-        for (let i = 0; i < message.length; i++) {
-            let imgSrc = message[i].result == "1" ? 'img/yes-img.png' : 'img/no-img.png';
-            document.getElementById("messageUlOne").innerHTML += "<li>\n" +
-                `                  <div class="w50"><span>${message[i].siteName}</span></div>\n` +
-                `                  <div class="w15">
+        if (10001 == 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=\"w15\"><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++) {
+                let imgSrc = message[i].result == "1" ? 'img/yes-img.png' : 'img/no-img.png';
+                document.getElementById("messageUlOne").innerHTML += "<li>\n" +
+                    `                  <div class="w50"><span>${message[i].siteName}</span></div>\n` +
+                    `                  <div class="w15">
                                         <span>
                                            <img src="${imgSrc}" alt="" />
                                         </span>
                                    </div>\n` +
-                `                  <div class="w15"><span>${message[i].censusTime}</span></div>\n` +
-                `                  <div class="w15"><span>${message[i].remark}</span></div>\n` +
-                `                  <img class="table-triangle-top" src="img/triangle.png"/>\n` +
-                `                  <img class="table-triangle-btm" src="img/triangle.png"/>\n` +
-                `                </li>`
+                    `                  <div class="w15"><span>${message[i].censusTime}</span></div>\n` +
+                    `                  <div class="w15"><span>${message[i].remark}</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.onMessageTwo = 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" +
-            "              <div class=\"w10\"><span>要闻动态</span></div>\n" +
-            "              <div class=\"w10\"><span>空栏目超5个</span></div>\n" +
-            "              <div class=\"w10\"><span>互动回应</span></div>\n" +
-            "              <div class=\"w10\"><span>未更新栏目超10个</span></div>\n" +
-            "              <div class=\"w10\"><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].siteUrl}</span></div>\n` +
-                `              <div class=\"w10\"><span>${message[i].homepageType}</span></div>\n` +
-                `                  <div class=\"w10\"><span>${message[i].trends}</span></div>\n` +
-                `                  <div class=\"w10\"><span>${message[i].columnFive}</span></div>\n` +
-                `                  <div class=\"w10\"><span>${message[i].interactiveResponse}</span></div>\n` +
-                `                  <div class=\"w10\"><span>${message[i].columnTen}</span></div>\n` +
-                `                  <div class=\"w10\"><span>${message[i].notice}</span></div>\n` +
-                `                  <div class=\"w10\"><span>${message[i].monitorTime}</span></div>\n` +
-                `                </li>`
+        if (10002 == JSON.parse(res).code) {
+            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" +
+                "              <div class=\"w10\"><span>要闻动态</span></div>\n" +
+                "              <div class=\"w10\"><span>空栏目超5个</span></div>\n" +
+                "              <div class=\"w10\"><span>互动回应</span></div>\n" +
+                "              <div class=\"w10\"><span>未更新栏目超10个</span></div>\n" +
+                "              <div class=\"w10\"><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].siteUrl}</span></div>\n` +
+                    `              <div class=\"w10\"><span>${message[i].homepageType}</span></div>\n` +
+                    `                  <div class=\"w10\"><span>${message[i].trends}</span></div>\n` +
+                    `                  <div class=\"w10\"><span>${message[i].columnFive}</span></div>\n` +
+                    `                  <div class=\"w10\"><span>${message[i].interactiveResponse}</span></div>\n` +
+                    `                  <div class=\"w10\"><span>${message[i].columnTen}</span></div>\n` +
+                    `                  <div class=\"w10\"><span>${message[i].notice}</span></div>\n` +
+                    `                  <div class=\"w10\"><span>${message[i].monitorTime}</span></div>\n` +
+                    `                </li>`
+            }
         }
     };
-
 </script>
 </body>
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CensusElementsServiceImpl.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.CensusElements;
 import com.ruoyi.system.domain.ColumnPageView;
 import com.ruoyi.system.mapper.CensusElementsMapper;
@@ -36,6 +37,6 @@ public class CensusElementsServiceImpl implements ICensusElementsService {
             censusElementsMapper.deleteCensusElementsAll();
         }
         censusElementsMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_ONE,list)));
     }
 }

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

@@ -34,6 +34,6 @@ public class CensusItemNegativeInformationServiceImpl implements ICensusItemNega
             censusItemNegativeInformationMapper.deleteCensusItemNegativeInformationAll();
         }
         censusItemNegativeInformationMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_TWO,list)));
     }
 }