11

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

@@ -229,12 +229,16 @@ public class SysIndexController extends BaseController {
         return modelAndView;
     }
 
-    //网站普查指标监测
+    //市政府网站访问情况监测
     @GetMapping("/websiteAccess")
     public Object websiteAccess(ModelMap mmap) {
-
+        ModelAndView modelAndView = new ModelAndView("websiteAccess.html");
+        modelAndView.addObject("dataSourceOne",webSiteTenDaysHitsService.selectWebSiteTenDaysHitsList());
+        modelAndView.addObject("dataSourceTwo",visitingWebsiteRankingService.selectVisitingWebsiteRankingList());
+        modelAndView.addObject("dataSourceThree",columnPageViewService.selectColumnPageViewList());
+        modelAndView.addObject("dataSourceFour",popularInformationService.selectPopularInformationList());
         mmap.put("version", RuoYiConfig.getVersion());
-        return "websiteAccess";
+        return modelAndView;
     }
 
     public String contentMainClass(Boolean footer, Boolean tagsView) {

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

@@ -22,95 +22,34 @@
         <div class="content-list flex-row" style="top: 0; flex-wrap: wrap">
           <!-- 网站普查要素 -->
           <div class="content-list-left w40 flex-col">
-            <div
-              class="content-list-body height-41"
-              style="width: auto; padding: 0"
-            >
+            <div class="content-list-body height-41" style="width: auto; padding: 0">
               <div class="fw-tit"><span>市政府网站十日内点击量</span></div>
-              <div
-                id="chart-panel"
-                style="width: 100%; height: 33vh; margin-top: 10px"
-              ></div>
+              <div id="chart-panel" style="width: 100%; height: 33vh; margin-top: 10px"></div>
             </div>
           </div>
           <div class="content-list-left w50 flex-col">
-            <div
-              class="content-list-body height-41"
-              style="width: auto; padding: 0"
-            >
+            <div class="content-list-body height-41" style="width: auto; padding: 0" >
               <div class="fw-tit">
                 <span>全国各省访问吉林市政府网站排名</span>
               </div>
-              <div
-                id="chart-panel2"
-                style="width: 100%; height: 33vh; margin-top: 10px"
-              ></div>
+              <div id="chart-panel2" style="width: 100%; height: 33vh; margin-top: 10px" th:text="${dataSourceTwo}"></div>
             </div>
           </div>
           <div class="content-list-left w40 flex-col m-t-20">
-            <div
-              class="content-list-body height-41"
-              style="width: auto; padding: 0"
-            >
+            <div class="content-list-body height-41" style="width: auto; padding: 0">
               <div class="fw-tit"><span>门户网站栏目浏览量排名</span></div>
-              <div
-                id="chart-panel3"
-                style="width: 100%; height: 34vh; margin-top: 10px"
-              ></div>
+              <div id="chart-panel3" style="width: 100%; height: 34vh; margin-top: 10px"></div>
             </div>
           </div>
           <div class="content-list-left w50 flex-col m-t-20 ">
-            <div
-              class="content-list-body  height-41"
-              style="width: auto; padding: 0;overflow: hidden;"
-            >
+            <div class="content-list-body  height-41" style="width: auto; padding: 0;overflow: hidden;">
               <div class="fw-tit"><span>每日最受欢迎信息排名</span></div>
-              <div class="day-list" style="height: 26vh; overflow-y: scroll;">
-                 <div class="day-list-con flex-row">
-                   <div class="list-index">1</div>
-                   <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                   <div class="list-click-num">567</div>
+              <div id="messageUlFour" class="day-list" style="height: 26vh; overflow-y: scroll;">
+                 <div class="day-list-con flex-row" th:each="item : ${dataSourceFour}">
+                   <div class="list-index" th:text="${item.popularRanking}"></div>
+                   <div class="list-text" th:text="${item.informationName}"></div>
+                   <div class="list-click-num" th:text="${item.popularBrowse}"></div>
                  </div>
-                 <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
-                <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
-                <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
-                <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
-                <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
-                <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
-                <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
-                <div class="day-list-con flex-row">
-                  <div class="list-index">1</div>
-                  <div class="list-text">磐石市委书记于技群调研疫情防控、项目建设、秸秆焚烧、村级集体经济</div>
-                  <div class="list-click-num">567</div>
-                </div>
               </div>
             </div>
           </div>
@@ -119,7 +58,7 @@
       <!-- 正文 End -->
     </div>
     <!-- 内容End -->
-
+    <script type="text/javascript" src="/js/socket.js"></script>
     <!-- echarts1 -->
     <script type="text/javascript">
       // 基于准备好的dom，初始化echarts实例
@@ -341,6 +280,7 @@
     <script type="text/javascript">
       // 基于准备好的dom，初始化echarts实例
       var myChart = echarts.init(document.getElementById("chart-panel2"));
+      console.log("dataSourceTwo",document.getElementById("chart-panel2").innerText)
       var data1 = [
         "50",
         "60",
@@ -709,5 +649,23 @@
         myChart.setOption(option);
       }
     </script>
+
+    <script>
+      socket.onMessage = function (res) {
+        let message = []
+        if (10019 == JSON.parse(res).code) {
+          message = JSON.parse(res).data
+          // 处理接收到的消息
+          document.getElementById("messageUlFour").innerHTML = "";
+          for (let i = 0; i < message.length; i++) {
+            document.getElementById("messageUlFour").innerHTML += "<div class=\"day-list-con flex-row\">\n" +
+                    `                  <div class="list-index">${message[i].popularRanking}</div>\n` +
+                    `                  <div class="list-text">${message[i].informationName}</div>\n` +
+                    `                  <div class="list-click-num">${message[i].popularBrowse}</div>\n` +
+                    `                  </div>`
+          }
+        }
+      };
+    </script>
   </body>
 </html>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -61,8 +61,9 @@ public class AjaxResult extends HashMap<String, Object> {
         TYPE_FOURTEEN(10014),
         TYPE_FIFTEEN(10015),
         TYPE_SIXTEEN(10016),
-        TYP_SEVENTEEN(10017),
-        TYPE_EIGHTEEN(10018);
+        TYPE_SEVENTEEN(10017),
+        TYPE_EIGHTEEN(10018),
+        TYPE_NINETEEN(10019);
 
         private final int value;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ColumnPageViewServiceImpl.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.ColumnPageView;
 import com.ruoyi.system.domain.WebSiteTenDaysHits;
 import com.ruoyi.system.mapper.ColumnPageViewMapper;
@@ -36,6 +37,6 @@ public class ColumnPageViewServiceImpl implements IColumnPageViewService {
             columnPageViewMapper.deleteColumnPageViewAll();
         }
         columnPageViewMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_EIGHTEEN,list)));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PopularInformationServiceImpl.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.MunicipalMisprint;
 import com.ruoyi.system.domain.PopularInformation;
 import com.ruoyi.system.mapper.MunicipalMisprintMapper;
@@ -36,6 +37,6 @@ public class PopularInformationServiceImpl implements IPopularInformationService
             popularInformationMapper.deletePopularInformationAll();
         }
         popularInformationMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_NINETEEN,list)));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VisitingWebsiteRankingServiceImpl.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.VisitingWebsiteRanking;
 import com.ruoyi.system.domain.WebSiteTenDaysHits;
@@ -59,6 +60,6 @@ public class VisitingWebsiteRankingServiceImpl implements IVisitingWebsiteRankin
             saveList.add(visitingWebsiteRanking);
         }
         visitingWebsiteRankingMapper.insertBatch(saveList);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(dto)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_SEVENTEEN,dto)));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WebSiteTenDaysHitsServiceImpl.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.VisitingWebsiteRanking;
 import com.ruoyi.system.domain.WebSiteTenDaysHits;
 import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
@@ -59,6 +60,6 @@ public class WebSiteTenDaysHitsServiceImpl implements IWebSiteTenDaysHitsService
             saveList.add(webSiteTenDaysHits);
         }
         webSiteTenDaysHitsMapper.insertBatch(saveList);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(dto)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(AjaxResult.Type.TYPE_SIXTEEN,dto)));
     }
 }