日志导出乱码 日志查询导出 代码重构

wl

2022-10-24 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0

日志导出乱码 日志查询导出 代码重构

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

@@ -2,12 +2,10 @@

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;
@@ -15,16 +13,13 @@
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")
@@ -40,32 +35,7 @@
    @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,33 +63,12 @@
    @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");
        String fileName = URLEncoder.encode("日志", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+fileName + ".xlsx");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx");
        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()));
                .doWrite(iAdminLoginLogService.pageList(logQueryParams).getRecords());
    }
}

 ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java

@@ -1,7 +1,12 @@
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.dto.log.LogQueryParams;
import com.ycl.entity.user.UmsAdminLoginLog;
import com.ycl.entity.user.vo.UmsAdminLogVO;

import java.util.List;

/**
 * <p>
@@ -10,5 +15,5 @@
 *
 */
public interface UmsAdminLoginLogMapper extends BaseMapper<UmsAdminLoginLog> {

    Page<UmsAdminLogVO> selectByCondition(Page<UmsAdminLogVO> umsAdminLogVOPage, LogQueryParams logQueryParams);
}

 ycl-common/src/main/java/com/ycl/service/user/IAdminLoginLogService.java

@@ -1,7 +1,10 @@
package com.ycl.service.user;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.log.LogQueryParams;
import com.ycl.entity.user.UmsAdminLoginLog;
import com.ycl.entity.user.vo.UmsAdminLogVO;

/**
 * <p>
@@ -13,4 +16,5 @@
 */
public interface IAdminLoginLogService extends IService<UmsAdminLoginLog> {

    Page<UmsAdminLogVO> pageList(LogQueryParams logQueryParams);
}

 ycl-common/src/main/java/com/ycl/service/user/impl/AdminLoginLogServiceImpl.java

@@ -1,10 +1,16 @@
package com.ycl.service.user.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.log.LogQueryParams;
import com.ycl.entity.user.UmsAdminLoginLog;
import com.ycl.entity.user.vo.UmsAdminLogVO;
import com.ycl.mapper.user.UmsAdminLoginLogMapper;
import com.ycl.service.user.IAdminLoginLogService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -17,4 +23,12 @@
@Service
public class AdminLoginLogServiceImpl extends ServiceImpl<UmsAdminLoginLogMapper, UmsAdminLoginLog> implements IAdminLoginLogService {

    @Resource
    UmsAdminLoginLogMapper umsAdminLoginLogMapper;

    @Override
    public Page<UmsAdminLogVO> pageList(LogQueryParams logQueryParams) {
        Page<UmsAdminLogVO> umsAdminLogVOPage = new Page<UmsAdminLogVO>().setCurrent(logQueryParams.getCurrent()).setSize(logQueryParams.getSize());
        return umsAdminLoginLogMapper.selectByCondition(umsAdminLogVOPage,logQueryParams);
    }
}

 ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml

@@ -4,12 +4,38 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminLoginLog">
        <id column="id" property="id" />
        <result column="admin_id" property="adminId" />
        <result column="create_time" property="createTime" />
        <result column="ip" property="ip" />
        <result column="address" property="address" />
        <result column="user_agent" property="userAgent" />
        <id column="id" property="id"/>
        <result column="admin_id" property="adminId"/>
        <result column="create_time" property="createTime"/>
        <result column="ip" property="ip"/>
        <result column="address" property="address"/>
        <result column="user_agent" property="userAgent"/>
    </resultMap>

    <select id="selectByCondition" parameterType="com.ycl.dto.log.LogQueryParams"
            resultType="com.ycl.entity.user.vo.UmsAdminLogVO">
        SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1 left join ums_admin t2 on t1.admin_id=t2.id
        <where>
            <if test="logQueryParams.content!='' and logQueryParams.content!=null">
                contain LIKE CONCAT('%',#{logQueryParams.content},'%')
            </if>
            <if test="logQueryParams.operationType!='' and logQueryParams.operationType!=null">
                and operation_type=#{logQueryParams.operationType}
            </if>
            <if test="logQueryParams.portEquipment!='' and logQueryParams.portEquipment!=null">
                and user_agent=#{logQueryParams.portEquipment}
            </if>
            <if test="logQueryParams.id!=null">
                and admin_id=#{logQueryParams.id}
            </if>
            <if test="logQueryParams.startTime!='' and logQueryParams.endTime!=''">
                and create_time BETWEEN #{logQueryParams.startTime} AND #{logQueryParams.endTime}
            </if>
        </where>
        <if test="logQueryParams.sort != null and logQueryParams.sort == 1">
            ORDER BY create_time desc
        </if>
        <if test="logQueryParams.sort != null and logQueryParams.sort == 0">
            ORDER BY create_time asc
        </if>
    </select>
</mapper>

 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java

@@ -21,7 +21,6 @@
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.stream.Collectors;
@@ -69,14 +68,14 @@

    @PostMapping("/addition")
    @ApiOperation("添加")
    @LogSave(operationType = "卡口管理",contain = "添加卡口")
    @LogSave(operationType = "卡口管理", contain = "添加卡口")
    public CommonResult add(@RequestBody EquipmentBayonet equipmentBayonet) {
        return CommonResult.success(iEquipmentBayonetService.save(equipmentBayonet));
    }

    @PutMapping("/modification")
    @ApiOperation("修改")
    @LogSave(operationType = "卡口管理",contain = "修改卡口")
    @LogSave(operationType = "卡口管理", contain = "修改卡口")
    public CommonResult modify(@RequestBody EquipmentBayonet equipmentBayonet) {
        return CommonResult.success(iEquipmentBayonetService.updateById(equipmentBayonet));
    }
@@ -84,7 +83,7 @@
    @GetMapping("/export")
    @ApiOperation("导出")
    @SneakyThrows
    @LogSave(operationType = "卡口管理",contain = "删除卡口")
    @LogSave(operationType = "卡口管理", contain = "删除卡口")
    public void export(HttpServletResponse response,
                       @RequestParam(required = false) Integer size,
                       @RequestParam(required = false) Integer current,
@@ -94,8 +93,7 @@
        equipmentBayonetPage.setSize(size);
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("卡口", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+fileName + ".xlsx");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx");
        EasyExcel.write(response.getOutputStream(), EquipmentBayonetVO.class)
                .sheet("数据")
                .doWrite(iEquipmentBayonetService