diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/QiYeWechatAlarm.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/QiYeWechatAlarm.java index 8ab50195c..2b1b8a929 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/QiYeWechatAlarm.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/QiYeWechatAlarm.java @@ -30,7 +30,7 @@ public class QiYeWechatAlarm extends AbstractAlarm { @Override public Integer getAlarmType() { - return AlarmTypeEnum.QI_YE_WECHAT.getValue(); + return AlarmTypeEnum.WE_COM.getValue(); } @Override diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java index 9661f44b7..25de0005d 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java @@ -19,9 +19,9 @@ public enum AlarmTypeEnum { EMAIL(2), /** - * 企业通知 + * 企业微信通知 */ - QI_YE_WECHAT(3), + WE_COM(3), /** * 飞书 diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java index 53d900208..450824c0f 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java @@ -131,9 +131,12 @@ public class ServerRegister extends AbstractRegister { public void start() { SnailJobLog.LOCAL.info("ServerRegister start"); - Register register = SpringContext.getBean(ServerRegister.BEAN_NAME, Register.class); serverRegisterNode.scheduleAtFixedRate(()->{ - register.register(new RegisterContext()); + try { + this.register(new RegisterContext()); + } catch (Exception e) { + SnailJobLog.LOCAL.error("服务端注册失败", e); + } }, 0, DELAY_TIME * 2 / 3, TimeUnit.SECONDS); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyRecipientQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyRecipientQueryVO.java index d86f7edbf..d159c06b4 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyRecipientQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyRecipientQueryVO.java @@ -1,11 +1,17 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; +import lombok.Data; /** * @author opensnail * @date 2024-04-17 21:26:22 * @since sj_1.0.0 */ +@Data public class NotifyRecipientQueryVO extends BaseQueryVO { + + private Integer notifyType; + + private String recipientName; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java index 18d8df894..55f8d0291 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.server.web.service.impl; +import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.server.web.model.base.PageResult; import com.aizuda.snailjob.server.web.model.request.NotifyRecipientQueryVO; import com.aizuda.snailjob.server.web.model.request.NotifyRecipientRequestVO; @@ -14,6 +15,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * @author opensnail @@ -29,6 +31,14 @@ public class NotifyRecipientServiceImpl implements NotifyRecipientService { public PageResult> getNotifyRecipientList(NotifyRecipientQueryVO queryVO) { PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StrUtil.isNotBlank(queryVO.getRecipientName())) { + queryWrapper.likeRight(NotifyRecipient::getRecipientName, queryVO.getRecipientName()); + } + + if (Objects.nonNull(queryVO.getNotifyType())) { + queryWrapper.likeRight(NotifyRecipient::getNotifyType, queryVO.getNotifyType()); + } + queryWrapper.orderByDesc(NotifyRecipient::getCreateDt); PageDTO notifyRecipientPageDTO = notifyRecipientMapper.selectPage(pageDTO, queryWrapper);