|
|
@@ -1,27 +1,25 @@
|
|
1
|
1
|
package api.controller.online;
|
|
2
|
2
|
|
|
|
3
|
+import api.controller.BaseController;
|
|
|
4
|
+import api.entity.database.online.Message;
|
|
3
|
5
|
import api.entity.database.system.Customer;
|
|
|
6
|
+import api.entity.input.PageInput;
|
|
4
|
7
|
import api.entity.input.online.MessageInput;
|
|
|
8
|
+import api.model.AjaxResult;
|
|
|
9
|
+import api.service.online.IMessageService;
|
|
5
|
10
|
import api.service.system.ICustomerService;
|
|
6
|
11
|
import api.service.websocket.WebSocket;
|
|
7
|
|
-import api.util.annotation.Anonymous;
|
|
|
12
|
+import api.util.annotation.Log;
|
|
|
13
|
+import api.util.enums.BusinessType;
|
|
8
|
14
|
import api.util.helper.AsyncHelper;
|
|
9
|
15
|
import api.util.helper.DateHelper;
|
|
10
|
16
|
import api.util.helper.FileUploadHelper;
|
|
11
|
|
-import com.alibaba.fastjson2.JSON;
|
|
|
17
|
+import api.util.helper.StringHelper;
|
|
12
|
18
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
13
|
19
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
14
|
20
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
15
|
21
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
16
|
22
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
17
|
|
-import api.controller.BaseController;
|
|
18
|
|
-import api.entity.database.online.Message;
|
|
19
|
|
-import api.entity.input.PageInput;
|
|
20
|
|
-import api.model.AjaxResult;
|
|
21
|
|
-import api.service.online.IMessageService;
|
|
22
|
|
-import api.util.annotation.Log;
|
|
23
|
|
-import api.util.enums.BusinessType;
|
|
24
|
|
-import api.util.helper.StringHelper;
|
|
25
|
23
|
import io.swagger.annotations.Api;
|
|
26
|
24
|
import io.swagger.annotations.ApiOperation;
|
|
27
|
25
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -29,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
|
|
29
|
27
|
import org.springframework.web.multipart.MultipartFile;
|
|
30
|
28
|
|
|
31
|
29
|
import javax.annotation.Resource;
|
|
32
|
|
-import java.io.IOException;
|
|
|
30
|
+import java.text.SimpleDateFormat;
|
|
33
|
31
|
import java.util.*;
|
|
34
|
32
|
import java.util.stream.Collectors;
|
|
35
|
33
|
|
|
|
@@ -117,6 +115,28 @@ public class MessageController extends BaseController {
|
|
117
|
115
|
}
|
|
118
|
116
|
}
|
|
119
|
117
|
|
|
|
118
|
+ Collections.sort(list, new Comparator() {
|
|
|
119
|
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
120
|
+ @Override
|
|
|
121
|
+ public int compare(Object o1, Object o2) {
|
|
|
122
|
+ try {
|
|
|
123
|
+
|
|
|
124
|
+ Date dt1 = sf.parse( ((Map) o1).get("time").toString());
|
|
|
125
|
+ Date dt2 = sf.parse( ((Map) o2).get("time").toString());
|
|
|
126
|
+ if (dt1.getTime() > dt2.getTime()) {
|
|
|
127
|
+ return -1;
|
|
|
128
|
+ } else if (dt1.getTime() < dt2.getTime()) {
|
|
|
129
|
+ return 1;
|
|
|
130
|
+ } else {
|
|
|
131
|
+ return 0;
|
|
|
132
|
+ }
|
|
|
133
|
+ } catch (Exception e) {
|
|
|
134
|
+ e.printStackTrace();
|
|
|
135
|
+ }
|
|
|
136
|
+ return 0;
|
|
|
137
|
+ }
|
|
|
138
|
+ });
|
|
|
139
|
+
|
|
120
|
140
|
return Success("成功", list);
|
|
121
|
141
|
}
|
|
122
|
142
|
|