From d74e1672af99afd7e6a24327deb22b308dd5fc88 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 04 十二月 2023 08:38:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
index fe14f86..0a2e420 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
@@ -82,7 +82,7 @@
* @param logParentPath
* @return
*/
- //@Override
+ @Override
public List<LocalLogVO> getSystemLogList(String logParentPath) {
List<LocalLogVO> localLogsVO = new ArrayList<>();
// 涓嶄负绌鸿鏄庢槸鍔犺浇褰撳墠杩欎釜鏈嶅姟璺緞涓嬬殑鏃ュ織鏂囦欢
@@ -90,44 +90,48 @@
File file = new File(logParentPath);
if (file.isDirectory()) {
File[] files = file.listFiles();
- Arrays.stream(files).forEach(item->{
- // 缁勫缓鏃ュ織鏂囦欢瀵硅薄
- LocalLogVO localLog = new LocalLogVO();
- localLog.setLogName(item.getName());
- localLog.setLogType(getLogType(item.getName()));
- localLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
- localLog.setLastModifier(getLastModifiedOrCreatTime(true,logParentPath));
- localLog.setLogPath(logParentPath);
- String serviceId = getServiceId(logParentPath);
- localLog.setServiceId(serviceId);
- localLog.setServiceName(getServiceName(serviceId));
- localLog.setHasChildren(false);
- localLogsVO.add(localLog);
- });
+ if(Func.isNotEmpty(files) && files.length>0){
+ Arrays.stream(files).forEach(item->{
+ // 缁勫缓鏃ュ織鏂囦欢瀵硅薄
+ LocalLogVO localLog = new LocalLogVO();
+ localLog.setLogName(item.getName());
+ localLog.setLogType(getLogType(item.getName()));
+ localLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
+ localLog.setLastModifier(getLastModifiedOrCreatTime(true,logParentPath));
+ localLog.setLogPath(logParentPath);
+ String serviceId = getServiceId(logParentPath);
+ localLog.setServiceId(serviceId);
+ localLog.setServiceName(getServiceName(serviceId));
+ localLog.setHasChildren(false);
+ localLogsVO.add(localLog);
+ });
+ }
}
}else {
File fileDir = new File(PARENTPATH);
File[] childDir = fileDir.listFiles();
- Arrays.stream(childDir).forEach(dir->{
- if(dir.getName().contains("ubcs_")){
- String fullPath = dir.getPath() + LOGPATH;
- File file = new File(fullPath);
- if(file.exists()){
- LocalLogVO localLogVO = new LocalLogVO();
- localLogVO.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
- localLogVO.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
- localLogVO.setLogPath(fullPath);
- String serviceId = getServiceId(file.getPath());
- localLogVO.setServiceId(serviceId);
- String serviceName = getServiceName(serviceId);
- localLogVO.setServiceName(serviceName);
- localLogVO.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
- localLogVO.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
- localLogVO.setHasChildren(true);
- localLogsVO.add(localLogVO);
+ if(Func.isNotEmpty(childDir) && childDir.length > 0){
+ Arrays.stream(childDir).forEach(dir->{
+ if(dir.getName().contains("ubcs_")){
+ String fullPath = dir.getPath() + LOGPATH;
+ File file = new File(fullPath);
+ if(file.exists()){
+ LocalLogVO localLogVO = new LocalLogVO();
+ localLogVO.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
+ localLogVO.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
+ localLogVO.setLogPath(fullPath);
+ String serviceId = getServiceId(file.getPath());
+ localLogVO.setServiceId(serviceId);
+ String serviceName = getServiceName(serviceId);
+ localLogVO.setServiceName(serviceName);
+ localLogVO.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
+ localLogVO.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
+ localLogVO.setHasChildren(true);
+ localLogsVO.add(localLogVO);
+ }
}
- }
- });
+ });
+ }
}
return localLogsVO;
}
--
Gitblit v1.9.3