From 966d7f90a7283ded1063bc5f6929dd19469733c6 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 30 May 2022 10:06:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E5=A4=9A=E4=B8=AA=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=86=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/sys/log/LogService.java | 50 ++++++++----------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java index b3687f1cbc..9d17948db8 100644 --- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java +++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; @@ -46,15 +47,14 @@ public class LogService { private static Integer[] driver_file_ope = {11, 3}; - // 排除驱动和驱动文件的公共操作的资源类型 // 暂时屏蔽视图日志 // private static Integer[] COMMON_SOURCE = {1, 2,3,4,6,7,8,9}; - private static Integer[] COMMON_SOURCE = {1, 2,3,6,7,8,9}; + private static Integer[] COMMON_SOURCE = {1, 2, 3, 6, 7, 8, 9}; // 增 改 删 针对公共资源的操作 - private static Integer[] COMMON_SOURCE_OPERATE = {1 ,2 , 3}; + private static Integer[] COMMON_SOURCE_OPERATE = {1, 2, 3}; // 授权相关操作 private static Integer[] AUTH_OPERATE = {6, 7}; @@ -63,10 +63,6 @@ public class LogService { private static Integer[] AUTH_SOURCE = {1, 2, 3, 11}; - - - - @Resource private SysLogMapper sysLogMapper; @@ -77,7 +73,6 @@ public class LogService { private LogManager logManager; - public List query(BaseGridRequest request) { request = detailRequest(request); @@ -90,8 +85,8 @@ public class LogService { private BaseGridRequest detailRequest(BaseGridRequest request) { List conditions = request.getConditions(); if (CollectionUtils.isNotEmpty(conditions)) { - ConditionEntity optypeCondition = null; - ConditionEntity sourceCondition = null; + + ConditionEntity uninCondition = null; int matchIndex = -1; for (int i = 0; i < conditions.size(); i++) { ConditionEntity conditionEntity = conditions.get(i); @@ -100,23 +95,21 @@ public class LogService { if (StringUtils.isNotBlank(field) && StringUtils.equals("optype", field) && ObjectUtils.isNotEmpty(value)) { matchIndex = i; - optypeCondition = new ConditionEntity(); - sourceCondition = new ConditionEntity(); + uninCondition = new ConditionEntity(); + List values = (List) value; - sourceCondition.setField("source_type"); - optypeCondition.setField("operate_type"); - List opValue = values.stream().map(v -> Integer.parseInt(v.split("-")[0])).collect(Collectors.toList()); - List soValue = values.stream().map(v -> Integer.parseInt(v.split("-")[1])).collect(Collectors.toList()); - optypeCondition.setValue(opValue); - sourceCondition.setValue(soValue); - optypeCondition.setOperator(conditionEntity.getOperator()); - sourceCondition.setOperator(conditionEntity.getOperator()); + uninCondition.setField("concat(operate_type, '-de-', source_type)"); + + List uninValue = values.stream().map(v -> v.replace("-", "-de-")).collect(Collectors.toList()); + + uninCondition.setValue(uninValue); + uninCondition.setOperator(conditionEntity.getOperator()); } } - if (matchIndex >= 0 ) { + if (matchIndex >= 0) { conditions.remove(matchIndex); - if (ObjectUtils.isNotEmpty(optypeCondition))conditions.add(optypeCondition); - if (ObjectUtils.isNotEmpty(sourceCondition))conditions.add(sourceCondition); + + if (ObjectUtils.isNotEmpty(uninCondition)) conditions.add(uninCondition); } } return request; @@ -140,7 +133,7 @@ public class LogService { String operateTypeName = SysLogConstants.operateTypeName(operateVal); FolderItem folderItem = new FolderItem(); folderItem.setId(operateVal + "-" + sourceVal); - folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName)); + folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName)); results.add(folderItem); } } @@ -152,7 +145,7 @@ public class LogService { folderItem.setId(driver_file_ope[i] + "-" + sourceType.getValue()); String operateTypeName = SysLogConstants.operateTypeName(driver_file_ope[i]); String sourceTypeName = sourceType.getName(); - folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName)); + folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName)); results.add(folderItem); } @@ -166,7 +159,7 @@ public class LogService { String operateTypeName = SysLogConstants.operateTypeName(operateVal); FolderItem folderItem = new FolderItem(); folderItem.setId(operateVal + "-" + sourceVal); - folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName)); + folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName)); results.add(folderItem); } } @@ -177,12 +170,11 @@ public class LogService { folderItem.setId(panel_ext_ope[i] + "-" + sourceType.getValue()); String operateTypeName = SysLogConstants.operateTypeName(panel_ext_ope[i]); String sourceTypeName = sourceType.getName(); - folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName)); + folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName)); results.add(folderItem); } - return results; } @@ -215,7 +207,6 @@ public class LogService { } - public void exportExcel(BaseGridRequest request) throws Exception { request = detailRequest(request); HttpServletResponse response = ServletUtils.response(); @@ -285,5 +276,4 @@ public class LogService { } - }