xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(dms): 重构查询方法以提高代码可读性和性能

Browse Source 
- 移除了 buildQueryWrapper 方法，直接在 count 方法中构建查询条件
- 使用 JoinWrappers.lambda 方法替代 MPJLambdaWrapper，提高代码可读性
-通过直接比较参数值来构建查询条件，避免了不必要的条件判断- 优化了代码结构，提高了查询效率
master
zangch@mesnac.com 3 months ago
parent 7c73699037
commit df3dc12d8f
7 changed files with 119 additions and 50 deletions
Show Stats Download Patch File Download Diff File

32
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmInfoServiceImpl.java
Unescape Escape View File

@ -1,29 +1,26 @@
package org.dromara.dms.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.dms.domain.BaseAlarmInfo;
import org.dromara.dms.domain.BaseAlarmLevel;
import org.dromara.dms.domain.BaseAlarmType;
import org.dromara.dms.domain.DmsBaseMachineInfo;
import org.springframework.stereotype.Service;
import org.dromara.dms.domain.bo.BaseAlarmInfoBo;
import org.dromara.dms.domain.vo.BaseAlarmInfoVo;
import org.dromara.dms.domain.BaseAlarmInfo;
import org.dromara.dms.mapper.BaseAlarmInfoMapper;
import org.dromara.dms.service.IBaseAlarmInfoService;
import org.dromara.dms.domain.BaseAlarmRule;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 报警信息Service业务层处理
@ -76,7 +73,20 @@ public class BaseAlarmInfoServiceImpl implements IBaseAlarmInfoService {
@Override
public Long count(BaseAlarmInfoBo bo) {
MPJLambdaWrapper<BaseAlarmInfo> lqw = buildQueryWrapper(bo);
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseAlarmInfo> lqw = JoinWrappers.lambda(BaseAlarmInfo.class)
.eq(bo.getAlarmInfoId() != null, BaseAlarmInfo::getAlarmInfoId, bo.getAlarmInfoId())
.eq(StringUtils.isNotBlank(bo.getAlarmInfoType()), BaseAlarmInfo::getAlarmInfoType, bo.getAlarmInfoType())
.eq(bo.getAlarmReleatedId() != null, BaseAlarmInfo::getAlarmReleatedId, bo.getAlarmReleatedId())
.eq(bo.getDeviceId() != null, BaseAlarmInfo::getDeviceId, bo.getDeviceId())
.eq(StringUtils.isNotBlank(bo.getAlarmContent()), BaseAlarmInfo::getAlarmContent, bo.getAlarmContent())
.eq(bo.getAlarmLevelId() != null, BaseAlarmInfo::getAlarmLevelId, bo.getAlarmLevelId())
.eq(bo.getAlarmTypeId() != null, BaseAlarmInfo::getAlarmTypeId, bo.getAlarmTypeId())
.eq(StringUtils.isNotBlank(bo.getAlarmMode()), BaseAlarmInfo::getAlarmMode, bo.getAlarmMode())
.eq(StringUtils.isNotBlank(bo.getAlarmStatus()), BaseAlarmInfo::getAlarmStatus, bo.getAlarmStatus())
.eq(bo.getAlarmBeginTime() != null, BaseAlarmInfo::getAlarmBeginTime, bo.getAlarmBeginTime())
.eq(bo.getAlarmEndTime() != null, BaseAlarmInfo::getAlarmEndTime, bo.getAlarmEndTime())
.eq(bo.getHandleTime() != null, BaseAlarmInfo::getHandleTime, bo.getHandleTime());
return baseMapper.selectCount(lqw);
}

24
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java
Unescape Escape View File

@ -1,25 +1,24 @@
package org.dromara.dms.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.dms.domain.DmsBaseDeviceDebugging;
import org.dromara.dms.domain.DmsBaseMachineInfo;
import org.springframework.stereotype.Service;
import org.dromara.dms.domain.bo.DmsBaseDeviceDebuggingBo;
import org.dromara.dms.domain.vo.DmsBaseDeviceDebuggingVo;
import org.dromara.dms.domain.DmsBaseDeviceDebugging;
import org.dromara.dms.mapper.DmsBaseDeviceDebuggingMapper;
import org.dromara.dms.service.IDmsBaseDeviceDebuggingService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 设备调试信息Service业务层处理
@ -72,7 +71,14 @@ public class DmsBaseDeviceDebuggingServiceImpl implements IDmsBaseDeviceDebuggin
@Override
public Long count(DmsBaseDeviceDebuggingBo bo) {
MPJLambdaWrapper<DmsBaseDeviceDebugging> lqw = buildQueryWrapper(bo);
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<DmsBaseDeviceDebugging> lqw = JoinWrappers.lambda(DmsBaseDeviceDebugging.class)
.eq(bo.getDeviceDebuggingId() != null, DmsBaseDeviceDebugging::getDeviceDebuggingId, bo.getDeviceDebuggingId())
.eq(StringUtils.isNotBlank(bo.getWorkOrder()), DmsBaseDeviceDebugging::getWorkOrder, bo.getWorkOrder())
.eq(bo.getMachineId() != null, DmsBaseDeviceDebugging::getMachineId, bo.getMachineId())
.eq(StringUtils.isNotBlank(bo.getStatus()), DmsBaseDeviceDebugging::getStatus, bo.getStatus())
.eq(bo.getDebugTime() != null, DmsBaseDeviceDebugging::getDebugTime, bo.getDebugTime())
.eq(StringUtils.isNotBlank(bo.getDebugPerson()), DmsBaseDeviceDebugging::getDebugPerson, bo.getDebugPerson());
return baseMapper.selectCount(lqw);
}

29
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceInstallServiceImpl.java
Unescape Escape View File

@ -1,29 +1,28 @@
package org.dromara.dms.service.impl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.dms.domain.DmsBaseDeviceDepreciation;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.dms.domain.DmsBaseDeviceInstall;
import org.dromara.dms.domain.DmsBaseMachineInfo;
import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
import org.springframework.stereotype.Service;
import org.dromara.dms.domain.bo.DmsBaseDeviceInstallBo;
import org.dromara.dms.domain.vo.DmsBaseDeviceInstallVo;
import org.dromara.dms.domain.DmsBaseDeviceInstall;
import org.dromara.dms.mapper.DmsBaseDeviceInstallMapper;
import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
import org.dromara.dms.service.IDmsBaseDeviceInstallService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 设备安装信息Service业务层处理
@ -78,7 +77,13 @@ public class DmsBaseDeviceInstallServiceImpl implements IDmsBaseDeviceInstallSer
@Override
public Long count(DmsBaseDeviceInstallBo bo) {
MPJLambdaWrapper<DmsBaseDeviceInstall> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<DmsBaseDeviceInstall> lqw = JoinWrappers.lambda(DmsBaseDeviceInstall.class)
.eq(bo.getDeviceInstallId() != null, DmsBaseDeviceInstall::getDeviceInstallId, bo.getDeviceInstallId())
.eq(bo.getMachineId() != null, DmsBaseDeviceInstall::getMachineId, bo.getMachineId())
.eq(StringUtils.isNotBlank(bo.getInstallPosition()), DmsBaseDeviceInstall::getInstallPosition, bo.getInstallPosition())
.eq(bo.getInstallTime() != null, DmsBaseDeviceInstall::getInstallTime, bo.getInstallTime())
.eq(StringUtils.isNotBlank(bo.getInstallPerson()), DmsBaseDeviceInstall::getInstallPerson, bo.getInstallPerson())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBaseDeviceInstall::getActiveFlag, bo.getActiveFlag());
return baseMapper.selectCount(lqw);
}

