From 9553b575fc6af354aeaa8df760f2791ec47d0192 Mon Sep 17 00:00:00 2001 From: wuyu Date: Wed, 22 Nov 2023 15:26:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?+=E6=97=A0=E5=8D=95=E4=BD=8D=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/service/impl/PendingMessageNewServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java index 52d8f435..2dfe882c 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java @@ -574,7 +574,9 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { log.info("get ouId params->{}", JSON.toJSONString(param)); Result result = organizationalNodePractitionerWideApi.getOne(param); log.info("get ouId result->{}", JSON.toJSONString(result)); - return result.getData().getOrganizationalUnitId(); + if(null != result && null != result.getData() && null != result.getData().getOrganizationalUnitId()){ + return result.getData().getOrganizationalUnitId(); + } } return null; } From 50c760cf3f001bdfb63193af6e4a7638c22d3d00 Mon Sep 17 00:00:00 2001 From: luofu Date: Wed, 22 Nov 2023 15:50:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-1507):=20=E8=80=81=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 影响： 无 --- .../controller/MessageAdminController.java | 26 +++++++++++++++++++ .../PendingMessageDataInitServiceImpl.java | 5 ++++ .../request/PendingMessagePageRequest.java | 4 +++ 3 files changed, 35 insertions(+) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageAdminController.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageAdminController.java index 2c0dbfc1..3726d282 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageAdminController.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageAdminController.java @@ -1,14 +1,20 @@ package cn.axzo.msg.center.message.controller; +import cn.axzo.msg.center.dal.MessageBaseTemplateDao; import cn.axzo.msg.center.dal.MessageRouteDetailDao; import cn.axzo.msg.center.dal.MessageRouterConfigDao; import cn.axzo.msg.center.dal.MessageTemplateRouterDao; +import cn.axzo.msg.center.dal.PendingMessageRecordDao; +import cn.axzo.msg.center.domain.entity.MessageBaseTemplate; import cn.axzo.msg.center.domain.entity.MessageRouteDetail; import cn.axzo.msg.center.domain.entity.MessageRouterConfig; import cn.axzo.msg.center.domain.entity.MessageTemplateRouter; +import cn.axzo.msg.center.domain.entity.PendingMessageRecord; import cn.axzo.msg.center.message.service.PendingMessageDataInitService; import cn.axzo.msg.center.service.admin.MessageAdminConsoleClient; +import cn.axzo.msg.center.service.enums.BizCategoryEnum; import cn.axzo.msg.center.service.enums.BizDetailShowStrategyEnum; +import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import cn.azxo.framework.common.model.CommonResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -16,10 +22,13 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -39,6 +48,8 @@ public class MessageAdminController implements MessageAdminConsoleClient { private final MessageTemplateRouterDao messageTemplateRouterDao; private final MessageRouteDetailDao messageRouteDetailDao; private final MessageRouterConfigDao messageRouterConfigDao; + private final MessageBaseTemplateDao messageBaseTemplateDao; + private final PendingMessageRecordDao pendingMessageRecordDao; @Override public CommonResponse transformPendingMessageRecord(Integer diffDays, Long minRecordId) { @@ -46,6 +57,21 @@ public class MessageAdminController implements MessageAdminConsoleClient { return CommonResponse.success(); } + @PostMapping(value = "/admin/console/template/category/adjust", produces = {MediaType.APPLICATION_JSON_VALUE}) + public CommonResponse adjustTemplateCategory(@RequestParam Long id) { + if (Objects.isNull(id)) { + return CommonResponse.success(); + } + messageBaseTemplateDao.lambdaUpdate() + .eq(MessageBaseTemplate::getId, id) + .set(MessageBaseTemplate::getMsgCategory, MessageCategoryEnum.APPROVAL_PENDING_MESSAGE) + .update(); + pendingMessageRecordDao.lambdaUpdate() + .eq(PendingMessageRecord::getBizCategory, BizCategoryEnum.FLOW) + .lt(PendingMessageRecord::getCreateAt, new Date(1700411318)); + return CommonResponse.success(); + } + @PostMapping(value = "/admin/console/template/init-router", produces = {MediaType.APPLICATION_JSON_VALUE}) @Transactional(rollbackFor = Exception.class) public CommonResponse initTemplateRouter() { diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageDataInitServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageDataInitServiceImpl.java index 7cde219b..fa5ac3e3 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageDataInitServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageDataInitServiceImpl.java @@ -22,6 +22,7 @@ import cn.axzo.msg.center.service.enums.PendingMessageStateEnum; import cn.axzo.msg.center.utils.DateFormatUtil; import cn.axzo.msg.center.utils.PersonIdentityUtil; import cn.axzo.msg.center.utils.UUIDUtil; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.RequiredArgsConstructor; @@ -118,6 +119,7 @@ public class PendingMessageDataInitServiceImpl implements PendingMessageDataInit } // 设置ouId pendingMessageRecords.stream() + .filter(e -> Objects.equals(e.getExecutorType(), IdentityTypeEnum.PRACTITIONER)) .filter(e -> ouIdMap.containsKey(getKey(e))) .forEach(e -> e.setOuId(ouIdMap.get(getKey(e)))); //批量插入数据库 @@ -220,4 +222,7 @@ public class PendingMessageDataInitServiceImpl implements PendingMessageDataInit msgTemplateMap.put(564, "fc35f169515e43e39d863b34e5226e5e"); } + private static final ImmutableSet EXCLUDE_WORKSPACE_IDS = ImmutableSet.of(3, 5, 16, 17, 19, 21, 50, 75, 105, + 106, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 119, 120, 122, 123, 124, 125, 126, 131, 132, 140, 141, + 142, 148, 153, 197, 216, 236, 237, 238, 248, 275, 213, 214, 226, 239, 240, 246, 260, 266, 267, 3398); } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java index d3c4e2d9..5eeda698 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java @@ -96,6 +96,10 @@ public class PendingMessagePageRequest extends PageRequest implements Serializab * 工作台id */ private Long workspaceId; + /** + * 单位id + */ + private Long ouId; /** * 排序字段集合 */