sql

src/main/java/thyyxxk/webserver/dao/his/socketmessage/SocketMessageDao.java

@@ -62,31 +62,17 @@ public interface SocketMessageDao {
             "    UnreadCounts uc ON uc.sender = a.sender;")
     List<MessageIndex> selectMessageIndex(@Param("receiver") String receiver);
 
-    @Select("select * from t_socket_message where sender='00000'")
+    @Select("select * from t_socket_message where sender='00000' order by send_datetime desc")
     List<SocketMessage> selectAllSystemMessages();
 
-    @Select("select a.* , t.status " +
-            "from t_socket_message_consumer t " +
-            "         left join t_socket_message a on (a.id = t.msg_id) " +
-            "where t.sender = #{sender} " +
-            "  and t.receiver = #{receiver} " +
-            "order by a.id desc;")
-    List<SocketMessage> selectNeededMessages(@Param("sender") String sender, @Param("receiver") String receiver);
-
-    @Select("select count(1) " +
-            "from t_socket_message_consumer t " +
-            "         left join t_socket_message a on (a.id = t.msg_id) " +
-            "where t.sender = #{sender} " +
-            "  and t.receiver = #{receiver};")
-    int selectNeededMessagesTotal(@Param("sender") String sender, @Param("receiver") String receiver);
-
     @Select("select top ${pageSize} *\n" +
             "from (select row_number() over (order by send_datetime desc ) row_index, a.*, t.status\n" +
             "      from t_socket_message_consumer t\n" +
             "               left join t_socket_message a on (a.id = t.msg_id)\n" +
             "      where t.sender = #{sender}\n" +
             "        and t.receiver = #{receiver}) as table1\n" +
-            "where row_index > ${pageSize} * (#{currentPage} - 1)")
+            "where row_index > ${pageSize} * (#{currentPage} - 1) " +
+            "order by send_datetime desc")
     List<SocketMessage> selectNeededMessagesPage(@Param("sender") String sender,
                                                  @Param("receiver") String receiver,
                                                  @Param("currentPage") long currentPage,