政务云数据上传bug修改

无关风月

昨天 8b48244257eaa19bfd8a761b3d2309cea25a8aaa

 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;

@@ -46,13 +48,21 @@
     */
    @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);