bihuisong 1 рік тому
батько
коміт
5c59def3b5

+ 4 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CountyDailyTrafficRankingServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.system.domain.CountyDailyTrafficRanking;
+import com.ruoyi.system.domain.DailyTrafficRanking;
 import com.ruoyi.system.domain.DailyUpdateRanking;
 import com.ruoyi.system.mapper.CountyDailyTrafficRankingMapper;
 import com.ruoyi.system.mapper.DailyUpdateRankingMapper;
@@ -12,7 +13,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 +39,6 @@ public class CountyDailyTrafficRankingServiceImpl implements ICountyDailyTraffic
             countyDailyTrafficRankingMapper.deleteCountyDailyTrafficRankingAll();
         }
         countyDailyTrafficRankingMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list.stream().sorted(Comparator.comparing(CountyDailyTrafficRanking::getRanking)).collect(Collectors.toList()))));
     }
 }

+ 3 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DailyTrafficRankingServiceImpl.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 DailyTrafficRankingServiceImpl implements IDailyTrafficRankingServi
             dailyTrafficRankingMapper.deleteDailyTrafficRankingAll();
         }
         dailyTrafficRankingMapper.insertBatch(list);
-        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list)));
+        WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(success(list.stream().sorted(Comparator.comparing(DailyTrafficRanking::getRanking)).collect(Collectors.toList()))));
     }
 }

+ 1 - 0
ruoyi-system/src/main/resources/mapper/system/CountyDailyTrafficRankingMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCountyDailyTrafficRankingList" parameterType="CountyDailyTrafficRanking" resultMap="CountyDailyTrafficRankingResult">
         <include refid="selectCountyDailyTrafficRankingVo"/>
+        order by ranking asc
     </select>
 
 	<delete id="deleteCountyDailyTrafficRankingAll" parameterType="Long">

+ 1 - 0
ruoyi-system/src/main/resources/mapper/system/DailyTrafficRankingMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDailyTrafficRankingList" parameterType="DailyTrafficRanking" resultMap="DailyTrafficRankingResult">
         <include refid="selectDailyTrafficRankingVo"/>
+        order by ranking asc
     </select>
 
 	<delete id="deleteDailyTrafficRankingAll" parameterType="Long">