From 25e129946ade607c6cc163dfc282eff42a326d58 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 26 十一月 2023 19:29:50 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 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 26c069a..55114e0 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
@@ -1,5 +1,6 @@
 package com.vci.ubcs.log.service.impl;
 
+import com.vci.ubcs.log.enumpack.ServiceNameRoleEnum;
 import com.vci.ubcs.log.vo.LocalLogVO;
 import com.vci.ubcs.log.service.ILogLocalService;
 import com.vci.ubcs.log.entity.LocalLog;
@@ -76,8 +77,8 @@
 	 * @return
 	 */
 	//@Override
-	public List<LocalLog> getSystemLogList(String logParentPath) {
-		List<LocalLog> localLogs = new ArrayList<>();
+	public List<LocalLogVO> getSystemLogList(String logParentPath) {
+		List<LocalLogVO> localLogsVO = new ArrayList<>();
 		// 涓嶄负绌鸿鏄庢槸鍔犺浇褰撳墠杩欎釜鏈嶅姟璺緞涓嬬殑鏃ュ織鏂囦欢
 		if(Func.isNotEmpty(logParentPath)){
 			File file = new File(logParentPath);
@@ -85,7 +86,7 @@
 				File[] files = file.listFiles();
 				Arrays.stream(files).forEach(item->{
 					// 缁勫缓鏃ュ織鏂囦欢瀵硅薄
-					LocalLog localLog = new LocalLog();
+					LocalLogVO localLog = new LocalLogVO();
 					localLog.setLogName(item.getName());
 					localLog.setLogType(getLogType(item.getName()));
 					localLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
@@ -95,7 +96,7 @@
 					localLog.setServiceId(serviceId);
 					localLog.setServiceName(getServiceName(serviceId));
 					localLog.setHasChildren(false);
-					localLogs.add(localLog);
+					localLogsVO.add(localLog);
 				});
 			}
 		}else {
@@ -106,23 +107,23 @@
 					String fullPath = dir.getPath() + LOGPATH;
 					File file = new File(fullPath);
 					if(file.exists()){
-						LocalLog localLog = new LocalLog();
-						localLog.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
-						localLog.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
-						localLog.setLogPath(fullPath);
+						LocalLogVO localLogVO = new LocalLogVO();
+						localLogVO.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
+						localLogVO.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
+						localLogVO.setLogPath(fullPath);
 						String serviceId = getServiceId(file.getPath());
-						localLog.setServiceId(serviceId);
+						localLogVO.setServiceId(serviceId);
 						String serviceName = getServiceName(serviceId);
-						localLog.setServiceName(serviceName);
-						localLog.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
-						localLog.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
-						localLog.setHasChildren(true);
-						localLogs.add(localLog);
+						localLogVO.setServiceName(serviceName);
+						localLogVO.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
+						localLogVO.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
+						localLogVO.setHasChildren(true);
+						localLogsVO.add(localLogVO);
 					}
 				}
 			});
 		}
-		return localLogs;
+		return localLogsVO;
 	}
 
 	/**
@@ -187,7 +188,8 @@
 	 * @return
 	 */
 	private String getServiceName(String serViceId){
-		return EnumCache.getValue(EnumEnum.SERCIVE_NAME_ROLE, serViceId);
+		// EnumCache.getValue(EnumEnum.SERCIVE_NAME_ROLE, serViceId)
+		return ServiceNameRoleEnum.getTextByValue(serViceId);
 	}
 
 	/**

--
Gitblit v1.9.3