日更新量排行

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

@@ -176,11 +176,12 @@ public class SysIndexController extends BaseController {
 
     //日更新量排行
     @GetMapping("/dailyUpdateVolume")
-    public String dailyUpdateVolume(ModelMap mmap) {
+    public Object dailyUpdateVolume(ModelMap mmap) {
         ModelAndView modelAndView = new ModelAndView("dailyUpdateVolume.html");
-        modelAndView.addObject("dataSourceOne",censusElementsService.selectCensusElementsList());
+        modelAndView.addObject("dataSourceOne",dailyUpdateRankingService.selectDailyUpdateRankingList());
+        modelAndView.addObject("dataSourceTwo",countyDailyUpdateRankingService.selectCountyDailyUpdateRankingList());
         mmap.put("version", RuoYiConfig.getVersion());
-        return "dailyUpdateVolume";
+        return modelAndView;
     }
 
     //日访问量

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

@@ -30,37 +30,23 @@
               <div class="tab_con">
               <div class="content-list-body m-t-10 height-72 dis-none no-bg" style="width: auto; display: block;">
                 <div class="bd">
-                  <ul class="infoList">
-                    <li><div class="paihang">1</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">2</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">3</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">4</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">5</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">6</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">7</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">8</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">9</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">10</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">11</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">12</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
+                  <ul class="infoList" id="messageUlOne">
+                    <li th:each="item : ${dataSourceOne}">
+                        <div class="paihang" th:text="${item.ranking}"></div>
+                        <div class="gov-name" th:text="${item.renewName}"></div>
+                        <div class="click-num" th:text="${item.renewCount}"><span class="font-small-size">条</span></div>
+                    </li>
                   </ul>
                 </div>
               </div>
               <div class="content-list-body m-t-10 height-72 dis-none no-bg" style="width: auto; display: block;">
                 <div class="bd">
-                  <ul class="infoList">
-                    <li><div class="paihang">1</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">2</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">3</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">4</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">5</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">6</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">7</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">8</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">9</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">10</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">11</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
-                    <li><div class="paihang">12</div><div class="gov-name">蛟河市人民政府</div><div class="click-num">7<span class="font-small-size">条</span></div></li>
+                  <ul class="infoList" id="messageUlTwo">
+                    <li th:each="item : ${dataSourceTwo}">
+                        <div class="paihang" th:text="${item.ranking}"></div>
+                        <div class="gov-name" th:text="${item.renewName}"></div>
+                        <div class="click-num" th:text="${item.renewCount}"><span class="font-small-size">条</span></div>
+                    </li>
                   </ul>
                 </div>
               </div>
@@ -71,6 +57,7 @@
        <!-- 正文 End -->
     </div>
     <!-- 内容End -->
+    <script type="text/javascript" src="/js/socket.js"></script>
     <script>
       $(".tab-title h4").click(function () {
         // 获得点击li的索引号
@@ -80,6 +67,34 @@
           // 第index位的div显示，其他div隐藏
           $(".tab_con .dis-none").eq(index).show().siblings().hide();
       });
+
+      socket.onMessage = function (res) {
+          let message = []
+          message = JSON.parse(res).data
+          // 处理接收到的消息
+          document.getElementById("messageUlOne").innerHTML = "";
+          for (let i = 0; i < message.length; i++) {
+              document.getElementById("messageUlOne").innerHTML += "<li>\n" +
+                  `                  <div class="paihang">${message[i].ranking}</div>\n` +
+                  `                  <div class="gov-name">${message[i].renewName}</div>\n` +
+                  `                  <div class="click-num">${message[i].renewCount}<span class="font-small-size">条</span></div>\n` +
+                  `                </li>`
+          }
+      };
+
+      socket.onMessage = function (res) {
+          let message = []
+          message = JSON.parse(res).data
+          // 处理接收到的消息
+          document.getElementById("messageUlTwo").innerHTML = "";
+          for (let i = 0; i < message.length; i++) {
+              document.getElementById("messageUlTwo").innerHTML += "<li>\n" +
+                  `                  <div class="paihang">${message[i].ranking}</div>\n` +
+                  `                  <div class="gov-name">${message[i].renewName}</div>\n` +
+                  `                  <div class="click-num">${message[i].renewCount}<span class="font-small-size">条</span></div>\n` +
+                  `                </li>`
+          }
+      };
   </script>
 </body>
 </html>

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

@@ -12,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.core.domain.AjaxResult.success;
 
@@ -36,6 +38,6 @@ public class CountyDailyUpdateRankingServiceImpl implements ICountyDailyUpdateRa
             countyDailyUpdateRankingMapper.deleteCountyDailyUpdateRankingAll();
         }
         countyDailyUpdateRankingMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list.stream().sorted(Comparator.comparing(CountyDailyUpdateRanking::getRanking)).collect(Collectors.toList()))));
     }
 }

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

@@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.core.domain.AjaxResult.success;
 
@@ -33,6 +35,6 @@ public class DailyUpdateRankingServiceImpl implements IDailyUpdateRankingService
             dailyUpdateRankingMapper.deleteDailyUpdateRankingAll();
         }
         dailyUpdateRankingMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list.stream().sorted(Comparator.comparing(DailyUpdateRanking::getRanking)).collect(Collectors.toList()))));
     }
 }

ruoyi-system/src/main/resources/mapper/system/CountyDailyUpdateRankingMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCountyDailyUpdateRankingList" parameterType="CountyDailyUpdateRanking" resultMap="CountyDailyUpdateRankingResult">
         <include refid="selectCountyDailyUpdateRankingVo"/>
+        order by ranking asc
     </select>
 
 	<delete id="deleteCountyDailyUpdateRankingAll" parameterType="Long">

ruoyi-system/src/main/resources/mapper/system/DailyUpdateRankingMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDailyUpdateRankingList" parameterType="DailyUpdateRanking" resultMap="DailyUpdateRankingResult">
         <include refid="selectDailyUpdateRankingVo"/>
+        order by ranking asc
     </select>
 
 	<delete id="deleteDailyUpdateRankingAll" parameterType="Long">