From 4fe3cfda62fcab762159ac3560e391f73c64d18e Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 8 Oct 2024 14:23:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9A=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1=E7=89=88?= =?UTF-8?q?/=E6=B6=88=E6=81=AF=E3=80=81=E6=97=A5=E5=BF=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E7=BB=84=E7=BB=87=E6=9D=83=E9=99=90=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BD=93=E6=97=A5=E6=95=B0=E6=8D=AE=E5=A4=B1=E6=95=88=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/util/date/LocalDateTimeUtils.java | 16 ++++++++++++++++ .../admin/logger/OperateLogController.java | 2 ++ .../admin/notify/NotifyMessageController.java | 2 ++ .../admin/notify/NotifyTemplateController.java | 2 ++ .../admin/organ/TenantPackageController.java | 2 ++ 5 files changed, 24 insertions(+) diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/date/LocalDateTimeUtils.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/date/LocalDateTimeUtils.java index 682b669ea..2e2042122 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/date/LocalDateTimeUtils.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/date/LocalDateTimeUtils.java @@ -1,6 +1,7 @@ package com.cf.imes.framework.common.util.date; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.ObjectUtil; import java.time.Duration; import java.time.LocalDate; @@ -132,4 +133,19 @@ public class LocalDateTimeUtils { return LocalDateTimeUtil.between(dateTime, LocalDateTime.now(), ChronoUnit.DAYS); } + /** + * 生成起时间0点和止时间12点的区间 + * + * @param dateSection + * @return + */ + public static LocalDateTime[] generateTimeSection(LocalDateTime[] dateSection) { + if (ObjectUtil.isNotNull(dateSection) && dateSection.length == 2) { + LocalDateTime[] result = new LocalDateTime[2]; + result[0] = dateSection[0].withHour(0).withMinute(0).withSecond(0); + result[1] = dateSection[1].withHour(23).withMinute(59).withSecond(59); + return result; + } + return dateSection; + } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/logger/OperateLogController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/logger/OperateLogController.java index 18b2f598b..6999be56b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/logger/OperateLogController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/logger/OperateLogController.java @@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.logger; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.excel.core.util.ExcelUtils; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; @@ -46,6 +47,7 @@ public class OperateLogController { @Operation(summary = "查看操作日志分页列表") @PreAuthorize("@ss.hasPermission('system:operate-log:query')") public CommonResult> pageOperateLog(@Valid OperateLogPageReqVO pageReqVO) { + pageReqVO.setStartTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getStartTime())); PageResult pageResult = operateLogService.getOperateLogPage(pageReqVO); // 获得拼接需要的数据 Map userMap = userService.getUserMap( diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java index 1bb12e6cd..54cf250da 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java @@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.notify; import com.cf.imes.framework.common.enums.UserTypeEnum; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; import com.cf.imes.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO; @@ -47,6 +48,7 @@ public class NotifyMessageController { @PreAuthorize("@ss.hasPermission('system:notify-message:query')") public CommonResult> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) { pageVO.setUserId(getLoginUserId()); + pageVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageVO.getCreateTime())); PageResult pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO); return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class)); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyTemplateController.java index 755d9af57..f51d28f61 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyTemplateController.java @@ -2,6 +2,7 @@ package com.cf.imes.module.system.controller.admin.notify; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; import com.cf.imes.module.system.controller.admin.notify.vo.template.NotifyTemplateRespVO; @@ -71,6 +72,7 @@ public class NotifyTemplateController { @Operation(summary = "获得站内信模版分页") @PreAuthorize("@ss.hasPermission('system:notify-template:query')") public CommonResult> getNotifyTemplatePage(@Valid NotifyTemplatePageReqVO pageVO) { + pageVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageVO.getCreateTime())); PageResult pageResult = notifyTemplateService.getNotifyTemplatePage(pageVO); return success(BeanUtils.toBean(pageResult, NotifyTemplateRespVO.class)); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/TenantPackageController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/TenantPackageController.java index b83e8ac4f..2b125e4a6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/TenantPackageController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/TenantPackageController.java @@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.organ; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.controller.admin.organ.vo.packages.TenantPackagePageReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.packages.TenantPackageRespVO; @@ -69,6 +70,7 @@ public class TenantPackageController { @Operation(summary = "获得组织套餐分页") @PreAuthorize("@ss.hasPermission('system:tenant-package:query')") public CommonResult> getTenantPackagePage(@Valid TenantPackagePageReqVO pageVO) { + pageVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageVO.getCreateTime())); PageResult pageResult = tenantPackageService.getTenantPackagePage(pageVO); return success(BeanUtils.toBean(pageResult, TenantPackageRespVO.class)); }