bug修改

zhanghua

2023-03-24 0650ebdd29d1a501de81438e1d0b7de1c0a52031

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java

@@ -1,30 +1,22 @@
package com.ycl.controller.user;

import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.dto.log.LogQueryParams;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsAdminLoginLog;
import com.ycl.entity.user.vo.UmsAdminLogVO;
import com.ycl.service.user.IAdminLoginLogService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.utils.EasyExcelUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;

@RestController
@RequestMapping("/log_manage")
@@ -38,34 +30,8 @@

    @GetMapping("/query")
    @ApiOperation(value = "查询")
    @LogSave(operationType = "日志管理", contain = "查询日志信息")
    public CommonResult searchLog(LogQueryParams logQueryParams) {
        Page<UmsAdminLoginLog> umsAdminLoginLogPage = new Page<>();
        umsAdminLoginLogPage.setCurrent(logQueryParams.getCurrent());
        umsAdminLoginLogPage.setSize(logQueryParams.getSize());
        Page<UmsAdminLoginLog> page = iAdminLoginLogService
                .page(umsAdminLoginLogPage, new LambdaQueryWrapper<UmsAdminLoginLog>()
                        .like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent())
                        .eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType())
                        .eq(StringUtils.isNotBlank(logQueryParams.getPortEquipment()), UmsAdminLoginLog::getUserAgent, logQueryParams.getPortEquipment())
                        .eq(logQueryParams.getId() != null, UmsAdminLoginLog::getAdminId, logQueryParams.getId())
                        .between(StringUtils.isNotBlank(logQueryParams.getStartTime()) && StringUtils.isNotBlank(logQueryParams.getEndTime()), UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                        .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                        .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
        List<UmsAdminLogVO> umsAdminLogVOList = page.getRecords().stream()
                .map(item -> {
                    UmsAdminLogVO umsAdminlogVO = new UmsAdminLogVO();
                    BeanUtils.copyProperties(item, umsAdminlogVO);
                    umsAdminlogVO.setAdminId(umsAdminService
                            .getOne(new LambdaQueryWrapper<UmsAdmin>()
                                    .eq(UmsAdmin::getId, item.getAdminId()))
                            .getUsername());
                    return umsAdminlogVO;
                }).collect(Collectors.toList());
        Page<UmsAdminLogVO> umsAdminLogVOPage = new Page<>();
        BeanUtils.copyProperties(page, umsAdminLogVOPage);
        umsAdminLogVOPage.setRecords(umsAdminLogVOList);
        return CommonResult.success(umsAdminLogVOPage);
        return CommonResult.success(iAdminLoginLogService.pageList(logQueryParams));
    }

    @DeleteMapping("/deletion_batch")
@@ -93,32 +59,7 @@
    @SneakyThrows
    @LogSave(operationType = "日志管理", contain = "导出日志")
    public void export(HttpServletResponse response, LogQueryParams logQueryParams) {
        Page<UmsAdminLoginLog> umsAdminLoginLogPage = new Page<>();
        umsAdminLoginLogPage.setCurrent(logQueryParams.getCurrent());
        umsAdminLoginLogPage.setSize(logQueryParams.getSize());
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode( ".xlsx", "utf-8"));
        EasyExcel
                .write(response.getOutputStream(), UmsAdminLogVO.class)
                .sheet("数据")
                .doWrite(iAdminLoginLogService
                        .page(umsAdminLoginLogPage, new LambdaQueryWrapper<UmsAdminLoginLog>()
                                .like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent())
                                .eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType())
                                .between(StringUtils.isNotBlank(logQueryParams.getStartTime()) && StringUtils.isNotBlank(logQueryParams.getEndTime()), UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
                                .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
                                .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
                        .getRecords()
                        .stream()
                        .map(item -> {
                            UmsAdminLogVO umsAdminlogVO = new UmsAdminLogVO();
                            BeanUtils.copyProperties(item, umsAdminlogVO);
                            umsAdminlogVO.setAdminId(umsAdminService
                                    .getOne(new LambdaQueryWrapper<UmsAdmin>()
                                            .eq(UmsAdmin::getId, item.getAdminId()))
                                    .getUsername());
                            return umsAdminlogVO;
                        }).collect(Collectors.toList()));
        String sheet = "数据";
        EasyExcelUtils.export(response, sheet, UmsAdminLogVO.class, iAdminLoginLogService.pageList(logQueryParams).getRecords());
    }
}