提交代码

唐耀东

2022-05-23 dd296baf6463522b0a534b2eb2bc920a3928cd54

 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentLogServiceImpl.java

@@ -18,6 +18,7 @@
import com.ruoyi.oa.domain.DevEquipmentLog;
import com.ruoyi.oa.mapper.DevEquipmentLogMapper;
import com.ruoyi.oa.service.IDevEquipmentLogService;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
@@ -53,15 +54,16 @@
        LambdaQueryWrapper<DevEquipmentLog> lqw = Wrappers.lambdaQuery();
        lqw.eq(StringUtils.isNotBlank(bo.getOperation()), DevEquipmentLog::getOperation, bo.getOperation());
        lqw.like(StringUtils.isNotBlank(bo.getUserName()), DevEquipmentLog::getUserName, bo.getUserName());
        lqw.like(StringUtils.isNotBlank(bo.getNickName()), DevEquipmentLog::getNickName, bo.getNickName());
        lqw.eq(StringUtils.isNotBlank(bo.getIp()), DevEquipmentLog::getIp, bo.getIp());
        lqw.eq(StringUtils.isNotBlank(bo.getLoginLocation()), DevEquipmentLog::getLoginLocation, bo.getLoginLocation());
        lqw.like(StringUtils.isNotBlank(bo.getIp()), DevEquipmentLog::getIp, bo.getIp());
        lqw.like(StringUtils.isNotBlank(bo.getLoginLocation()), DevEquipmentLog::getLoginLocation, bo.getLoginLocation());
        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DevEquipmentLog::getStatus, bo.getStatus());
        lqw.eq(bo.getLoginTime() != null, DevEquipmentLog::getLoginTime, bo.getLoginTime());
        lqw.orderByDesc(DevEquipmentLog::getLoginTime);
        return lqw;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean insertByBo(DevEquipmentLogBo bo) {
        DevEquipmentLog add = BeanUtil.toBean(bo, DevEquipmentLog.class);
        validEntityBeforeSave(add);
@@ -73,6 +75,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean updateByBo(DevEquipmentLogBo bo) {
        DevEquipmentLog update = BeanUtil.toBean(bo, DevEquipmentLog.class);
        validEntityBeforeSave(update);
@@ -97,6 +100,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void recordOper(EquipmentLogDTO dto){
        DevEquipmentLog po = BeanUtil.toBean(dto, DevEquipmentLog.class);
        // 远程查询操作地点