From 25e129946ade607c6cc163dfc282eff42a326d58 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 26 十一月 2023 19:29:50 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml | 8 ++
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java | 176 ++++++++++++++++++++++++++++++++++++++++++++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 34 ++++----
Source/UBCS-WEB/src/views/monitor/log/localLog.vue | 2
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java | 2
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java | 2
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java | 6 +
7 files changed, 211 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
index ee2fff4..057a888 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
@@ -69,7 +69,7 @@
// menuWidth: 300,
dialogClickModal: false,
highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
- rowKey: "logName", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
+ rowKey: "randomOid", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
column: [
{
label: "鏈嶅姟鍚嶇О",
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml b/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
index 0e5ba31..7697a7f 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
@@ -10,6 +10,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>ubcs-log-api</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
new file mode 100644
index 0000000..26ae095
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
@@ -0,0 +1,176 @@
+package com.vci.ubcs.log.enumpack;
+
+import com.vci.ubcs.starter.web.enumpck.BaseEnum;
+
+/**
+ * @author ludc
+ * @date 2023/11/26 18:54
+ */
+public enum ServiceNameRoleEnum implements BaseEnum {
+
+ /**
+ * 缂栫爜鏈嶅姟
+ */
+ UBCS_CODE("ubcs_code","缂栫爜鏈嶅姟"),
+
+ /**
+ * 閴存潈鏈嶅姟
+ */
+ UBCS_AUTH("ubcs_auth","閴存潈鏈嶅姟"),
+
+ /**
+ * 娴佺▼绠＄悊鏈嶅姟
+ */
+ UBCS_FLOW("ubcs_flow","娴佺▼绠＄悊鏈嶅姟"),
+
+ /**
+ * 瀵硅薄寤烘ā绠＄悊鏈嶅姟
+ */
+ UBCS_OMD("ubcs_omd","瀵硅薄寤烘ā绠＄悊鏈嶅姟"),
+
+ /**
+ * 鏃ュ織绠＄悊鏈嶅姟
+ */
+ UBCS_LOG("ubcs_log","鏃ュ織绠＄悊鏈嶅姟"),
+
+ /**
+ * 闆嗘垚绠＄悊鏈嶅姟
+ */
+ UBCS_APPLYJTCODESERVICE("ubcs_applyjtcodeservice","闆嗘垚绠＄悊鏈嶅姟"),
+
+ /**
+ * 绯荤粺绠＄悊鏈嶅姟
+ */
+ UBCS_SYSTEM("ubcs_system","绯荤粺绠＄悊鏈嶅姟"),
+
+ /**
+ * 棣栭〉妗岄潰鏈嶅姟
+ */
+ UBCS_DESK("ubcs_desk","棣栭〉妗岄潰鏈嶅姟"),
+
+ /**
+ * 鏂囦欢绠＄悊鏈嶅姟
+ */
+ UBCS_RESOURCE("ubcs_resource","鏂囦欢绠＄悊鏈嶅姟"),
+
+ /**
+ * 缃戝叧鏈嶅姟
+ */
+ UBCS_GATEWAY("ubcs_gateway","缃戝叧鏈嶅姟"),
+
+ /**
+ * 鎶ヨ〃鏈嶅姟
+ */
+ UBCS_REPORT("ubcs_report","鎶ヨ〃鏈嶅姟"),
+
+ /**
+ * 鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟
+ */
+ UBCS_USER("ubcs_user","鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟")
+ ;
+
+ /**
+ * 鏋氫妇鐨勫��
+ */
+ private String value;
+
+ /**
+ * 鏋氫妇鏄剧ず鏂囨湰
+ */
+ private String text;
+
+ /**
+ * 鑾峰彇鏋氫妇鍊�
+ *
+ * @return 鏋氫妇鍊�
+ */
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * 璁剧疆鏋氫妇鍊�
+ *
+ * @param value 鏋氫妇鍊�
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ /**
+ * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
+ *
+ * @return 鏄剧ず鏂囨湰
+ */
+ @Override
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * 璁剧疆鏄剧ず鏂囨湰
+ *
+ * @param text 鏄剧ず鏂囨湰
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * 鏋勯�犲嚱鏁�
+ *
+ * @param value 鍊�
+ * @param text 鏄剧ず鏂囨湰
+ */
+ private ServiceNameRoleEnum(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
+
+ /**
+ * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
+ *
+ * @param text 鍚嶇О
+ * @return 鏋氫妇鍊�
+ */
+ public static String getValueByText(String text) {
+ for (ServiceNameRoleEnum wenum : ServiceNameRoleEnum.values()) {
+ if (wenum.getText().equalsIgnoreCase(text)) {
+ return wenum.getValue();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鍚嶇О
+ */
+ public static String getTextByValue(String value) {
+ for (ServiceNameRoleEnum wenum : ServiceNameRoleEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum.getText();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
+ */
+ public static ServiceNameRoleEnum forValue(String value) {
+ for (ServiceNameRoleEnum wenum : ServiceNameRoleEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
index 0daf80e..0065b6d 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.log.vo;
import com.vci.ubcs.log.entity.LocalLog;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import javafx.scene.Parent;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -28,4 +29,9 @@
*/
private String logFullPaths;
+ /**
+ * 闅忔満鐨刼id锛屼负浜嗚В鍐宠〃鏍兼覆鏌搑owkey閲嶅鐨勯棶棰�
+ */
+ private String randomOid = VciBaseUtil.getPk();
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
index 30e70e8..e62e28e 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
@@ -39,7 +39,7 @@
* @return
*/
@PostMapping("/lazy-list")
- public R<List<LocalLog>> getSystemLogList(@RequestBody LocalLog localLog){
+ public R<List<LocalLogVO>> getSystemLogList(@RequestBody LocalLog localLog){
return R.data(logLocalService.getSystemLogList(localLog.getLogPath()));
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
index 7180567..e0d7a25 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
@@ -20,7 +20,7 @@
* @param logParentPath
* @return
*/
- List<LocalLog> getSystemLogList(String logParentPath);
+ List<LocalLogVO> getSystemLogList(String logParentPath);
/**
* 涓嬭浇锛屾牴鎹湇鍔″悕鎵�鍦ㄦ枃浠跺悕鍜屾枃浠跺悕涓嬭浇鏂囦欢
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