From b1cf0c1c4cef378f433c0e68634835e249e9337c Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 27 Jun 2025 09:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/UserAccessLogServiceImpl.java |  7 ++++--
 .../software/common/util/EleCommonUtil.java   | 24 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
index b96b9ff..afbb7e7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
@@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
 import com.electromagnetic.industry.software.common.pojo.RespPageVO;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
+import com.electromagnetic.industry.software.common.util.EleCommonUtil;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
 import com.electromagnetic.industry.software.manage.mapper.UserAccessLogMapper;
@@ -65,10 +67,11 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
         }
 
         if (ObjUtil.isAllNotEmpty(pars.getStartCreatedTime(), pars.getEndCreatedTime())) {
+            Assert.isTrue(EleCommonUtil.isWithinCertainMonths(pars.getStartCreatedTime(), pars.getEndCreatedTime(), 6), "查询时间错误");
             queryWrapper.between(UserAccessLog::getCreatedTime, pars.getStartCreatedTime(), pars.getEndCreatedTime());
         } else {
-            Date createdTime = DateUtil.lastMonth();
-            queryWrapper.gt(UserAccessLog::getCreatedTime, createdTime);
+            Date minCreatedTime = DateUtil.offsetMonth(DateUtil.date(), -6);
+            queryWrapper.gt(UserAccessLog::getCreatedTime, minCreatedTime);
         }
 
         if (StrUtil.isNotEmpty(pars.getKeyWord())) {
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
index af5c1d2..79a503b 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
@@ -1,5 +1,6 @@
 package com.electromagnetic.industry.software.common.util;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.symmetric.AES;
@@ -15,6 +16,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -153,4 +155,26 @@ public final class EleCommonUtil {
         }
     }
 
+
+    public static boolean isWithinCertainMonths(Date startTime, Date endTime, int months) {
+        // 获取当前时间
+        Date now = DateUtil.date();
+
+        // 计算6个月前的日期
+        Date sixMonthsAgo = DateUtil.offsetMonth(now, months * -1);
+
+        // 检查开始时间是否在6个月前到现在之间
+        boolean startValid = (DateUtil.compare(startTime, sixMonthsAgo) >= 0) &&
+                (DateUtil.compare(startTime, now) <= 0);
+
+        // 检查结束时间是否在6个月前到现在之间
+        boolean endValid = (DateUtil.compare(endTime, sixMonthsAgo) >= 0) &&
+                (DateUtil.compare(endTime, now) <= 0);
+
+        // 同时检查开始时间不晚于结束时间
+        boolean orderValid = DateUtil.compare(startTime, endTime) <= 0;
+
+        return startValid && endValid && orderValid;
+    }
+
 }