26
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDevicePurchaseServiceImpl.java
Unescape Escape View File

@ -1,27 +1,26 @@
package org.dromara.dms.service.impl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.dms.domain.DmsBaseDevicePurchase;
import org.dromara.dms.domain.DmsBaseMachineInfo;
import org.springframework.stereotype.Service;
import org.dromara.dms.domain.bo.DmsBaseDevicePurchaseBo;
import org.dromara.dms.domain.vo.DmsBaseDevicePurchaseVo;
import org.dromara.dms.domain.DmsBaseDevicePurchase;
import org.dromara.dms.mapper.DmsBaseDevicePurchaseMapper;
import org.dromara.dms.service.IDmsBaseDevicePurchaseService;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 设备采购信息Service业务层处理
@ -74,7 +73,14 @@ public class DmsBaseDevicePurchaseServiceImpl implements IDmsBaseDevicePurchaseS
@Override
public Long count(DmsBaseDevicePurchaseBo bo) {
MPJLambdaWrapper<DmsBaseDevicePurchase> lqw = buildQueryWrapper(bo);
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<DmsBaseDevicePurchase> lqw = JoinWrappers.lambda(DmsBaseDevicePurchase.class)
.eq(bo.getDevicePurchaseId() != null, DmsBaseDevicePurchase::getDevicePurchaseId, bo.getDevicePurchaseId())
.eq(StringUtils.isNotBlank(bo.getWorkOrder()), DmsBaseDevicePurchase::getWorkOrder, bo.getWorkOrder())
.eq(bo.getMachineId() != null, DmsBaseDevicePurchase::getMachineId, bo.getMachineId())
.eq(StringUtils.isNotBlank(bo.getPurchasePerson()), DmsBaseDevicePurchase::getPurchasePerson, bo.getPurchasePerson())
.eq(StringUtils.isNotBlank(bo.getPurchasePosition()), DmsBaseDevicePurchase::getPurchasePosition, bo.getPurchasePosition())
.eq(bo.getPurchaseTime() != null, DmsBaseDevicePurchase::getPurchaseTime, bo.getPurchaseTime());
return baseMapper.selectCount(lqw);
}

