Commit Graph

856 Commits

Author SHA1 Message Date
yanglin
fea0c72259 REQ-2135: backup 2024-03-19 18:53:56 +08:00
yanglin
6e6e84552e REQ-2135: 分页查询 2024-03-18 17:40:46 +08:00
yanglin
d1d69150c5 REQ-2135: 定义接口 2024-03-18 09:25:07 +08:00
yanglin
1261b7dadb REQ-2135: backup 2024-03-15 18:38:56 +08:00
yanglin
650266c830 REQ-2135: 添加接口定义 2024-03-15 13:33:26 +08:00
yanglin
f74ea4cb7c FIX NPE 2024-03-08 10:56:38 +08:00
yanglin
3efb8c44f4 REQ-2010: getLatestByBizCode接口过滤空的bizCode 2024-03-07 20:50:41 +08:00
yanglin
acd33241d1 REQ-2010: 分页查询待办最大不能超过50条 2024-03-07 17:42:01 +08:00
yanglin
101f4e070f REQ-2010: 分页查询待办最大不能超过50条 2024-03-07 17:39:54 +08:00
yanglin
9be4f41751 REQ-2010: 分页查询待办最大不能超过200条 2024-03-07 17:33:22 +08:00
yanglin
e8322e90c9 Merge branch 'feature/20240306' of axzsource.com:universal/infrastructure/backend/msg-center-plat into feature/20240306 2024-03-07 15:06:39 +08:00
yanglin
72e93edffe REQ-2010: 返回空集合 2024-03-07 15:06:30 +08:00
lilong
b1d0e9b33e feat: 解析NPE问题 2024-03-06 20:58:52 +08:00
lilong
1d457a0a79 feat:记录ouId = 0清洗失败的记录 2024-03-06 20:27:48 +08:00
lilong
2e992bd23d feat:记录ouId = 0清洗失败的记录 2024-03-06 19:52:23 +08:00
lilong
7af88388a6 feat:修改阻塞队列大小 2024-03-06 19:16:13 +08:00
lilong
68e145e3f1 feat:解决newOuId抛NPE的问题 2024-03-06 11:01:22 +08:00
lilong
957ba89cf1 feat:调整一次查询数量和多线程队列数,
ouId未解析到的数据,不进行标记更新
2024-03-06 10:56:31 +08:00
yanglin
c5c7a95a4c Merge branch 'ou_id_migration' into feature/20240306 2024-03-05 20:10:44 +08:00
yanglin
d31d54bfbe Merge branch 'feature/REQ-2010' into feature/20240306
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-03-05 20:06:56 +08:00
lilong
76fa1e6755 feat: 增加缓存 2024-03-05 19:59:10 +08:00
lilong
789633ae38 feat: 增加缓存 2024-03-05 19:59:10 +08:00
lilong
3274e8742b feat: 改成批量更新数据库 2024-03-05 19:59:09 +08:00
lilong
78d6ab0f60 feat: 多线程执行job 2024-03-05 19:59:09 +08:00
lilong
0c5a7a6791 feat: 多线程执行job 2024-03-05 19:59:09 +08:00
yanglin
115bcb0db6 REQ-2010: 查询待办 2024-03-05 17:09:42 +08:00
yanglin
a9a38d1746 REQ-2010: 通过personId获取待办 2024-03-05 16:21:17 +08:00
yanglin
e0c7aedc66 REQ-2010: 尝试解决pre环境的异常问题 2024-03-04 17:02:25 +08:00
yanglin
06130725e3 REQ-2010: 尝试解决pre环境的异常问题 2024-03-04 16:03:31 +08:00
yanglin
8887cee6f2 REQ-2010: 发送im消息 2024-03-02 15:31:34 +08:00
yanglin
76b40a3819 REQ-2010: 兼容老数据 2024-03-02 14:55:22 +08:00
yanglin
bc06b75098 REQ-2010: 设置字段默认值 2024-03-02 14:52:09 +08:00
yanglin
b7e3748c0b REQ-2010: 调整配置 2024-03-02 14:03:06 +08:00
yanglin
c2013a81bf REQ-2010: 添加校验 2024-03-02 13:58:21 +08:00
lilong
ef057a04b3 feat: 多线程执行job 2024-03-01 18:49:08 +08:00
lilong
28366d54d4 feat: 多线程执行job 2024-03-01 18:13:57 +08:00
yanglin
25ae4da76f REQ-2010: 验证问题 2024-03-01 17:58:39 +08:00
yanglin
d1ed8d556d Revert "REQ-2010: 更新字段"
This reverts commit 9aaefd1f50.
2024-03-01 15:45:55 +08:00
yanglin
9aaefd1f50 REQ-2010: 更新字段 2024-03-01 15:28:00 +08:00
yanglin
82293e1456 REQ-2010: 兼容待办执行人没有传身份的情况 2024-03-01 15:07:49 +08:00
yanglin
ba37de1a12 REQ-2010: 返回模版类型, 处理按钮可见性问题 2024-03-01 10:21:20 +08:00
lilong
991b2c56d0 feat: 增加打印日志 2024-02-29 11:29:31 +08:00
lilong
8c0cf10c87 feat: 修改每条记录刷新失败不影响其他的 2024-02-29 11:01:24 +08:00
李龙
5b0f980f74 Merge branch 'pre' into 'ou_id_migration'
# Conflicts:
#   inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
#   start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
2024-02-29 02:32:07 +00:00
yanglin
8c7a1cc3b9 REQ-2010: 添加token 2024-02-28 19:25:46 +08:00
yanglin
66ecd05071 REQ-2010: 根据手机查询用户im消息 2024-02-28 18:29:00 +08:00
yanglin
a35421e5ed REQ-2010: fix bug 2024-02-28 16:58:18 +08:00
yanglin
3b150452cc REQ-2010: 设置返回的数据数量限制 2024-02-28 16:38:50 +08:00
yanglin
f07cb76a3c REQ-2010: 添加分析问题的字段 2024-02-28 16:25:41 +08:00
yanglin
f02c02c6f5 REQ-2010: 添加分析问题的字段 2024-02-28 16:03:33 +08:00
lilong
c4b59d9574 feat: 解决通过routerParams里面的taskNo
找到taskOrder的情况
2024-02-28 15:38:07 +08:00
yanglin
6593ff6a16 REQ-2010: 不返回重复的templateCode 2024-02-28 15:30:12 +08:00
lilong
705366f49b feat: 解决通过bizCode找不到taskOrder的情况 2024-02-28 15:15:33 +08:00
lilong
72e009d90b feat: 解决通过bizCode找不到taskOrder的情况 2024-02-28 15:15:33 +08:00
lilong
649b6edb92 feat: 修改是否已经删除条件 2024-02-28 15:15:32 +08:00
lilong
3a5cc22b24 feat: 通过bizCode查找对应的ouId 2024-02-28 14:26:48 +08:00
yanglin
b192f76fee REQ-2010: 保存发送失败的原因 2024-02-28 14:07:39 +08:00
李龙
b6fbb976aa Revert "Merge branch 'ou_id_migration' of /Users/lilong/IdeaProjects/msg-center-plat with conflicts."
This reverts commit 1da5e022e3
2024-02-28 02:51:20 +00:00
lilong
411372a28c feat: 解决找不到ouId的情况 2024-02-28 10:40:56 +08:00
lilong
1da5e022e3 Merge branch 'ou_id_migration' of /Users/lilong/IdeaProjects/msg-center-plat with conflicts. 2024-02-28 10:40:47 +08:00
lilong
5dd8723506 feat: job增加返回success 2024-02-27 23:06:20 +08:00
lilong
e2fdf1ebda feat: 增加打印日志 2024-02-27 21:48:23 +08:00
lilong
4754c49870 feat: 解决从业人员找不到对应的团队的问题 2024-02-27 21:18:42 +08:00
lilong
3fa17bc8e2 feat: 解决private 2024-02-27 20:51:41 +08:00
lilong
2e5379da05 feat: 增加打印日志 2024-02-27 20:46:03 +08:00
yanglin
8bace30418 REQ-2010: fix bugs 2024-02-27 18:33:15 +08:00
lilong
f9cf8ce91e feat: router刷新逻辑修改 2024-02-27 17:25:34 +08:00
lilong
ee0eca380a feat: router刷新逻辑修改 2024-02-27 17:25:34 +08:00
lilong
af0c94b39f feat: router刷新逻辑修改 2024-02-27 17:03:09 +08:00
lilong
000fb277c3 feat: 修改数据刷新逻辑 2024-02-27 14:24:07 +08:00
lilong
9580a44252 feat: 刷数据时增加指定模板条件 2024-02-27 14:17:07 +08:00
yanglin
f9d88918ed REQ-2010: fix bugs 2024-02-27 13:35:13 +08:00
yanglin
121335d251 REQ-2010: 添加辅助方法 2024-02-27 11:54:53 +08:00
yanglin
28ceb953ac REQ-2010: 添加辅助方法 2024-02-27 11:50:11 +08:00
lilong
f018420eca feat: 增加 updateOuIdJob 2024-02-27 11:48:05 +08:00
yanglin
e9fbf930d8 REQ-2010: 添加辅助方法 2024-02-27 11:25:40 +08:00
李龙
37a16239d0 Merge branch 'test' into 'ou_id_migration'
# Conflicts:
#   inside-notices/pom.xml
#   inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
#   start/src/main/resources/bootstrap.yml
#   start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
2024-02-27 03:07:51 +00:00
lilong
fb2f7b1664 feat: 修改成job 2024-02-27 11:04:59 +08:00
lilong
0463121d1b feat:增加接口/api前缀 2024-02-27 10:21:33 +08:00
yanglin
808c123044 REQ-2010: 添加辅助方法 2024-02-27 10:18:06 +08:00
yanglin
28d5a6fd8b REQ-2010: 添加辅助方法 2024-02-27 10:17:58 +08:00
yanglin
283064de4a Merge branch 'feature/REQ-2010' into test 2024-02-27 09:59:39 +08:00
yanglin
fea00e2946 REQ-2010: 添加辅助方法 2024-02-27 09:59:34 +08:00
yanglin
5b29492fba Merge branch 'feature/REQ-2010' into test 2024-02-27 09:47:04 +08:00
yanglin
9c23f07507 REQ-2010: 添加辅助方法 2024-02-27 09:46:52 +08:00
yanglin
7ffd13fea8 Merge branch 'feature/REQ-2010' into test 2024-02-27 09:39:13 +08:00
yanglin
be5cf2b39e REQ-2010: 添加辅助方法 2024-02-27 09:38:59 +08:00
yanglin
0597da19f5 Merge branch 'feature/REQ-2010' into test 2024-02-27 09:20:40 +08:00
yanglin
632f0b4f55 REQ-2010: 返回分析信息 2024-02-27 09:20:25 +08:00
yanglin
9e83686a3a Merge branch 'feature/REQ-2010' into test 2024-02-27 08:58:29 +08:00
yanglin
89e7b90bd6 REQ-2010: 添加日志 2024-02-27 08:58:20 +08:00
lilong
31f3b98977 feat:增加迁移router信息 2024-02-26 23:45:42 +08:00
yanglin
d364c9a239 Merge branch 'feature/REQ-2010' into test 2024-02-26 23:38:13 +08:00
yanglin
c6d35eacbd 返回排查问题的字段 2024-02-26 23:38:07 +08:00
lilong
d1a9342cfb feat:清洗pendingMessageRecord的ouId,personId,Router信息 2024-02-26 22:11:07 +08:00
lilong
e110a72cfa feat:修改job名字 2024-02-26 20:31:25 +08:00
lilong
f95f4f48cd feat:job增加入参 2024-02-26 18:14:56 +08:00
lilong
2381f2304b feat:BUG-9513
增加job迁移ouId有问题的数据
2024-02-26 18:06:14 +08:00
yanglin
e726c6618d Merge branch 'feature/REQ-2010' into test 2024-02-26 14:36:24 +08:00
yanglin
74093e4045 提供接口查询某个模版的所有待办 2024-02-26 14:36:05 +08:00
yanglin
218ddfbbf7 迁移ouId 2024-02-26 11:46:38 +08:00
yanglin
cc5cd5687a REQ-2010: 刷ouId 2024-02-26 11:32:09 +08:00
yanglin
498cad19b4 REQ-2010: fix NPE 2024-02-26 09:09:56 +08:00
yanglin
27194e7482 Merge branch 'feature/REQ-2010' into test 2024-02-23 13:46:42 +08:00
yanglin
72a0c49ff1 REQ-2010: 添加辅助方法, 用于排查问题 2024-02-23 13:44:15 +08:00
yanglin
cf49d8faae REQ-2233: 运营需求 2024-02-22 16:19:48 +08:00
yanglin
300a17685b REQ-2233: 运营需求 2024-02-22 11:47:22 +08:00
yanglin
f061d7a307 REQ-2010: 修复ouId为0的一种情况 2024-02-20 21:12:02 +08:00
yanglin
c5616f1951 REQ-2010: 修复入参可能不填的问题 2024-02-20 11:10:00 +08:00
yanglin
d2dd0c74ae REQ-2010: 回滚 2024-02-05 20:03:31 +08:00
yanglin
7140842cf9 REQ-2010: 把模版里面配置的key也做url encode 2024-02-05 17:55:55 +08:00
yanglin
f78d4fc7a0 REQ-2010: 待办统计也将班组和ouId=0的加入查询范围 2024-02-05 15:57:31 +08:00
yanglin
4984e53d06 REQ-2010: 待办统计也将班组和ouId=0的加入查询范围 2024-02-05 14:34:13 +08:00
yanglin
69a526363f REQ-2010: 处理待办老数据ouId=0的问题 2024-02-04 10:51:53 +08:00
yanglin
4e148e27d3 REQ-2010: 给待办设置身份默认值 2024-02-03 16:19:41 +08:00
yanglin
e661ccf432 REQ-2010: 细化字段说明 2024-02-02 17:53:50 +08:00
yanglin
0f4abc7ef8 REQ-2010: 通过ouId查询所有的平台班组ID, 然后把平台班组id当成ouId来查询待办, 兼容老数据问题 2024-02-02 17:22:25 +08:00
yanglin
de32a0fdf6 REQ-2010: 通过ouId查询所有的平台班组ID, 然后把平台班组id当成ouId来查询待办, 兼容老数据问题 2024-02-02 16:27:22 +08:00
yanglin
31bc123ab0 REQ-2097: 添加日志 2024-01-30 19:31:36 +08:00
yanglin
028c901921 REQ-2097: 添加日志 2024-01-30 19:13:28 +08:00
yanglin
59c691ce4b REQ-2097: 添加日志 2024-01-30 19:09:01 +08:00
yanglin
161ddef113 REQ-2097: 添加日志 2024-01-30 19:03:21 +08:00
yanglin
d44f1b0e50 Merge branch 'feature/REQ-2097' into pre 2024-01-30 19:02:34 +08:00
yanglin
f4061b9ca1 REQ-2097: 添加日志 2024-01-30 19:02:27 +08:00
yanglin
ff2a327f44 Merge branch 'feature/REQ-2097' into pre 2024-01-30 18:30:08 +08:00
yanglin
508b8ab47d REQ-2097: setHide using single parameter 2024-01-30 18:30:01 +08:00
yanglin
44f76eff92 Merge branch 'feature/REQ-2097' into pre 2024-01-30 17:17:43 +08:00
yanglin
226dfefcc4 REQ-2097: 添加日志 2024-01-30 17:17:38 +08:00
yanglin
a1fce83f12 Merge branch 'feature/REQ-2097' into pre 2024-01-30 15:16:32 +08:00
yanglin
35d2fae3b7 REQ-2097: 根据subBizCode隐藏待办 2024-01-30 10:03:53 +08:00
yanglin
780c6b59ef REQ-2097: 添加字段, 支持待办在一定时间内隐藏. 主要是为了兼容流程中异步调用待办接口。 2024-01-29 18:04:45 +08:00
yanglin
d1f15f1edc REQ-2046: 处理待办动态参数转义的问题 2024-01-29 14:36:40 +08:00
yanglin
11763ca850 REQ-2046: 处理待办动态参数转义的问题 2024-01-29 14:35:07 +08:00
yanglin
a7049a940e Merge branch 'feature/REQ-2046' into pre 2024-01-27 10:35:10 +08:00
yanglin
c742129884 REQ-2046: 查询不出老消息的问题 2024-01-27 10:34:52 +08:00
yanglin
9b1b64f443 Merge branch 'feature/REQ-2046' into pre 2024-01-27 09:47:03 +08:00
yanglin
89657feb18 REQ-2046: 兼容老的字段 2024-01-27 09:46:52 +08:00
yanglin
ba19c5dc92 Merge branch 'feature/REQ-2046' into pre 2024-01-27 09:21:09 +08:00
yanglin
c78363cf16 REQ-2046: 还原老接口 2024-01-27 09:20:04 +08:00
yanglin
1b03ef94c8 REQ-2046: 处理待办动态参数转义的问题 2024-01-26 10:07:14 +08:00
yanglin
a6bedb22a6 REQ-2046: 处理待办动态参数转义的问题 2024-01-25 17:09:38 +08:00
杨林
2377ab2074 Merge branch 'feature/REQ-2046' into 'pre'
Feature/req 2046

