lion/lionwebsite-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整初始化顺序,避免重连时有未完成的任务导致初始化失败;修复发送未完成任务时不带名字的bug

Browse Source
This commit is contained in:
chuzhongzai 2025-08-29 16:15:59 +08:00
parent d7ba01be2d
commit 3bdaddaead
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/lion/lionwebsite/Service/RemoteService.java
View File

@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
import java.io.IOException; import java.io.IOException;
import java.net.*; import java.net.*;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -87,10 +88,11 @@ public class RemoteService {
if(pushService != null) if(pushService != null)
pushService.storageNodeOnline(); pushService.storageNodeOnline();
//子节点上线时，发送未完成的任务
resetUndone();
channel = channelFuture.channel(); channel = channelFuture.channel();
channel.writeAndFlush(new IdentityMessage("lionwebsite")); channel.writeAndFlush(new IdentityMessage("lionwebsite"));
//子节点上线时，发送未完成的任务
resetUndone();
return true; return true;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
@ -110,6 +112,7 @@ public class RemoteService {
Gallery[] galleries = galleryMapper.selectUnDoneGalleries(); Gallery[] galleries = galleryMapper.selectUnDoneGalleries();
if(galleries != null && galleries.length != 0) { if(galleries != null && galleries.length != 0) {
log.info("发送未下载完成图片至节点,{}本", galleries.length); log.info("发送未下载完成图片至节点,{}本", galleries.length);
log.info("{}", Arrays.toString(galleries));
for (Gallery gallery : galleries) for (Gallery gallery : galleries)
addGalleryToQueue(gallery); addGalleryToQueue(gallery);
} }
@ -118,6 +121,7 @@ public class RemoteService {
public byte addGalleryToQueue(Gallery gallery){ public byte addGalleryToQueue(Gallery gallery){
GalleryTask galleryTask = new GalleryTask(); GalleryTask galleryTask = new GalleryTask();
galleryTask.setGid(gallery.getGid()); galleryTask.setGid(gallery.getGid());
galleryTask.setName(gallery.getName());
DownloadPostMessage dpm = new DownloadPostMessage(); DownloadPostMessage dpm = new DownloadPostMessage();
dpm.messageId = atomicInteger.getAndIncrement(); dpm.messageId = atomicInteger.getAndIncrement();