gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat: 2.0.3

Browse Source 
1. 优化迁移代码逻辑
This commit is contained in:
byteblogs168 2023-07-26 09:28:57 +08:00
parent a320cbb266
commit e99ba2ef1e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java
View File

@ -33,7 +33,6 @@ import com.aizuda.easy.retry.server.service.convert.RetryTaskConverter;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -233,6 +232,7 @@ public class RetryServiceImpl implements RetryService {
waitDelDeadLetters.addAll(finishCallbackRetryIdList); waitDelDeadLetters.addAll(finishCallbackRetryIdList);
} }
RequestDataHelper.setPartition(groupName);
Assert.isTrue(waitDelDeadLetters.size() == retryTaskMapper.deleteBatchIds(waitDelDeadLetters), Assert.isTrue(waitDelDeadLetters.size() == retryTaskMapper.deleteBatchIds(waitDelDeadLetters),
() -> new EasyRetryServerException("删除重试数据失败 [{}]", JsonUtil.toJsonString(retryTasks))); () -> new EasyRetryServerException("删除重试数据失败 [{}]", JsonUtil.toJsonString(retryTasks)));
@ -246,6 +246,9 @@ public class RetryServiceImpl implements RetryService {
* @param retryTasks 待迁移数据 * @param retryTasks 待迁移数据
*/ */
private void moveDeadLetters(String groupName, List<RetryTask> retryTasks) { private void moveDeadLetters(String groupName, List<RetryTask> retryTasks) {
if (CollectionUtils.isEmpty(retryTasks)) {
return;
}
List<RetryDeadLetter> retryDeadLetters = RetryDeadLetterConverter.INSTANCE.toRetryDeadLetter(retryTasks); List<RetryDeadLetter> retryDeadLetters = RetryDeadLetterConverter.INSTANCE.toRetryDeadLetter(retryTasks);

2
pom.xml
View File

@ -21,7 +21,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<revision>2.0.2</revision> <revision>2.0.3-SNAPSHOT</revision>
<dingding-talk.version>1.0.0</dingding-talk.version> <dingding-talk.version>1.0.0</dingding-talk.version>
<hibernate-validator.version>5.4.2.Final</hibernate-validator.version> <hibernate-validator.version>5.4.2.Final</hibernate-validator.version>
<netty-all.version>4.1.48.Final</netty-all.version> <netty-all.version>4.1.48.Final</netty-all.version>