See merge request universal/infrastructure/backend/msg-center-plat!332
2024-01-25 02:27:19 +00:00
yanglin
efb2ca2121 REQ-2046: jar兼容 2024-01-25 10:26:32 +08:00
yanglin
b8c9248256 REQ-2046: 兼容router config无法找到的数据 2024-01-25 08:33:13 +08:00
yanglin
a3cac63789 REQ-2046: 兼容router config无法找到的数据 2024-01-24 20:27:57 +08:00
yanglin
52f1681fe5 REQ-1858: 解决统计未读数据和分页查询数据数据不匹配的问题(两边的查询条件没有保持一致) 2024-01-24 18:10:27 +08:00
yanglin
63fe60b5ed REQ-1858: 多身份查询老消息 2024-01-24 16:57:45 +08:00
宋远伦
f6d08c7feb Merge branch 'feature/REQ-1899' into 'master'
Feature/req 1899

See merge request universal/infrastructure/backend/msg-center-plat!320
2024-01-17 09:45:42 +00:00
杨林
63199c34f2 Merge branch 'feature/REQ-1898' into 'pre'
Feature/req 1898

See merge request universal/infrastructure/backend/msg-center-plat!318
2024-01-17 01:48:57 +00:00
yanglin
8fae3cca28 REQ-1898: 调整返回的数据格式 2024-01-17 09:47:53 +08:00