From b96ebcad82f8f5245b774358457e65c7d3321226 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Tue, 5 Dec 2023 09:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug2116=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B6=85=E8=BF=8750s=E6=B2=A1=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/system/mapper/AuditMapper.java   |  6 +-
 .../system/mapper/mapping/AuditMapper.xml     | 18 ++---
 .../system/service/impl/AuditServiceImpl.java | 65 +++++++++----------
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AuditMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AuditMapper.java
index 7daf7ccee..c6644345a 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AuditMapper.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AuditMapper.java
@@ -37,13 +37,13 @@ public interface AuditMapper {
      */
     void deleteByTime(@Param("ew") QueryWrapper<UserLog> queryWrapper);
     /**
-     * 查询所有登录名
+     * 查询UserLog
      */
-    List<String> selectLoginName();
+    List<UserLog> selectUserLog();
     /**
      * 查询所有操作类型
      */
-    List<String> selectOperateType();
+//    List<String> selectOperateType();
 
     /**
      * 时间范围查询id集合
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/AuditMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/AuditMapper.xml
index 358ca8792..ad1938399 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/AuditMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/AuditMapper.xml
@@ -103,21 +103,21 @@
         GROUP BY login_name, operate_type
     </select>
 
-    <select id="selectLoginName" resultType="String">
+    <select id="selectUserLog" resultType="com.njcn.system.pojo.po.UserLog">
         SELECT
-        login_name
+        *
         FROM sys_user_log
         WHERE login_name !=""
 		AND login_name !="unknown user"
-        GROUP BY login_name
+
     </select>
 
-    <select id="selectOperateType" resultType="String">
-        SELECT
-        operate_type
-        FROM sys_user_log
-        GROUP BY operate_type
-    </select>
+<!--    <select id="selectOperateType" resultType="String">-->
+<!--        SELECT-->
+<!--        operate_type-->
+<!--        FROM sys_user_log-->
+<!--        GROUP BY operate_type-->
+<!--    </select>-->
     <select id="queryExportLimit" resultType="com.njcn.system.excel.UserLogExcel">
 
         SELECT
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
index ba8bd2fca..2601d2aa9 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
@@ -5,7 +5,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.StopWatch;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -49,7 +48,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -89,26 +91,6 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
                 .eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType())
                 .ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))
                 .le(StrUtil.isNotBlank(auditParam.getSearchEndTime()), UserLog::getCreateTime, DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())))
-                .or(StrUtil.isNotBlank(auditParam.getLoginName()), qw ->
-                        qw.like(StrUtil.isNotBlank(auditParam.getLoginName()), UserLog::getIp, auditParam.getLoginName())
-                                .ne(UserLog::getLoginName, "unknown user")
-                                .ne(UserLog::getLoginName, "")
-                                .ne(UserLog::getOperate, "unknown user")
-                                .eq(auditParam.getType() != null, UserLog::getType, auditParam.getType())
-                                .eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType())
-                                .ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))
-                                .le(StrUtil.isNotBlank(auditParam.getSearchEndTime()), UserLog::getCreateTime, DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())))
-                )
-                .or(StrUtil.isNotBlank(auditParam.getLoginName()), qw ->
-                        qw.like(StrUtil.isNotBlank(auditParam.getLoginName()), UserLog::getCreateTime, auditParam.getLoginName())
-                                .ne(UserLog::getLoginName, "unknown user")
-                                .ne(UserLog::getLoginName, "")
-                                .ne(UserLog::getOperate, "unknown user")
-                                .eq(auditParam.getType() != null, UserLog::getType, auditParam.getType())
-                                .eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType())
-                                .ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))
-                                .le(StrUtil.isNotBlank(auditParam.getSearchEndTime()), UserLog::getCreateTime, DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())))
-                )
                 .orderByDesc(UserLog::getCreateTime)
         );
         Page<AuditLogVO> page = BeanUtil.copyProperties(info, Page.class);
@@ -372,22 +354,33 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
     @Override
     public LogParamVO saveLogParam() {
         LogParamVO logParamVO = new LogParamVO();
-        List<String> loginName = auditMapper.selectLoginName();
-        List<String> operateType = auditMapper.selectOperateType();
-        List<ValuePO> loginNameList = new ArrayList<>();
-        List<ValuePO> operateTypeList = new ArrayList<>();
-        for (int i = 0; i < loginName.size(); i++) {
+        List<UserLog> userLogs = auditMapper.selectUserLog();
+        List<ValuePO> loginNameList = userLogs.stream().map(UserLog::getLoginName).distinct().map(temp->{
             ValuePO valuePO = new ValuePO();
-            valuePO.setName("选项" + (i + 1));
-            valuePO.setValue(loginName.get(i));
-            loginNameList.add(valuePO);
-        }
-        for (int i = 0; i < operateType.size(); i++) {
+            valuePO.setValue(temp);
+            return valuePO;
+        }).collect(Collectors.toList());
+
+        List<ValuePO> operateTypeList = userLogs.stream().map(UserLog::getOperateType).distinct().map(temp->{
             ValuePO valuePO = new ValuePO();
-            valuePO.setName("选项" + (i + 1));
-            valuePO.setValue(operateType.get(i));
-            operateTypeList.add(valuePO);
-        }
+            valuePO.setValue(temp);
+            return valuePO;
+        }).collect(Collectors.toList());
+
+//        List<ValuePO> loginNameList = new ArrayList<>();
+//        List<ValuePO> operateTypeList = new ArrayList<>();
+//        for (int i = 0; i < loginName.size(); i++) {
+//            ValuePO valuePO = new ValuePO();
+//            valuePO.setName("选项" + (i + 1));
+//            valuePO.setValue(loginName.get(i));
+//            loginNameList.add(valuePO);
+//        }
+//        for (int i = 0; i < operateType.size(); i++) {
+//            ValuePO valuePO = new ValuePO();
+//            valuePO.setName("选项" + (i + 1));
+//            valuePO.setValue(operateType.get(i));
+//            operateTypeList.add(valuePO);
+//        }
         logParamVO.setLoginName(loginNameList);
         logParamVO.setOperateType(operateTypeList);
         return logParamVO;