From bce3fcf05020405e33199706c3d91e9b9a71bd39 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 01 十二月 2023 12:42:05 +0800
Subject: [PATCH] 关键属性查重特殊字符转义添加
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 72 ++++++++++++-----------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/SpecialCharacterConverter.java | 35 +++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 7 +-
Source/UBCS-WEB/src/views/monitor/log/operateLog.vue | 8 +-
5 files changed, 82 insertions(+), 42 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
index 0a8653f..f8aee43 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
@@ -63,18 +63,18 @@
label: "鐢ㄦ埛鍚�",
prop: "userName",
search: true,
- width:'100'
+ width:'120'
},
{
label: "濮撳悕",
prop: "realName",
search: true,
- width:'100'
+ width:'120'
},
{
label: "鐢ㄦ埛ip",
prop: "ip",
- width:'100'
+ width:'130'
},
{
label: "妯″潡",
@@ -89,7 +89,7 @@
{
label: "鎿嶄綔缁撴灉",
prop: "operateResult",
- width:'100'
+ width:'110'
},
{
label: "鎻忚堪",
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;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/SpecialCharacterConverter.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/SpecialCharacterConverter.java
new file mode 100644
index 0000000..f5e9c38
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/SpecialCharacterConverter.java
@@ -0,0 +1,35 @@
+package com.vci.ubcs.starter.util;
+
+import net.logstash.logback.encoder.org.apache.commons.lang3.StringEscapeUtils;
+
+/**
+ *
+ * @author ludc
+ * @date 2023/12/1 9:16
+ */
+public class SpecialCharacterConverter {
+
+ /**
+ * 鐗规畩瀛楃杞箟
+ * @param input
+ * @return
+ */
+ public static String escapeSpecialCharacters(String input) {
+ input = input.replace("'", "''"); // 杞箟鍗曞紩鍙�
+ input = input.replace("\"", "\\\""); // 杞箟鍙屽紩鍙�
+ input = input.replace("%", "\\%"); // 杞箟鐧惧垎鍙�
+ input = input.replace("_", "\\_"); // 杞箟涓嬪垝绾�
+ input = input.replace("\\", "\\\\"); // 杞箟鍙嶆枩鏉�
+ return input;
+ }
+
+ public static String unescapeSpecialCharacters(String input) {
+ input = input.replace("''", "'"); // 鍙嶈浆涔夊崟寮曞彿
+ input = input.replace("\\\"", "\""); // 鍙嶈浆涔夊弻寮曞彿
+ input = input.replace("\\%", "%"); // 鍙嶈浆涔夌櫨鍒嗗彿
+ input = input.replace("\\_", "_"); // 鍙嶈浆涔変笅鍒掔嚎
+ input = input.replace("\\\\", "\\"); // 鍙嶈浆涔夊弽鏂滄潬
+ return input;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 2dd56b5..094677d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -44,6 +44,7 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.SaveLogUtil;
+import com.vci.ubcs.starter.util.SpecialCharacterConverter;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
@@ -791,6 +792,7 @@
sql[0] += " and oid != '" + orderDTO.getCopyFromVersion() + "'";
}
sql[0] += " and lastR = '1' and lastV = '1' ";
+ // 鑾峰彇涓嶅弬涓庢牎楠岀殑鍒嗙被oid
String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
if(Func.isNotEmpty(isParticipateCheckOids)){
sql[0] += " and codeclsfid not in(" + isParticipateCheckOids + ")";
@@ -1193,12 +1195,12 @@
temp = "%s";
}
queryKey = String.format(temp, "nvl("+ "t." + attrId +",'/')");
- queryValue = String.format(temp, "'" + (trim ? value.trim() : value) + "'");
+ queryValue = String.format(temp, "'" + (trim ? SpecialCharacterConverter.escapeSpecialCharacters(value.trim()):SpecialCharacterConverter.escapeSpecialCharacters(value)) + "'");
conditionMap.put(queryKey, queryValue);
} else {
if(StringUtils.isNotBlank(value)) {
//涓虹┖鐨勬椂鍊欎笉浠ｈ〃涓嶆牎楠岋紝鍙槸涓嶅幓闄ょ浉鍏崇殑淇℃伅
- conditionMap.put("nvl("+ "t." + attrId+",'/')", "'" + value + "'");
+ conditionMap.put("nvl("+ "t." + attrId+",'/')", "'" + SpecialCharacterConverter.escapeSpecialCharacters(value) + "'");
}else{
conditionMap.put("t." + attrId, QueryOptionConstant.ISNULL);
}
@@ -2472,7 +2474,6 @@
return getSqlByValue(key, value, attrVOMap,btmType);
}
}*/
-
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 371139a..99278b3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -3824,7 +3824,7 @@
private void batchSwitchClassifyAttrOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS,List<ClientBusinessObject> dataList,
CodeClassifyFullInfoBO classifyFullInfo,boolean isImPort) {
Map<String, CodeClassifyTemplateAttrVO> dateAttrVOMap = attrVOS.stream().filter(
- s -> StringUtils.isNotBlank(s.getClassifyInvokeAttr()) && StringUtils.isNotBlank(s.getClassifyInvokeAttr())
+ s -> StringUtils.isNotBlank(s.getClassifyInvokeAttr())
).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
Map<String,CodeClassifyFullInfoBO> classifyFullInfoMap=new HashMap<>();
classifyFullInfoMap.put(classifyFullInfo.getCurrentClassifyVO().getOid(),classifyFullInfo);
--
Gitblit v1.9.3