feat：审计日志新增登录时长

hs-admin/src/main/java/com/hs/admin/common/Constants.java

@@ -3,4 +3,6 @@ package com.hs.admin.common;
 public interface Constants {
     String TOKEN_KEY = "Authorization";
     String DEFAULT_ONLINE_TIME = "0小时0分钟";
+    String PREFIX_END_DATE = " 00:00:00";
+    String SUFFIX_END_DATE = " 59:59:59";
 }

hs-admin/src/main/java/com/hs/admin/mapper/AuditLogMapper.java

@@ -12,7 +12,7 @@ public interface AuditLogMapper {
 
     int insert(AuditLog auditLog);
 
-    List<AuditLog> getAllAuditLogs(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+    List<AuditLog> getAllAuditLogs(@Param("startDate") String startDate, @Param("endDate") String endDate);
 
     List<AuditLog> getAllTokens(String token);
 }
\ No newline at end of file

hs-admin/src/main/java/com/hs/admin/model/reqmodel/AuditLogReq.java

@@ -20,9 +20,9 @@ public class AuditLogReq {
     private String userName;
 
     @ApiModelProperty(value = "开始时间", required = false)
-    private Date startDate;
+    private String startDate;
 
     @ApiModelProperty(value = "结束时间", required = false)
-    private Date endDate;
+    private String endDate;
 
 }

hs-admin/src/main/java/com/hs/admin/service/impl/AuditLogServiceImpl.java

@@ -11,6 +11,7 @@ import com.hs.admin.mapper.AuditLogMapper;
 import com.hs.admin.model.AuditLog;
 import com.hs.admin.model.reqmodel.AuditLogReq;
 import com.hs.admin.service.AuditLogService;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,7 +39,9 @@ public class AuditLogServiceImpl implements AuditLogService {
     public PageResult<AuditLog> getAllAuditLog(AuditLogReq req) {
         PageRequest page = req.getPage();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
-        List<AuditLog> allAuditLogs = auditLogMapper.getAllAuditLogs(req.getStartDate(), req.getEndDate());
+        String startDate = req.getStartDate() == null?null:(req.getStartDate() + Constants.PREFIX_END_DATE);
+        String endDate = req.getEndDate() == null?null:(req.getEndDate() + Constants.SUFFIX_END_DATE);
+        List<AuditLog> allAuditLogs = auditLogMapper.getAllAuditLogs(startDate, endDate);
         PageResult pageResult = PageUtil.getPageResult(page, new PageInfo<AuditLog>(allAuditLogs));
         getOnlineTime(pageResult.getContent());
         return pageResult;

hs-admin/src/test/java/com/hs/admin/AuditLogServiceTest.java

@@ -32,8 +32,8 @@ public class AuditLogServiceTest {
         PageRequest pageRequest = new PageRequest();
         pageRequest.setPageNum(1);
         pageRequest.setPageSize(14);
-        req.setStartDate(startDate);
-        req.setEndDate(endDate);
+        req.setStartDate("2021-03-19");
+        req.setEndDate("2021-03-19");
         req.setPage(pageRequest);
         PageResult allAuditLog = auditLogService.getAllAuditLog(req);
         System.out.println(allAuditLog.getContent().size());

hs-api/src/main/java/com/hs/api/common/aspect/AuditAspect.java

@@ -86,6 +86,9 @@ public class AuditAspect {
                 LoginInfo loginInfo = (LoginInfo) rc.getData();
                 user = loginInfo.getUser();
                 token = loginInfo.getToken();
+                if(user == null) {
+                    return;
+                }
             }
 
             auditLog.setCreateDate(new Date());