From 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 20:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/PlatformTask.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/PlatformTask.java b/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
index ab38afb..31643e7 100644
--- a/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
@@ -81,6 +81,7 @@
log.error("妫�鏌ュ钩鍙拌繛閫氭�ф椂鍙戠敓閿欒", e);
}
});
+ executorService.shutdown();
}
}
@@ -99,20 +100,18 @@
Object outLineTime = redisTemplate.opsForValue().get(REDIS_KEY_PREFIX + platform.getPlatformIP());
Integer outlineTimeSed = Objects.isNull(outLineTime) ? 0 : (Integer) outLineTime;
PlatformOnline one = new LambdaQueryChainWrapper<>(platformOnlineService.getBaseMapper())
- .eq(PlatformOnline::getPlatformIp, platform.getPlatformIP())
+ .eq(PlatformOnline::getPlatformId, platform.getId())
.eq(PlatformOnline::getCreateDate, sqlDate)
.one();
if (Objects.isNull(one)) {
one = new PlatformOnline();
- one.setPlatformIp(platform.getPlatformIP());
- one.setPlatformName(platform.getPlatformName());
+ one.setPlatformId(platform.getId());
one.setCreateDate(sqlDate);
one.setTodayOutlineSed(outlineTimeSed);
} else {
one.setTodayOutlineSed(one.getTodayOutlineSed() + outlineTimeSed);
}
- one.setPlatformIp(platform.getPlatformIP());
- one.setPlatformName(platform.getPlatformName());
+ one.setPlatformId(platform.getId());
one.setCreateDate(sqlDate);
platformOnlineService.saveOrUpdate(one);
--
Gitblit v1.8.0