From 7c23177f6a10c43479e0fb77ac53664ba0c0f9f3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 二月 2025 14:41:38 +0800
Subject: [PATCH] 节前发版代码
---
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 20 ++++++++++----------
ycl-server/src/main/java/com/ycl/task/PlatformTask.java | 18 +++++++++---------
ycl-server/src/main/java/com/ycl/task/UYTask.java | 2 +-
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 2 +-
ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java | 5 +++--
5 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
index d38155f..a127ff9 100644
--- a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
+++ b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
@@ -274,16 +274,16 @@
if(StringUtils.isNotEmpty(name) && name.contains("|")){
String[] osdNames = name.split("\\|");
//鍓旈櫎鎺夌┖涓�
- List<String> nonEmptyList = new ArrayList<>();
- for (String osd : osdNames) {
- if (StringUtils.isNotEmpty(osd)) {
- nonEmptyList.add(osd);
- }
- }
- result.setOSD1(nonEmptyList.get(0));
- result.setOSD2(nonEmptyList.get(1));
- result.setOSD3(nonEmptyList.get(2));
- result.setName(nonEmptyList.get(3));
+// List<String> nonEmptyList = new ArrayList<>();
+// for (String osd : osdNames) {
+// if (StringUtils.isNotEmpty(osd)) {
+// nonEmptyList.add(osd);
+// }
+// }
+ result.setOSD1(osdNames[0]);
+ result.setOSD2(osdNames[1]);
+ result.setOSD3(osdNames[2]);
+ result.setName(osdNames[3]);
}
}
}else {
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
index 0e274f4..9a8ed07 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
@@ -7,6 +7,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
import constant.ApiConstants;
+import constant.CheckConstants;
import constant.CheckThreadConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,11 +68,11 @@
}
});
//閲嶇偣鎸囨尌鍥惧儚鐗规畩澶勭悊锛岀粺涓�閲囩敤鍖哄幙鏁版嵁
- Map<Long, BigDecimal> keyCommandMap = checkIndexVideos.stream().filter(checkIndexVideo -> !checkIndexVideo.getDeptTag() && !checkIndexVideo.getProvinceTag())
+ Map<Long, BigDecimal> keyCommandMap = checkIndexVideos.stream().filter(checkIndexVideo -> CheckConstants.Examine_Tag_County.equals(checkIndexVideo.getExamineTag()))
.collect(Collectors.toMap(checkIndexVideo -> checkIndexVideo.getDeptId(), checkIndexVideo -> checkIndexVideo.getKeyCommandImageOnline()));
for (CheckIndexVideo checkIndexVideo : checkIndexVideos) {
//鏇挎崲鐪佸巺鍜岄儴绾� 閲嶇偣鎸囨尌鍥惧儚
- if(checkIndexVideo.getProvinceTag() || checkIndexVideo.getDeptTag()){
+ if(CheckConstants.Examine_Tag_Province.equals(checkIndexVideo.getExamineTag()) || CheckConstants.Examine_Tag_Dept.equals(checkIndexVideo.getExamineTag())){
BigDecimal keyCommand = keyCommandMap.get(checkIndexVideo.getDeptId());
checkIndexVideo.setKeyCommandImageOnline(keyCommand);
}
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 76a5402..f9ca8df 100644
--- a/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
@@ -45,7 +45,7 @@
private static final String DICT_TYPE = "platform_online";
private static final ExecutorService executorService = new ThreadPoolExecutor(16,
- 128,
+ 64,
5000,
TimeUnit.SECONDS,
new ArrayBlockingQueue<>(1000),
@@ -68,17 +68,17 @@
for (int tryTimes = 1; tryTimes < 3; tryTimes++) {
// 涓夌鏈猵ing閫氶噸璇曚竴娆★紝濡傛灉涓嶈鎵嶆墸鍒�
reachable = InetAddress.getByName(platform.getPlatformIP()).isReachable(3000);
- if (! reachable && tryTimes == 0) {
- continue;
- }
- if (! reachable) {
- // 濡傛灉ping涓嶉�氾紝绂荤嚎鏃堕暱鍔�5绉�
- redisTemplate.opsForValue().increment(REDIS_KEY_PREFIX + platform.getPlatformIP(), 5);
- log.warn(platform.getPlatformName() + "骞冲彴鏈猵ing閫�");
+ if (reachable) {
+ break;
}
}
+ if (!reachable) {
+ // 濡傛灉ping涓嶉�氾紝绂荤嚎鏃堕暱鍔�5绉�
+ redisTemplate.opsForValue().increment(REDIS_KEY_PREFIX + platform.getPlatformIP(), 5);
+ log.warn(platform.getPlatformName() + "骞冲彴鏈猵ing閫�");
+ }
} catch (Exception e) {
- log.error("妫�鏌ュ钩鍙拌繛閫氭�ф椂鍙戠敓閿欒", e);
+ log.error("妫�鏌ュ钩鍙拌繛閫氭�ф椂鍙戠敓d閿欒", e);
}
});
}
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index c4887a3..81fc81c 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -214,7 +214,7 @@
OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time);
return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛
}, executorService)
- .orTimeout(120, TimeUnit.SECONDS)
+ .orTimeout(180, TimeUnit.SECONDS)
.exceptionally(ex -> {
if (ex instanceof TimeoutException) {
log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp());
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index cd84be6..e18e830 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -396,7 +396,7 @@
IFNULL(SUM(IF((p.online = 1 and p.ping_online = 1), 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF((p.online = -1 or p.ping_online = -1), 1, 0)), 0) AS postsPercentage,
IFNULL(SUM(IF((p.online = 0 and p.ping_online = 0), 1, 0)), 0) AS unknownNumbers,
- IFNULL(ROUND(SUM(IF((p.online = 1 and p.online= 1), 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
+ IFNULL(ROUND(SUM(IF((p.online = 1 and p.ping_online= 1), 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
FROM t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number
left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
--
Gitblit v1.8.0