29
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
Unescape Escape View File

@ -1,7 +1,8 @@
package org.dromara.dms.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.ttl.TtlRunnable;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.seata.spring.annotation.GlobalTransactional;
@ -27,6 +28,7 @@ import org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo;
import org.dromara.dms.domain.vo.DmsFaultInstanceActivityVo;
import org.dromara.dms.domain.vo.DmsInstanceFileVo;
import org.dromara.dms.mapper.DmsBillsFaultInstanceMapper;
import org.dromara.dms.mapper.DmsFaultComponentsPartsMapper;
import org.dromara.dms.mapper.DmsFaultInstanceActivityMapper;
import org.dromara.dms.mapper.DmsInstanceFileMapper;
import org.dromara.dms.service.IDmsBillsFaultInstanceService;
@ -41,13 +43,10 @@ import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import cn.dev33.satoken.stp.StpUtil;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import org.springframework.web.multipart.MultipartFile;
import org.dromara.dms.mapper.DmsFaultComponentsPartsMapper;
/**
* 故障报修工单Service业务层处理
@ -118,7 +117,25 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
@Override
public Long count(DmsBillsFaultInstanceBo bo) {
MPJLambdaWrapper<DmsBillsFaultInstance> lqw = buildQueryWrapper(bo);
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<DmsBillsFaultInstance> lqw = JoinWrappers.lambda(DmsBillsFaultInstance.class)
.eq(bo.getRepairInstanceId() != null, DmsBillsFaultInstance::getRepairInstanceId, bo.getRepairInstanceId())
.eq(StringUtils.isNotBlank(bo.getBillsFaultCode()), DmsBillsFaultInstance::getBillsFaultCode, bo.getBillsFaultCode())
.eq(StringUtils.isNotBlank(bo.getInstanceType()), DmsBillsFaultInstance::getInstanceType, bo.getInstanceType())
.eq(StringUtils.isNotBlank(bo.getFaultSourceType()), DmsBillsFaultInstance::getFaultSourceType, bo.getFaultSourceType())
.eq(bo.getFaultSourceId() != null, DmsBillsFaultInstance::getFaultSourceId, bo.getFaultSourceId())
.eq(bo.getWfDefinitionId() != null, DmsBillsFaultInstance::getWfDefinitionId, bo.getWfDefinitionId())
.eq(bo.getMachineId() != null, DmsBillsFaultInstance::getMachineId, bo.getMachineId())
.eq(StringUtils.isNotBlank(bo.getApplyUser()), DmsBillsFaultInstance::getApplyUser, bo.getApplyUser())
.eq(bo.getApplyTime() != null, DmsBillsFaultInstance::getApplyTime, bo.getApplyTime())
.eq(bo.getRealBeginTime() != null, DmsBillsFaultInstance::getRealBeginTime, bo.getRealBeginTime())
.eq(bo.getRealEndTime() != null, DmsBillsFaultInstance::getRealEndTime, bo.getRealEndTime())
.eq(bo.getRequireEndTime() != null, DmsBillsFaultInstance::getRequireEndTime, bo.getRequireEndTime())
.eq(StringUtils.isNotBlank(bo.getBillsStatus()), DmsBillsFaultInstance::getBillsStatus, bo.getBillsStatus())
.eq(StringUtils.isNotBlank(bo.getApproveStatus()), DmsBillsFaultInstance::getApproveStatus, bo.getApproveStatus())
.eq(StringUtils.isNotBlank(bo.getRepairConfirm()), DmsBillsFaultInstance::getRepairConfirm, bo.getRepairConfirm())
.eq(StringUtils.isNotBlank(bo.getConfirmUser()), DmsBillsFaultInstance::getConfirmUser, bo.getConfirmUser())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsBillsFaultInstance::getActiveFlag, bo.getActiveFlag());
return baseMapper.selectCount(lqw);
}

14
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java
Unescape Escape View File

@ -93,7 +93,19 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
@Override
public Long count(DmsBillsInspectInstanceBo bo) {
MPJLambdaWrapper<DmsBillsInspectInstance> lqw = buildQueryWrapper(bo);
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<DmsBillsInspectInstance> lqw = JoinWrappers.lambda(DmsBillsInspectInstance.class)
.eq(bo.getInspectInstanceId() != null, DmsBillsInspectInstance::getInspectInstanceId, bo.getInspectInstanceId())
.eq(bo.getPlanInspectId() != null, DmsBillsInspectInstance::getPlanInspectId, bo.getPlanInspectId())
.eq(bo.getWfDefinitionId() != null, DmsBillsInspectInstance::getWfDefinitionId, bo.getWfDefinitionId())
.eq(StringUtils.isNotBlank(bo.getInspectType()), DmsBillsInspectInstance::getInspectType, bo.getInspectType())
.eq(bo.getInspectRouteId() != null, DmsBillsInspectInstance::getInspectRouteId, bo.getInspectRouteId())
.eq(StringUtils.isNotBlank(bo.getBillsInspectCode()), DmsBillsInspectInstance::getBillsInspectCode, bo.getBillsInspectCode())
.eq(bo.getPlanBeginTime() != null, DmsBillsInspectInstance::getPlanBeginTime, bo.getPlanBeginTime())
.eq(bo.getPlanEndTime() != null, DmsBillsInspectInstance::getPlanEndTime, bo.getPlanEndTime())
.eq(bo.getRealBeginTime() != null, DmsBillsInspectInstance::getRealBeginTime, bo.getRealBeginTime())
.eq(bo.getRealEndTime() != null, DmsBillsInspectInstance::getRealEndTime, bo.getRealEndTime())
.eq(StringUtils.isNotBlank(bo.getInspectStatus()), DmsBillsInspectInstance::getInspectStatus, bo.getInspectStatus());
return baseMapper.selectCount(lqw);
}

15
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
Unescape Escape View File

@ -111,7 +111,20 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
@Override
public Long count(DmsBillsMaintInstanceBo bo) {
MPJLambdaWrapper<DmsBillsMaintInstance> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<DmsBillsMaintInstance> lqw = JoinWrappers.lambda(DmsBillsMaintInstance.class)
.eq(bo.getMaintInstanceId() != null, DmsBillsMaintInstance::getMaintInstanceId, bo.getMaintInstanceId())
.eq(bo.getPlanMaintId() != null, DmsBillsMaintInstance::getPlanMaintId, bo.getPlanMaintId())
.eq(bo.getWfDefinitionId() != null, DmsBillsMaintInstance::getWfDefinitionId, bo.getWfDefinitionId())
.eq(StringUtils.isNotBlank(bo.getBillsMaintCode()), DmsBillsMaintInstance::getBillsMaintCode, bo.getBillsMaintCode())
.eq(StringUtils.isNotBlank(bo.getMaintGroup()), DmsBillsMaintInstance::getMaintGroup, bo.getMaintGroup())
.eq(StringUtils.isNotBlank(bo.getMaintSupervisor()), DmsBillsMaintInstance::getMaintSupervisor, bo.getMaintSupervisor())
.eq(bo.getMaintLevel() != null, DmsBillsMaintInstance::getMaintLevel, bo.getMaintLevel())
.eq(bo.getPlanBeginTime() != null, DmsBillsMaintInstance::getPlanBeginTime, bo.getPlanBeginTime())
.eq(bo.getRealBeginTime() != null, DmsBillsMaintInstance::getRealBeginTime, bo.getRealBeginTime())
.eq(bo.getPlanEndTime() != null, DmsBillsMaintInstance::getPlanEndTime, bo.getPlanEndTime())
.eq(bo.getRealEndTime() != null, DmsBillsMaintInstance::getRealEndTime, bo.getRealEndTime())
.eq(bo.getMaintStatus() != null, DmsBillsMaintInstance::getMaintStatus, bo.getMaintStatus())
.eq(bo.getMaintCompRate() != null, DmsBillsMaintInstance::getMaintCompRate, bo.getMaintCompRate());
return baseMapper.selectCount(lqw);
}

Write Preview
Loading…
Cancel
Save