Commit Graph

659 Commits

Author SHA1 Message Date
xudawei
8416c9c573 Merge branch 'feature/REQ-3045' into dev 2024-10-09 13:41:32 +08:00
xudawei
4daa135c37 feat:(REQ-3045) 模版管理V3-button列表更换类型属性 2024-10-09 13:40:57 +08:00
xudawei
ec2d053c46 Merge remote-tracking branch 'origin/dev' into dev 2024-10-09 10:20:33 +08:00
xudawei
6843723bb4 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java
2024-10-09 10:20:15 +08:00
xudawei
505a077d4e feat:(REQ-3045) 模版管理V3-优化详情接口 2024-10-09 10:19:05 +08:00
yanglin
0257f5552e Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-09 10:07:23 +08:00
yanglin
5ba5e219dd Merge branch 'feature/REQ-2752' into dev 2024-10-09 10:07:18 +08:00
yanglin
ea5b6f7c5c REQ-2752: 定义接口 2024-10-09 10:07:12 +08:00
xudawei
8aec950777 feat:(REQ-3045) 模版管理V3-日志优化
feat:(REQ-3045) 模版管理V3-增加templateV3属性填充
2024-10-09 09:21:08 +08:00
xudawei
fe2e024f93 Merge branch 'feature/REQ-3045' into dev 2024-10-08 23:59:56 +08:00
xudawei
568cb39911 feat:(REQ-3045) 模版管理V3-templateButtonV3填充属性 2024-10-08 23:59:37 +08:00
xudawei
4b01e5e414 feat:(REQ-3045) 模版管理V3-日志优化 2024-10-08 23:14:48 +08:00
xudawei
d7b8bdc1c0 feat:(REQ-3045) 模版管理V3-日志优化 2024-10-08 23:13:24 +08:00
xudawei
8b20c24abb Merge branch 'feature/REQ-3045' into dev 2024-10-08 19:35:55 +08:00
xudawei
c4b7e2280e feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 19:35:29 +08:00
xudawei
721f9ea052 Merge branch 'feature/REQ-3045' into dev 2024-10-08 19:20:27 +08:00
xudawei
c72018720c feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 19:18:47 +08:00
yanglin
2cd0d00065 Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-08 18:32:54 +08:00
yanglin
e72fbd74af Merge branch 'feature/REQ-2752' into dev 2024-10-08 18:32:47 +08:00
yanglin
8ab3b5c33c REQ-2752: 获取简单的待办信息 2024-10-08 18:32:40 +08:00
xudawei
ca47831661 Merge branch 'feature/REQ-3045' into dev 2024-10-08 17:25:13 +08:00
xudawei
43ca77e786 feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 17:23:30 +08:00
xudawei
f225f69610 Merge branch 'feature/REQ-3045' into dev 2024-10-08 17:17:11 +08:00
xudawei
f0f1ca54dc feat:(REQ-3045) 模版管理V3-新增/编辑/详情/删除/列表 2024-10-08 17:16:07 +08:00
xudawei
bfeda00d06 Merge branch 'feature/REQ-3045' into dev 2024-10-08 16:02:31 +08:00
xudawei
e85d1b4f57 feat:(REQ-3045) 模版管理V3-新增接口添加 2024-10-08 15:58:21 +08:00
xudawei
44a8f16042 Merge branch 'feature/REQ-3045' into dev 2024-10-08 15:46:44 +08:00
xudawei
3b7bd94728 feat:(REQ-3045) 模版管理V3-新增接口添加 2024-10-08 15:44:37 +08:00
yanglin
0b158f2a6a REQ-3045: 添加JSON handler 2024-10-08 15:22:22 +08:00
yanglin
501fdaac13 REQ-3045: 添加一些基础类 2024-10-08 11:22:19 +08:00
yanglin
6ca7271f98 REQ-3045: 添加一些基础类 2024-10-08 10:59:02 +08:00
yanglin
7ef10093d7 REQ-3045: 添加一些基础类 2024-10-08 10:55:27 +08:00
yanglin
8eb94e5750 REQ-3045: 添加一些基础类 2024-10-08 10:45:04 +08:00
yanglin
fdea50bc17 REQ-3045: 添加一些基础类 2024-10-08 10:27:41 +08:00
yanglin
97d25e45b0 Merge branch 'refs/heads/REQ-2723' 2024-09-18 19:15:35 +08:00
yanglin
fd5676657e Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-30 11:27:34 +08:00
yanglin
866608ebe4 REQ-2699: 控制最大的待办返回数量 2024-08-30 11:27:17 +08:00
yanglin
bf32fc376b Merge branch 'feature/REQ-2699' into dev 2024-08-28 10:41:07 +08:00
yanglin
04316faa5c REQ-2699: 分类统计手机原生支持workspaceId 2024-08-28 10:40:59 +08:00
yanglin
a1cc32014e Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 17:40:05 +08:00
yanglin
92fca87f9b REQ-2699: 查询未完成的待办 2024-08-22 17:39:51 +08:00
yanglin
0cd29641ad Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 17:37:06 +08:00
yanglin
33c3c011c9 REQ-2699: 查询未完成的待办 2024-08-22 17:36:49 +08:00
yanglin
303ee09b1a Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 16:05:54 +08:00
yanglin
362db556c9 REQ-2699: 查询未完成的待办 2024-08-22 16:05:07 +08:00
yanglin
d89c4554ba Revert "REQ-2699: 分页查询支持通过模版编码来匹配"
This reverts commit 718784f6b9.
2024-08-22 15:57:03 +08:00
yanglin
c87adcd322 Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 14:46:24 +08:00
yanglin
718784f6b9 REQ-2699: 分页查询支持通过模版编码来匹配 2024-08-22 14:45:43 +08:00
yanglin
a1eaced14c Merge branch 'refs/heads/feature/REQ-2874' into dev 2024-08-20 17:07:29 +08:00
yanglin
bcde71c5d7 Revert "发送IM模版消息时, 支持设置发送时间"
This reverts commit d67d1ca3c7.
2024-08-20 16:48:07 +08:00
yanglin
c923a4cc83 Revert "发送IM模版消息时, 支持设置发送时间"
This reverts commit fbbe4856ef.
2024-08-20 16:48:05 +08:00
yanglin
53926a4449 Revert "发送IM模版消息时, 支持设置发送时间"
This reverts commit f12b943191.
2024-08-20 16:48:02 +08:00
yanglin
f12b943191 发送IM模版消息时, 支持设置发送时间 2024-08-19 11:49:30 +08:00
yanglin
fbbe4856ef 发送IM模版消息时, 支持设置发送时间 2024-08-19 11:47:06 +08:00
yanglin
d67d1ca3c7 发送IM模版消息时, 支持设置发送时间 2024-08-19 11:33:09 +08:00
yanglin
c4ef37f291 Merge branch 'refs/heads/master' into REQ-2723 2024-08-19 09:36:20 +08:00
yanglin
8ca0c27108 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 17:29:45 +08:00
yanglin
ba7a6bc6b3 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 17:14:39 +08:00
yanglin
f425fda104 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:49:13 +08:00
yanglin
a698cff631 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:27:37 +08:00
yanglin
9f1600829c REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:01:27 +08:00
yanglin
226856903c REQ-2874: 政务-添加高新区短信渠道 2024-08-16 10:48:51 +08:00
yanglin
cb264477e4 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 10:48:43 +08:00
yanglin
53340ab36f REQ-2874: 政务-添加高新区短信渠道 2024-08-16 09:23:13 +08:00
yanglin
89af1222df hotfix: mysql deadlock issue 2024-07-31 11:15:43 +08:00
yanglin
d56b54efb3 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 16:46:00 +08:00
yanglin
6d5715d6b8 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 14:21:06 +08:00
yanglin
e1fc4dad26 REQ-2655: 分类统计时对分类进行排序 2024-07-10 15:21:47 +08:00
yanglin
6a351bc0c0 Merge branch 'refs/heads/master' into feature/REQ-2453 2024-07-05 11:35:25 +08:00
yanglin
bfcf3f3402 REQ-2318: 调整缓存失效时间 2024-07-02 14:04:28 +08:00
yanglin
855e19e350 Revert "REQ-2318: 处理类找不到的问题"
This reverts commit cc5b1d2afd.
2024-06-27 14:06:09 +08:00
yanglin
cc5b1d2afd REQ-2318: 处理类找不到的问题 2024-06-27 13:57:58 +08:00
yanglin
b54bc68d1a REQ-2453: 小米、oppo推送渠道 2024-06-25 09:45:06 +08:00
yanglin
000f10bc27 REQ-2453: push的时候添加小米和oppo的渠道id 2024-06-24 14:52:29 +08:00
yanglin
04361a616b Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoMqBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoPullBroadcaster.java
2024-06-24 10:46:49 +08:00
yanglin
907aceb505 REQ-2318: 分页查询待办时, 如果没有传端就查询所有端的待办 2024-06-24 09:45:14 +08:00
yanglin
eb661679f3 REQ-2497: 添加一些工具 2024-06-14 14:06:06 +08:00
yanglin
1bb7a7d42a REQ-2497: 待办IM变更通知不回OU 2024-06-07 16:27:28 +08:00
yanglin
b2a6aebd1d REQ-2318: 交接 2024-06-07 14:21:34 +08:00
yanglin
250d760c8c Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/person/PersonService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/PendingMessageStateEnum.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
2024-06-07 09:12:42 +08:00
yanglin
17fc08192f REQ-2497: 添加阿里回调 2024-06-06 15:32:06 +08:00
yanglin
79f561dfe8 Merge remote-tracking branch 'refs/remotes/origin/feature/merged_all_req'
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java
#	msg-notices/msg-notices-integration/src/main/java/cn/axzo/msg/center/notices/integration/client/impl/AliYunSmsClientImpl.java
2024-06-05 18:25:49 +08:00
yanglin
7706b15206 REQ-2318: 待办状态变更时发送MQ消息通知其它业务方 2024-06-04 10:52:37 +08:00
yanglin
25b2412ae4 REQ-2481: fix imports 2024-06-03 20:10:27 +08:00
yanglin
69b797add6 REQ-2481: 删除无用代码 2024-05-31 16:54:07 +08:00
yanglin
62190cf4f4 REQ-2481: 设置模版中IM的发送优先级 2024-05-27 16:31:01 +08:00
yangqicheng
c2860ec6bd Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-23 18:10:18 +08:00
yangqicheng
c632a5de5b update - REQ-2324-调整批量设置处理中接口 2024-05-23 18:06:45 +08:00
yangqicheng
9fb2160374 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-23 17:36:17 +08:00
yangqicheng
8692b9812d update - REQ-2324-调整批量设置处理中接口校验 2024-05-23 17:35:46 +08:00
yangqicheng
27939442b2 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-23 16:55:05 +08:00
yangqicheng
839139eb26 update - REQ-2324-批量设置待办为审批中接口增加subBizCodes参数 2024-05-23 16:53:01 +08:00
yangqicheng
f24683c368 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/PendingMessagePushParam.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePushRequest.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
2024-05-23 09:50:49 +08:00
yangqicheng
ce69cb1f99 Merge remote-tracking branch 'refs/remotes/origin/master' into REQ-2324
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
2024-05-22 16:45:08 +08:00
yanglin
0ac817d9b4 REQ-2318: 多端支持 2024-05-22 14:45:28 +08:00
yanglin
68ac34cc2b REQ-2318: 待办交接,端相关 2024-05-22 10:00:44 +08:00
yanglin
f9a2c4f9ec REQ-2318: 待办交接,端相关 2024-05-21 18:51:25 +08:00
yanglin
134d1db0f3 REQ-2318: 交接 2024-05-21 10:51:40 +08:00
yanglin
fdbfe9f795 REQ-2303: 添加政府端 2024-05-17 17:28:25 +08:00
yangqicheng
8b8e26e8b3 update - 消息分类统计接口增加项目部列表参数 2024-05-17 17:11:08 +08:00
yanglin
716e101afa REQ-2318: 定义接口 2024-05-16 15:56:28 +08:00
yanglin
7634c70ad3 REQ-2318: 定义接口 2024-05-16 15:55:16 +08:00
yanglin
a54694c553 REQ-2318: 定义接口 2024-05-16 15:51:32 +08:00
yangqicheng
edb2d336bf update - 调整待办接口响应模型业务分类字段名称 2024-05-16 14:27:56 +08:00
yangqicheng
58bbaab61e update - REQ-2324-添加批量设置待办为处理中接口 2024-05-11 17:58:08 +08:00
yanglin
7dc22eec53 Merge branch 'refs/heads/master' into REQ-2303
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
2024-05-11 16:51:24 +08:00
yangqicheng
10da6fac15 update - REQ-2324-待办支持批量处理 2024-05-10 17:38:57 +08:00
yanglin
187e47c8ad REQ-2303: 同步显示流程中的自自定义按钮 2024-05-10 17:24:16 +08:00
yanglin
9712bb3ffe REQ-2303: 同步显示流程中的自自定义按钮 2024-05-10 16:33:04 +08:00
yangqicheng
9a5dc1dfe5 update - REQ-2324-增加恢复待办接口 2024-05-10 15:49:38 +08:00
yanglin
44230891aa REQ-2303: 处理流程自定义按钮 2024-05-10 10:30:45 +08:00
yanglin
fcb613d65a REQ-2324: 添加一些方法 2024-05-09 16:56:02 +08:00
yanglin
93de73f346 Merge branch 'refs/heads/master' into REQ-2405
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-05-09 09:54:14 +08:00
yanglin
2932c9f84e 发送im消息时去掉执行人personId<0的限制,避免其它人发送失败 2024-05-07 18:55:54 +08:00
yanglin
420a6d01f0 发送im消息时去掉执行人personId<0的限制,避免其它人发送失败 2024-05-07 18:55:10 +08:00
yanglin
07a1610ed1 REQ-2303: 返回待办业务和路由扩展参数 2024-04-29 11:00:17 +08:00
yanglin
37496f5138 REQ-2405: 处理重复分类问题 2024-04-29 08:48:42 +08:00
yanglin
d2ca950d27 REQ-2405: 处理重复分类问题 2024-04-28 18:39:18 +08:00
yanglin
46184636b9 REQ-2405: 处理cms的老消息读事件 2024-04-28 17:30:43 +08:00
yanglin
a7c1f1364f REQ-2303: 返回业务扩展参数 2024-04-26 18:06:15 +08:00
yanglin
0112de4ab7 REQ-2303: 添加政务工作台类型 2024-04-26 17:28:42 +08:00
yanglin
f3508208e2 REQ-2411: 去掉没用的fallback类 2024-04-26 10:29:22 +08:00
yanglin
16081d590e REQ-2405: 添加一些标识来排查问题 2024-04-26 09:31:55 +08:00
yanglin
789b755c5c REQ-2405: almost there 2024-04-25 18:19:42 +08:00
yanglin
6cd89df8f3 REQ-2405: 通过job每天晚上刷新老消息的统计数据 2024-04-24 17:58:14 +08:00
yanglin
ab0b0cdcbd REQ-2405: backup 2024-04-23 18:53:53 +08:00
yanglin
232d3bac9c REQ-2303: 支持自定义按钮 2024-04-22 20:26:59 +08:00
yanglin
9eca03706b REQ-2303: 支持自定义按钮 2024-04-22 20:26:21 +08:00
yanglin
ca2ad1d435 REQ-2303: 支持自定义按钮 2024-04-22 20:25:54 +08:00
yanglin
f00e59a647 REQ-2303: 支持自定义按钮 2024-04-22 20:24:09 +08:00
yanglin
ebef8d1023 REQ-2303: 添加字段区分是否为系统/自定义按钮 2024-04-22 20:15:32 +08:00
yanglin
ea4e774f18 REQ-2303: 支持自定义按钮 2024-04-22 20:01:33 +08:00
yanglin
383a1e1f0d REQ-2303: 支持自定义按钮 2024-04-22 19:52:29 +08:00
yanglin
41ac780a08 REQ-2303: backup 2024-04-22 18:47:18 +08:00
yanglin
f988245459 REQ-2303: backup 2024-04-22 18:02:44 +08:00
yanglin
8065d690f5 hotfix: 统计出现NPE 2024-04-18 18:44:42 +08:00
yanglin
5b028d67c2 REQ-2135: 发送IM消息没有配置端时, 报错 2024-04-10 21:14:36 +08:00
yanglin
e1ee74f721 REQ-2135: 提供新的接口来更新业务终态 2024-04-10 17:37:00 +08:00
yanglin
90bca19c93 REQ-2135: queryType 2024-04-10 15:09:40 +08:00
yanglin
9740b934de REQ-2135: queryType 2024-04-10 14:49:07 +08:00
yanglin
9d53dd145b REQ-2135: 通过queryType区分待办是哪个tab发起的 2024-04-10 11:27:15 +08:00
yanglin
a93a240a2f REQ-2135: 查询待办返回更多内容 2024-04-10 09:31:32 +08:00
yanglin
4e0c0fe836 REQ-2135: 更新占位方法, 兼容其它分支 2024-04-09 13:54:16 +08:00
yanglin
f76a34542a REQ-2135: backup 2024-04-07 18:25:57 +08:00
yanglin
33cc55f556 REQ-2135: 包引入 2024-04-07 17:06:22 +08:00
yanglin
3daaa2f391 Merge branch 'refs/heads/REQ-2129' into REQ-2135-2129
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
#	inside-notices/src/main/java/cn/axzo/msg/center/mq/RocketMQConfig.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/PresetButtonPressedMessage.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PersonV3DTO.java
2024-04-07 17:05:36 +08:00
yanglin
6dccf6dc34 REQ-2135: 尝试使用查询到的项目部类型 2024-04-07 16:27:24 +08:00
yanglin
acb00e6226 REQ-2135: 添加返回业务终态 2024-04-07 14:59:46 +08:00
yanglin
31b22bf0c9 REQ-2135: 解决@Builder问题 2024-04-07 11:44:01 +08:00
yanglin
f062fa756b REQ-2135: 格式化代码 2024-04-07 11:38:05 +08:00