From a0070809b2344266608de9f8c9ac5c8ce1c31a8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 七月 2025 20:59:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/GovernmentCloudSystemController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/GovernmentCloudSystemController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/GovernmentCloudSystemController.java
index 93b81f5..2c1ef47 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/GovernmentCloudSystemController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/GovernmentCloudSystemController.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.controller;
+import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.SysLoginLog;
import com.ruoyi.system.api.domain.SysOperLog;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -40,19 +42,33 @@
@Autowired
private ISysUserService sysUserService;
+ public static void main(String[] args) {
+ String start = LocalDate.now().minusDays(1)+" 00:00:00";
+ String end = LocalDate.now().minusDays(1)+" 23:59:59";
+ System.err.println( start);
+ System.err.println( end);
+ }
/**
* 政务云查询数据接口
* @return
*/
@PostMapping("/listAll")
R<GovernmentCloudSystemVO> listAll() {
- LocalDateTime end = LocalDateTime.now();
- LocalDateTime start = LocalDateTime.now().minusDays(1);
+ String start = LocalDate.now().minusDays(1)+" 00:00:00";
+ String end = LocalDate.now().minusDays(1)+" 23:59:59";
GovernmentCloudSystemVO governmentCloudAccountVO = new GovernmentCloudSystemVO();
- List<SysLoginLog> list1 = sysLoginLogService.lambdaQuery().between(SysLoginLog::getCreateTime, start, end).list();
- List<SysOperLog> list2 = sysOperLogService.lambdaQuery().between(SysOperLog::getOperTime, start, end).list();
- List<SysRole> list3 = sysRoleService.lambdaQuery().between(SysRole::getCreateTime, start, end).list();
- List<SysUser> list4 = sysUserService.lambdaQuery().between(SysUser::getCreateTime, start, end).list();
+ List<SysLoginLog> list1 = sysLoginLogService.lambdaQuery()
+ .ge(SysLoginLog::getCreateTime,start)
+ .le(SysLoginLog::getCreateTime,end) .list();
+ List<SysOperLog> list2 = sysOperLogService.lambdaQuery()
+ .ge(SysOperLog::getOperTime,start)
+ .le(SysOperLog::getOperTime,end) .list();
+ List<SysRole> list3 = sysRoleService.lambdaQuery()
+ .ge(SysRole::getCreateTime,start)
+ .le(SysRole::getCreateTime,end) .list();
+ List<SysUser> list4 = sysUserService.lambdaQuery()
+ .ge(SysUser::getCreateTime,start)
+ .le(SysUser::getCreateTime,end) .list();
governmentCloudAccountVO.setLoginLogs(list1);
governmentCloudAccountVO.setSysOperLogs(list2);
governmentCloudAccountVO.setSysRoles(list3);
--
Gitblit v1.7.1