From f817fc02cdce69d7f2f014b71e4d0e3b5f1ba455 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 27 十一月 2023 09:30:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 | 182 ++++++++++++++++++++++++++++++++++++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 69 +++++++++----
Source/UBCS-WEB/src/views/monitor/log/localLog.vue | 15 ++
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 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 10 -
8 files changed, 259 insertions(+), 35 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
index 90d9130..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: "鏈嶅姟鍚嶇О",
@@ -121,11 +121,18 @@
};
}
},
- methods: {
-
+ methods: {
+ // 鍒ゆ柇瀹㈡埛绔墍鍦ㄧ殑鎿嶄綔绯荤粺骞冲彴
+ isWindows() {
+ return navigator.platform.indexOf('Win') !== -1
+ },
+ // 鏍规嵁鎿嶄綔绯荤粺骞冲彴杩斿洖鐩稿簲鐨勮矾寰勫垎闅旂
+ getPathSeparator() {
+ return this.isWindows() ? '\\' : '/'
+ },
downLoadLogFile(row){
this.downloadLoading = true;
- let logPath = row.hasChildren ? row.logPath:row.logPath+"\\"+row.logName;
+ let logPath = row.hasChildren ? row.logPath:row.logPath+this.getPathSeparator()+row.logName;
downLoadLog(Object.assign({},row,{logFullPaths:logPath})).then(res=>{
func.downloadFileByBlobHandler(res);
this.downloadLoading = false;
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..e65283e
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
@@ -0,0 +1,182 @@
+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","鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟"),
+
+ /**
+ * 鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟
+ */
+ UBCS_ADMIN("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 fb50d00..fe14f86 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;
@@ -15,6 +16,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -35,7 +38,7 @@
*/
@Service
@Slf4j
-public class LogLocalServiceImpl implements ILogLocalService{
+public class LogLocalServiceImpl implements ILogLocalService, EnvironmentAware {
/**
* 鍚勪釜鏈嶅姟瀛樻斁鐨勭殑鐖惰矾寰�
@@ -54,9 +57,13 @@
*/
private Boolean isWindows = true;
- {
- String os = System.getProperty("os.name").toLowerCase();
- //榛樿灏遍厤缃负windows鐨勶紝濡傛灉涓嶆槸褰撳墠绯荤粺涓嶆槸windows灏遍渶瑕佸鍏惰浆鎹负linux鐨勬枃浠惰矾寰勬牸寮�
+ /**
+ * 鏍规嵁褰撳墠杩愯鐨勭幆澧冿紝瀵归厤缃殑鏃ュ織璺緞鏍煎紡杩涜璋冩暣
+ * @param environment
+ */
+ @Override
+ public void setEnvironment(Environment environment) {
+ String os = environment.getProperty("os.name").toLowerCase();
if (!os.contains("win")) {
this.PARENTPATH = this.PARENTPATH.substring(this.PARENTPATH.lastIndexOf(":") + 1).replace("\\", "/");
this.LOGPATH = this.LOGPATH.replace("\\", "/");
@@ -76,8 +83,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 +92,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 +102,7 @@
localLog.setServiceId(serviceId);
localLog.setServiceName(getServiceName(serviceId));
localLog.setHasChildren(false);
- localLogs.add(localLog);
+ localLogsVO.add(localLog);
});
}
}else {
@@ -105,22 +112,24 @@
if(dir.getName().contains("ubcs_")){
String fullPath = dir.getPath() + LOGPATH;
File file = new File(fullPath);
- LocalLog localLog = new LocalLog();
- localLog.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
- localLog.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
- localLog.setLogPath(fullPath);
- String serviceId = getServiceId(file.getPath());
- localLog.setServiceId(serviceId);
- String serviceName = getServiceName(serviceId);
- localLog.setServiceName(serviceName);
- localLog.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
- localLog.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
- localLog.setHasChildren(true);
- localLogs.add(localLog);
+ 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 localLogs;
+ return localLogsVO;
}
/**
@@ -185,7 +194,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);
}
/**
@@ -215,7 +225,7 @@
throw new ServerException("鏈幏鍙栧埌璇ユ棩蹇楄矾寰勶紒");
}
FileObjectBO fileObjectBO = new FileObjectBO();
- String logFullPaths = localLogVO.getLogFullPaths();
+ String logFullPaths = this.convertWindows2Linux(localLogVO.getLogFullPaths());
// 鍒ゆ柇鏄惁鏄埗鐩綍
if(!localLogVO.getHasChildren()){
//鍙笅杞戒竴涓棩蹇楁枃浠�
@@ -273,6 +283,19 @@
}
/**
+ * 涓嬭浇涔嬪墠灏唚indows鐨勮矾寰勬牸寮忚浆鎹负linux
+ * @param fullPath
+ * @return
+ */
+ private String convertWindows2Linux(String fullPath){
+ String os = System.getProperty("os.name").toLowerCase();
+ if (!os.contains("win")) {
+ fullPath = fullPath.replace("\\", "/");
+ }
+ return fullPath;
+ }
+
+ /**
* 鍒犻櫎鏃ュ織鏂囦欢
* @param localLogVO 鏂囦欢鍏ㄨ矾寰勯泦鍚�
* @throws ServerException
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 3e1bc24..4014bcf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -104,7 +104,6 @@
// && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
){
//鏄巻鍙叉暟鎹鍏�
- //鍘嗗彶鏁版嵁鎵ц鐨勬椂鍊欙紝杩欎釜绯荤粺浼氬緢鍗�
//涓昏鏄负浜嗗綍鍏ユ渶澶ф祦姘村彿鍜宎llcode
//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
List<CodeAllCode> allCodeDOList = new CopyOnWriteArrayList<>();
@@ -419,7 +418,6 @@
allCodeDOList.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
s.setLcStatus(statusMap.get(s.getOid()));
});
-
//閫氳繃ID鏉ヨ繘琛屽幓閲�
List<CodeAllCode> distinctCodeAllCOdes = allCodeDOList.stream().collect(Collectors
@@ -772,20 +770,20 @@
/**
* 鎷兼帴鍓嶅悗缂�
- * @param secVO
- * @param secValue
+ * @param secVO 鐮佹
+ * @param secValue 鐮佸��
* @return
*/
private String joinPreffixAndSuffix(CodeBasicSecVO secVO, String secValue){
StringBuilder joinSecValue = new StringBuilder();
// 鎷兼帴鍓嶇紑
- if (Func.isNotEmpty(secVO.getPrefixCode())) {
+ if (Func.isNotEmpty(secVO.getPrefixCode()) && Func.isNotEmpty(secValue)) {
joinSecValue = joinSecValue.append(secVO.getPrefixCode());
}
// 鍦ㄤ腑闂存嫾鎺ュ��
joinSecValue.append(secValue);
// 鎷兼帴鍚庣紑
- if(Func.isNotEmpty(secVO.getSuffixCode())){
+ if(Func.isNotEmpty(secVO.getSuffixCode()) && Func.isNotEmpty(secValue)){
joinSecValue = joinSecValue.append(secVO.getSuffixCode());
}
return joinSecValue.toString();
--
Gitblit v1.9.3