Merge remote-tracking branch 'origin/feature/1020-tencent-im' into feature/1020-tencent-im

.idea/httpRequests/http-requests-log.http

@@ -1,251 +1,441 @@
-POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
-Authorization: bearer 01af4346-c7e5-4e43-9950-9617ff0743bf
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
+{
+  "page": 1,
+  "rows": 10,
+  "keyword": "30"
+}
+
+<> 2023-10-23T152039.200.json
+
 ###
 
-POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
-Authorization: bearer 01af4346-c7e5-4e43-9950-9617ff0743bf
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-10-20T201808.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "groupId": "298",
+  "keyword": "30"
+}
+
+<> 2023-10-23T152001.200.json
 
 ###
 
-POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
-Authorization: bearer 01af4346-c7e5-4e43-9950-9617ff0743bf
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-10-20T200147.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "groupId": "298",
+  "keyword": "30"
+}
+
+<> 2023-10-23T151824.200.json
 
 ###
 
-POST http://127.0.0.1:8805/api-web/imHistoryMessage/ImportIM
-Authorization: bearer 01af4346-c7e5-4e43-9950-9617ff0743bf
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-10-20T195243.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "groupId": "298",
+  "keyword": "30"
+}
+
+<> 2023-10-23T151537.200.json
 
 ###
 
-POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
-Authorization: bearer 01af4346-c7e5-4e43-9950-9617ff0743bf
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-10-20T195232.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "groupId": "298",
+  "keyword": "30"
+}
+
+<> 2023-10-23T151437.200.json
 
 ###
 
-GET http://127.0.0.1:8805/api-web/imGroup/groupTransfer
-Authorization: bearer 01af4346-c7e5-4e43-9950-9617ff0743bf
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Length: 0
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-10-20T195151.200.json
-
 ###
 
 POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
-Authorization: bearer 01af4346-c7e5-4e43-9950-9617ff0743bf
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
 Content-Length: 0
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-10-20T195028.200.json
+<> 2023-10-23T150007.200.json
 
 ###
 
-POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
-Authorization: bearer 31a32cfa-3c2e-4b27-bea4-bff679f1eee2
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 49
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-10-20T194928.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "groupId": "298"
+}
+
+<> 2023-10-23T143540.200.json
 
 ###
 
-GET http://127.0.0.1:8005/open/queryAllOrg
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 46
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-09-18T100913.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "groupId": ""
+}
+
+<> 2023-10-23T143527.200.json
 
 ###
 
-POST http://127.0.0.1:8005/open/oaOrgIds?userId=2248313
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 46
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-09-15T234119.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "groupId": ""
+}
+
+<> 2023-10-23T143348.200.json
 
 ###
 
-POST http://127.0.0.1:8005/open/oaOrgIds?userId=2248313
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 100
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-09-15T233859.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "chatType": "C2C",
+  "fromAccount": 2248317,
+  "toAccount": 2248501
+}
+
+<> 2023-10-23T143332.200.json
 
 ###
 
-GET http://127.0.0.1:8005/open/queryAllOrg
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 100
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-09-15T233807.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "chatType": "C2C",
+  "fromAccount": 2248317,
+  "toAccount": 2248507
+}
+
+<> 2023-10-23T143327.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 76
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T221721.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "chatType": "C2C",
+  "fromAccount": 2248317
+}
+
+<> 2023-10-23T143314.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 76
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T221523.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "chatType": "C2C",
+  "fromAccount": 2249115
+}
+
+<> 2023-10-23T143308.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 50
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T221236.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "chatType": "C2C"
+}
+
+<> 2023-10-23T143252.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 52
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220649.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "chatType": "GROUP"
+}
+
+<> 2023-10-23T143100.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/getCourseSchedulesWithDate?date=2023-06-05 00:00:00
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
 Content-Type: application/json
-Authorization: bearer 4d8e23a1-3acd-42e4-a1ca-b4d595506d98
-Proxy-Connection: Keep-Alive
+Content-Length: 103
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220555.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-22 10:10:10"
+}
+
+<> 2023-10-23T143030.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 103
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220546.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-22 10:10:10"
+}
+
+<> 2023-10-23T142933.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 103
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220439.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-22 10:10:10"
+}
+
+<> 2023-10-23T142434.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 103
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220236.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-22 10:10:10"
+}
+
+<> 2023-10-23T141819.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 103
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T215903.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-22 10:10:10"
+}
+
+<> 2023-10-23T141646.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 103
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T215426.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-22 10:10:10"
+}
+
+<> 2023-10-23T141207.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 103
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T215131.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-22 10:10:10"
+}
+
+<> 2023-10-23T140942.200.json
 
 ###
 
