fix 日志时间sql符号转换问题

疯狂的狮子li

2021-05-08 0b6952d0fe5c7f865f78b0531f3d476634fa091a

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java

@@ -1,76 +1,96 @@
package com.ruoyi.system.service.impl;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.system.domain.SysOperLog;

import com.ruoyi.system.mapper.SysOperLogMapper;

import com.ruoyi.system.service.ISysOperLogService;



/**

 * 操作日志 服务层处理

 * 
 * @author ruoyi

 */

@Service

public class SysOperLogServiceImpl implements ISysOperLogService

{

    @Autowired

    private SysOperLogMapper operLogMapper;



    /**

     * 新增操作日志

     * 
     * @param operLog 操作日志对象

     */

    @Override

    public void insertOperlog(SysOperLog operLog)

    {

        operLogMapper.insertOperlog(operLog);

    }



    /**

     * 查询系统操作日志集合

     * 
     * @param operLog 操作日志对象

     * @return 操作日志集合

     */

    @Override

    public List<SysOperLog> selectOperLogList(SysOperLog operLog)

    {

        return operLogMapper.selectOperLogList(operLog);

    }



    /**

     * 批量删除系统操作日志

     * 
     * @param operIds 需要删除的操作日志ID

     * @return 结果

     */

    @Override

    public int deleteOperLogByIds(Long[] operIds)

    {

        return operLogMapper.deleteOperLogByIds(operIds);

    }



    /**

     * 查询操作日志详细

     * 
     * @param operId 操作ID

     * @return 操作日志对象

     */

    @Override

    public SysOperLog selectOperLogById(Long operId)

    {

        return operLogMapper.selectOperLogById(operId);

    }



    /**

     * 清空操作日志

     */

    @Override

    public void cleanOperLog()

    {

        operLogMapper.cleanOperLog();

    }

}

package com.ruoyi.system.service.impl;

import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * 操作日志 服务层处理
 *
 * @author ruoyi
 */
@Service
public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {

    /**
     * 新增操作日志
     *
     * @param operLog 操作日志对象
     */
    @Override
    public void insertOperlog(SysOperLog operLog) {
        operLog.setOperTime(new Date());
        save(operLog);
    }

    /**
     * 查询系统操作日志集合
     *
     * @param operLog 操作日志对象
     * @return 操作日志集合
     */
    @Override
    public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
        Map<String, Object> params = operLog.getParams();
        return list(new LambdaQueryWrapper<SysOperLog>()
                .like(StrUtil.isNotBlank(operLog.getTitle()),SysOperLog::getTitle,operLog.getTitle())
                .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
                        SysOperLog::getBusinessType,operLog.getBusinessType())
                .func(f -> {
                    if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())){
                        f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
                    }
                })
                .eq(operLog.getStatus() != null && operLog.getStatus() > 0,
                        SysOperLog::getStatus,operLog.getStatus())
                .like(StrUtil.isNotBlank(operLog.getOperName()),SysOperLog::getOperName,operLog.getOperName())
                .apply(Validator.isNotEmpty(params.get("beginTime")),
                        "date_format(oper_time,'%y%m%d') >= date_format({0},'%y%m%d')",
                        params.get("beginTime"))
                .apply(Validator.isNotEmpty(params.get("endTime")),
                        "date_format(oper_time,'%y%m%d') <= date_format({0},'%y%m%d')",
                        params.get("endTime"))
                .orderByDesc(SysOperLog::getOperId));
    }

    /**
     * 批量删除系统操作日志
     *
     * @param operIds 需要删除的操作日志ID
     * @return 结果
     */
    @Override
    public int deleteOperLogByIds(Long[] operIds) {
        return baseMapper.deleteBatchIds(Arrays.asList(operIds));
    }

    /**
     * 查询操作日志详细
     *
     * @param operId 操作ID
     * @return 操作日志对象
     */
    @Override
    public SysOperLog selectOperLogById(Long operId) {
        return getById(operId);
    }

    /**
     * 清空操作日志
     */
    @Override
    public void cleanOperLog() {
        remove(new LambdaQueryWrapper<>());
    }
}