-POST https://online.lexiaoya.cn/api-backend/open/schoolTeacherStudent/importPlan?fileUrl=https://polestar-oss.oss-cn-shenzhen.aliyuncs.com/assets/excel/0614/0614单簧管导入表.xlsx
-Content-Length: 0
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 103
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T100514.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-23 10:10:10"
+}
+
+<> 2023-10-23T140908.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer 0071d90f-5623-4ee9-a88e-c7adb09efb1c
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
 Content-Type: application/json
-Content-Length: 149
+Content-Length: 103
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
@@ -253,20 +443,18 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 {
   "page": 1,
   "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-  "status": "UNDERWAY"
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-23 10:10:10"
 }
 
-<> 2023-06-14T173156.200.json
+<> 2023-10-23T140550.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer 0071d90f-5623-4ee9-a88e-c7adb09efb1c
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
 Content-Type: application/json
-Content-Length: 150
+Content-Length: 103
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
@@ -274,20 +462,18 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 {
   "page": 1,
   "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-  "status": "NOT_START"
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-23 10:10:10"
 }
 
-<> 2023-06-14T173111.200.json
+<> 2023-10-23T140545.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer a9b023c1-f525-4b95-8723-0ca14b038624
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
 Content-Type: application/json
-Content-Length: 150
+Content-Length: 103
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
@@ -295,178 +481,217 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 {
   "page": 1,
   "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-  "status": "NOT_START"
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-23 10:10:10"
 }
 
-<> 2023-06-14T173045.200.json
+<> 2023-10-23T140533.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 104
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T154028.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10",
+  "endTime": "2023-09-23 10:10:10",
+}
+
+<> 2023-10-23T140528.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 67
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T145629.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-09-23 10:10:10"
+}
+
+<> 2023-10-23T140514.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=1374
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 67
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T145450.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "2023-10-23 10:10:10"
+}
+
+<> 2023-10-23T140504.200.json
 
 ###
 
-GET http://127.0.0.1:8005/courseSchedule/getCurrentCourseDetail/1374
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 58
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T143343.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "1686794820"
+}
+
+<> 2023-10-23T140448.200.json
 
 ###
 
-GET http://127.0.0.1:8005/courseSchedule/query?courseScheduleId=1374
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer f63411e7-63e0-48e4-bbfa-40413b97b744
+Content-Type: application/json
+Content-Length: 58
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T143049.200.json
+{
+  "page": 1,
+  "rows": 10,
+  "startTime": "1686794820"
+}
+
+<> 2023-10-23T140417.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 58
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "page": 1,
+  "rows": 10,
+  "startTime": "1686794820"
 }
 
-<> 2023-06-14T124937.200.json
+<> 2023-10-23T140342.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "page": 1,
+  "rows": 10,
+  "keyword": "30"
 }
 
-<> 2023-06-14T124615.200.json
+<> 2023-10-23T114437.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "page": 1,
+  "rows": 10,
+  "keyword": "30"
 }
 
-<> 2023-06-14T124548.200.json
+<> 2023-10-23T114309.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "page": 1,
+  "rows": 10,
+  "keyword": "30"
 }
 
-<> 2023-06-14T124526.200.json
+<> 2023-10-23T114021.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "page": 1,
+  "rows": 10,
+  "keyword": "30"
 }
 
-<> 2023-06-14T124513.200.json
+<> 2023-10-23T113620.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "page": 1,
+  "rows": 10,
+  "keyword": "30"
 }
 
-<> 2023-06-14T124441.200.json
+<> 2023-10-23T113536.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer a9b023c1-f525-4b95-8723-0ca14b038624
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 152
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
@@ -474,20 +699,17 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 {
   "page": 1,
   "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-//  "status": "NOT_START"
+  "keyword": "30"
 }
 
-<> 2023-06-14T111123.200.json
+<> 2023-10-23T113344.200.json
 
 ###
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 78
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
@@ -495,18 +717,17 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 {
   "page": 1,
   "rows": 10,
-  "liveGroupId": 102,
-  "search": "测试59611"
+  "keyword": "30"
 }
 
-<> 2023-06-14T105403.200.json
+<> 2023-10-23T113203.200.json
 
 ###
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 77
+Content-Length: 47
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
@@ -514,18 +735,17 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 {
   "page": 1,
   "rows": 10,
-  "liveGroupId": 102,
-  "search": "测试5961"
+  "keyword": "3"
 }
 
-<> 2023-06-14T105355.200.json
+<> 2023-10-23T113151.200.json
 
 ###
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
 Content-Type: application/json
-Content-Length: 51
+Content-Length: 48
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
@@ -533,86 +753,139 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 {
   "page": 1,
   "rows": 10,
-  "liveGroupId": 102
+  "keyword": "11"
 }
 
-<> 2023-06-14T105332.200.json
+<> 2023-10-23T113146.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Type: application/json
+Content-Length: 50
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T183554.200.json
+{
+  "page": 1,
+  "rows": 10，
+  "keyword": "11"
+}
+
+<> 2023-10-23T113119.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Type: application/json
+Content-Length: 29
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T183425.200.json
+{
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-10-23T113105.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Type: application/json
+Content-Length: 30
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T183308.200.json
+{
+  "page": 50,
+  "rows": 10
+}
+
+<> 2023-10-23T113056.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Type: application/json
+Content-Length: 29
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T182452.200.json
+{
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-10-23T113032.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Type: application/json
+Content-Length: 29
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T163044.200.json
+{
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-10-23T112353.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/imToTencent
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Length: 0
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095605.200.json
-
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Type: application/json
+Content-Length: 29
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095427.200.json
+{
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-10-23T111620.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+POST http://127.0.0.1:8805/api-web/imHistoryMessage/historyMessage
+Authorization: bearer 3526591a-a4e9-488c-82f1-4a1e56a0c6a4
+Content-Type: application/json
+Content-Length: 29
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095323.200.json
+{
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-10-23T111115.200.json
 
 ###
 

mec-application/src/main/java/com/ym/mec/student/controller/ImHistoryMessageController.java

@@ -0,0 +1,43 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.service.ImGroupService;
+import com.ym.mec.biz.service.UploadFileService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.yonge.log.service.HistoryMessageService;
+import com.yonge.log.service.HistoryMessageTenantService;
+import com.yonge.log.wrapper.HistoryMessageTencentWrapper;
+import com.yonge.mongodb.PageInfo;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("${app-config.url.student:}/imHistoryMessage")
+@Slf4j
+@RestController
+public class ImHistoryMessageController extends BaseController {
+
+	@Autowired
+	private HistoryMessageService historyMessageService;
+	@Autowired
+	private UploadFileService uploadFileService;
+
+	@Autowired
+	private ImGroupService imGroupService;
+
+    @Autowired
+    private HistoryMessageTenantService historyMessageTenantService;
+
+    @ApiOperation("历史聊天记录查询")
+    @PostMapping(value = "/historyMessage")
+    public HttpResponseResult<PageInfo<HistoryMessageTencentWrapper.HistoryMessageTencent>> historyMessage(@RequestBody  HistoryMessageTencentWrapper.HistoryMessageTencentQuery query) throws Exception {
+
+        return succeedData(historyMessageTenantService.historyMessage(query));
+    }
+
+
+}

mec-application/src/main/java/com/ym/mec/teacher/controller/ImHistoryMessageController.java

@@ -0,0 +1,47 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.biz.service.ImGroupService;
+import com.ym.mec.biz.service.UploadFileService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.entity.UploadReturnBean;
+import com.yonge.log.dal.model.HistoryMessage;
+import com.yonge.log.service.HistoryMessageService;
+import com.yonge.log.service.HistoryMessageTenantService;
+import com.yonge.log.wrapper.HistoryMessageTencentWrapper;
+import com.yonge.mongodb.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.File;
+import java.util.List;
+
+@RequestMapping("${app-config.url.teacher:}/imHistoryMessage")
+@Slf4j
+@RestController
+public class ImHistoryMessageController extends BaseController {
+
+	@Autowired
+	private HistoryMessageService historyMessageService;
+	@Autowired
+	private UploadFileService uploadFileService;
+
+	@Autowired
+	private ImGroupService imGroupService;
+
+    @Autowired
+    private HistoryMessageTenantService historyMessageTenantService;
+
+    @ApiOperation("历史聊天记录查询")
+    @PostMapping(value = "/historyMessage")
+    public HttpResponseResult<PageInfo<HistoryMessageTencentWrapper.HistoryMessageTencent>> historyMessage(@RequestBody  HistoryMessageTencentWrapper.HistoryMessageTencentQuery query) throws Exception {
+
+        return succeedData(historyMessageTenantService.historyMessage(query));
+    }
+
+
+}

mec-application/src/main/java/com/ym/mec/web/controller/ImHistoryMessageController.java

@@ -1,27 +1,29 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.entity.ImGroup;
-import com.ym.mec.biz.dal.entity.ImHistoryMessage;
+import com.yonge.log.wrapper.HistoryMessageTencentWrapper;
 import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.yonge.log.dal.model.HistoryMessage;
+import com.yonge.log.dal.model.HistoryMessageTencent;
 import com.yonge.log.service.HistoryMessageService;
+import com.yonge.log.service.HistoryMessageTenantService;
+import com.yonge.mongodb.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
 import java.util.List;
 
 @RequestMapping("${app-config.url.web:}/imHistoryMessage")
 @Api(tags = "系统操作日志")
+@Slf4j
 @RestController
 public class ImHistoryMessageController extends BaseController {
 
@@ -33,6 +35,9 @@ public class ImHistoryMessageController extends BaseController {
 	@Autowired
 	private ImGroupService imGroupService;
 
+    @Autowired
+    private HistoryMessageTenantService historyMessageTenantService;
+
 	@GetMapping("/save")
 	public Object saveImHistoryMessage(String fileDir) throws Exception {
 		File file = new File(fileDir);
@@ -68,10 +73,15 @@ public class ImHistoryMessageController extends BaseController {
     @ApiOperation("融云im To 腾讯")
     @PostMapping(value = "/imToTencent")
     public void imToTencent() throws Exception {
+
+        // 删除旧数据
+        historyMessageTenantService.deleteOld();
+
         com.yonge.mongodb.PageInfo<HistoryMessage> info;
 //        historyMessageService.updateAllStatus(0);
         //计算总数据量
         long count = historyMessageService.querySyncCount();
+        log.info("总数据量："+count);
         //计算调用次数
         long num = (int) Math.ceil(count / 100);
         for (long i = 0; i <=num ; i++) {
@@ -85,7 +95,16 @@ public class ImHistoryMessageController extends BaseController {
             }
             //IM转换
             imGroupService.imToTencent(footer);
+            log.info("已转换："+(i+1)*size);
         }
     }
 
+    @ApiOperation("历史聊天记录查询")
+    @PostMapping(value = "/historyMessage")
+    public HttpResponseResult<PageInfo<HistoryMessageTencentWrapper.HistoryMessageTencent>> historyMessage(@RequestBody  HistoryMessageTencentWrapper.HistoryMessageTencentQuery query) throws Exception {
+
+        return succeedData(historyMessageTenantService.historyMessage(query));
+    }
+
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/ImGroupWrapper.java

@@ -68,7 +68,7 @@ public class ImGroupWrapper {
 
 
         @ApiModelProperty("主键ID")
-        private Long id;
+        private String id;
 
         @ApiModelProperty("群组ID")
         private String groupId;
@@ -127,7 +127,7 @@ public class ImGroupWrapper {
             return JSON.toJSONString(this);
         }
 
-        public ImGroup id(Long id) {
+        public ImGroup id(String id) {
             this.id = id;
             return this;
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -938,7 +939,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 importGroup.setNotification(imGroup.getMemo());
                 importGroup.setFaceUrl(imGroup.getImg());
                 if (StringUtils.isEmpty(imGroup.getImg())) {
-                    importGroup.setFaceUrl("https://gyt.ks3-cn-beijing.ksyuncs.com/icon_group_avatar1.png");
+                    importGroup.setFaceUrl(imGroup.getGroupType().getAvatar());
                 }
                 importGroup.setApplyJoinOption("FreeAccess");
                 importGroup.setCreateTime(imGroup.getCreateTime().getTime() / 1000);
@@ -1369,6 +1370,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             } else {
                 continue;
             }
+
+            if (CollectionUtils.isEmpty(bodyList)) {
+                continue;
+            }
+            bodyList = bodyList.stream().filter(Objects::nonNull).collect(Collectors.toList());
             if (CollectionUtils.isEmpty(bodyList)) {
                 continue;
             }
@@ -1382,6 +1388,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             // 消息转换
             tencent.setCloudCustomData(jsonObject.getString("extra"));
             tencent.setMsgBody(JSON.toJSONString(bodyList));
+            tencent.setMsgBodyJson(JSON.parseObject(tencent.getMsgBody(), JSONArray.class));
 
             historyMessageTencentService.insert(tencent);
 

mec-common/audit-log/src/main/java/com/yonge/log/dal/model/HistoryMessageTencent.java

@@ -1,5 +1,7 @@
 package com.yonge.log.dal.model;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -63,4 +65,6 @@ public class HistoryMessageTencent implements Serializable {
     @Field("msg_body")
     private String msgBody;
 
+    @Field("msg_body_json")
+    private JSONArray msgBodyJson;
 }

mec-common/audit-log/src/main/java/com/yonge/log/service/HistoryMessageTenantService.java

@@ -2,6 +2,7 @@ package com.yonge.log.service;
 
 import com.yonge.log.dal.model.HistoryMessage;
 import com.yonge.log.dal.model.HistoryMessageTencent;
+import com.yonge.log.wrapper.HistoryMessageTencentWrapper;
 import com.yonge.mongodb.PageInfo;
 import com.yonge.mongodb.service.BaseServiceWithMongo;
 
@@ -10,4 +11,12 @@ import java.util.Date;
 
 public interface HistoryMessageTenantService extends BaseServiceWithMongo<String, HistoryMessageTencent> {
 
+    /**
+     * 查询历史记录
+     *
+     * @param query 查询条件
+     */
+    PageInfo<HistoryMessageTencentWrapper.HistoryMessageTencent> historyMessage(HistoryMessageTencentWrapper.HistoryMessageTencentQuery query);
+
+    void deleteOld();
 }

mec-common/audit-log/src/main/java/com/yonge/log/service/impl/HistoryMessageTenantServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yonge.log.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.yonge.log.dal.dao.HistoryMessageTenantDao;
 import com.yonge.log.dal.dao.OperationLogDao;
 import com.yonge.log.dal.model.HistoryMessage;
@@ -7,21 +8,116 @@ import com.yonge.log.dal.model.HistoryMessageTencent;
 import com.yonge.log.dal.model.OperationLog;
 import com.yonge.log.service.HistoryMessageTenantService;
 import com.yonge.log.service.OperationLogService;
+import com.yonge.log.wrapper.HistoryMessageTencentWrapper;
+import com.yonge.mongodb.PageInfo;
 import com.yonge.mongodb.dao.BaseDaoWithMongo;
 import com.yonge.mongodb.service.BaseServiceWithMongo;
 import com.yonge.mongodb.service.impl.BaseServiceImplWithMongo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
 @Service
 public class HistoryMessageTenantServiceImpl extends BaseServiceImplWithMongo<String, HistoryMessageTencent> implements HistoryMessageTenantService {
 
-        @Autowired
-        private HistoryMessageTenantDao historyMessageTenantDao;
+    @Autowired
+    private HistoryMessageTenantDao historyMessageTenantDao;
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Override
+    public BaseDaoWithMongo<String, HistoryMessageTencent> getDAO() {
+        return historyMessageTenantDao;
+    }
+
+    @Override
+    public PageInfo<HistoryMessageTencentWrapper.HistoryMessageTencent> historyMessage(HistoryMessageTencentWrapper.HistoryMessageTencentQuery param) {
+        PageInfo<HistoryMessageTencentWrapper.HistoryMessageTencent> pageInfo = new PageInfo<>(param.getPage(), param.getRows());
+
+
+        Query query = getQuery(param);
+
+        List<HistoryMessageTencentWrapper.HistoryMessageTencent> dataList = new ArrayList<>();
+
+        long total = mongoTemplate.count(query,HistoryMessageTencent.class);
+        if (total > 0) {
+            pageInfo.setTotal(total);
+
+            query.skip(pageInfo.getOffset()).limit(pageInfo.getLimit());
+            List<HistoryMessageTencent> historyMessageTencents = mongoTemplate.find(query, HistoryMessageTencent.class);
+            dataList = JSON.parseArray(JSON.toJSONString(historyMessageTencents), HistoryMessageTencentWrapper.HistoryMessageTencent.class);
+        }
+        if (total == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
+
+    @Override
+    public void deleteOld() {
+        Query query = new Query();
+        Criteria criteria = Criteria.where("app_service").is("MEC");
+        query.addCriteria(criteria);
+        mongoTemplate.remove(query,HistoryMessageTencent.class);
+    }
+
+    private static Query getQuery(HistoryMessageTencentWrapper.HistoryMessageTencentQuery param) {
+        Query query = new Query();
+        Criteria criteria = new Criteria();
+
+        if (param.getStartTime() != null) {
+            if (param.getEndTime() != null) {
+                criteria.and("msg_timestamp").gte(param.getStartTime().getTime() / 1000).lte(param.getEndTime().getTime() / 1000);
+            } else {
+                criteria.and("msg_timestamp").gte(param.getStartTime().getTime() / 1000);
+            }
+        }
+        if (param.getEndTime() != null) {
+            if (param.getStartTime() == null) {
+                criteria.and("msg_timestamp").lte(param.getEndTime().getTime()/1000);
+            }
+        }
+        if (StringUtils.isNotBlank(param.getChatType())) {
+            criteria.and("chat_type").is(param.getChatType());
+        }
+        if (StringUtils.isNotBlank(param.getFromAccount())) {
+            criteria.and("from_account").is(param.getFromAccount());
+        }
+        if (StringUtils.isNotBlank(param.getToAccount())) {
+            criteria.and("to_account").is(param.getToAccount());
+        }
+        if (StringUtils.isNotBlank(param.getGroupId())) {
+            criteria.and("group_id").is(param.getGroupId());
+        }
+        if (StringUtils.isNotBlank(param.getAppService())) {
+            criteria.and("app_service").is(param.getAppService());
+        }
+        if (StringUtils.isNotBlank(param.getKeyword())) {
+
+// 创建正则表达式模式，以匹配 Text 字段中包含搜索关键词的部分
+            Pattern pattern = Pattern.compile(".*" + param.getKeyword() + ".*", Pattern.CASE_INSENSITIVE);
 
-        @Override
-        public BaseDaoWithMongo<String, HistoryMessageTencent> getDAO() {
-            return historyMessageTenantDao;
+            criteria.and("msg_body_json").elemMatch(
+                Criteria.where("MsgContent.Text").regex(pattern)
+                    .and("MsgType").is("TIMTextElem")
+            );
         }
+        query.addCriteria(criteria);
+        query.with(Sort.by(Sort.Order.asc("msg_timestamp"))); // 以升序方式按字段排序
 
+        return query;
+    }
 }

mec-common/audit-log/src/main/java/com/yonge/log/wrapper/HistoryMessageTencentWrapper.java

@@ -0,0 +1,116 @@
+package com.yonge.log.wrapper;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HistoryMessageTencentWrapper {
+
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" DegreeQuery-考级信息")
+    public static class HistoryMessageTencentQuery {
+
+        @ApiModelProperty("当前页")
+        private Integer page =1;
+
+        @ApiModelProperty("分页行数")
+        private Integer rows =20;
+
+        @ApiModelProperty("文本内容")
+        private String keyword;
+
+
+        @ApiModelProperty("开始时间")
+        private Date startTime;
+
+        @ApiModelProperty("结束时间")
+        private Date endTime;
+
+        @ApiModelProperty("类型C2C:单聊,GROUP:群聊")
+        private String chatType;
+
+        @ApiModelProperty("发送人")
+        private String fromAccount;
+
+        @ApiModelProperty("接收人")
+        private String toAccount;
+
+        @ApiModelProperty("群ID")
+        private String groupId;
+
+        @ApiModelProperty(value = "系统",hidden = true)
+        private String appService = "MEC";
+    }
+
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class HistoryMessageTencent implements Serializable {
+
+
+        @ApiModelProperty("发送日期")
+        private Long msgTime;
+
+        @ApiModelProperty("类型C2C:单聊,GROUP:群聊")
+        private String chatType;
+
+        @ApiModelProperty("客户端IP")
+        private String clientIp;
+
+        @JSONField(name = "CloudCustomData")
+        @ApiModelProperty("自定义数据")
+        private String cloudCustomData;
+
+        @JSONField(name = "From_Account")
+        @ApiModelProperty("发送人")
+        private String fromAccount;
+
+        @ApiModelProperty("系统")
+        private String appService;
+
+        @ApiModelProperty("消息来源平台")
+        private String msgFromPlatform;
+
+        @ApiModelProperty("消息随机数")
+        @JSONField(name = "MsgRandom")
+        private Long msgRandom;
+
+        @ApiModelProperty("消息序列号")
+        @JSONField(name = "MsgSeq")
+        private Long msgSeq;
+
+        @ApiModelProperty("消息时间戳")
+        @JSONField(name = "MsgTimeStamp")
+        private Long msgTimestamp;
+
+        @ApiModelProperty("接收人")
+        @JSONField(name = "To_Account")
+        private String toAccount;
+
+        @ApiModelProperty("群ID")
+        @JSONField(name = "GroupId")
+        private String groupId;
+
+        @ApiModelProperty("消息内容")
+        @JSONField(name = "MsgBody")
+        private String msgBody;
+
+    }
+
+}