From 7cb124e47f32af99c1098db89462f549a395254b Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期三, 24 四月 2024 14:26:17 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml | 4 +- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 47 +++++++++++------------ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 47 ++++++++++++++++++++++- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 6 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java | 4 - 5 files changed, 76 insertions(+), 32 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml index 42fffcd..88b331d 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml @@ -13,9 +13,9 @@ <!--鏌ヨ璁惧鏈�鏂颁竴鏉℃暟鎹�--> <select id="getEquipmentStatusList" resultType="org.jeecg.modules.mdc.entity.EquipmentLog"> SELECT - t1.* + t1.* FROM - EquipmentLog t1 + EquipmentLog t1 INNER JOIN ( SELECT MAX ( CollectTime ) AS CollectTime, EquipmentID FROM EquipmentLog GROUP BY EquipmentID ) t2 ON t1.CollectTime= t2.CollectTime AND t1.EquipmentID= t2.EquipmentID <if test="equipmentIdList != null and equipmentIdList.size() > 0"> diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java index c523148..1edd84c 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java @@ -9,6 +9,8 @@ import org.jeecg.modules.mdc.entity.MdcEquipment; import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor; import org.jeecg.modules.mdc.model.MdcEquipmentTree; +import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo; +import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo; import org.jeecg.modules.mdc.vo.MdcEquipmentVo; import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo; @@ -170,7 +172,7 @@ */ IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, WorkshopEquipmentVo workshopEquipmentVo); - List<String> listEquipmentId(String equipmentType, List<String> equipmentIdList); + List<String> listEquipmentId(MdcEfficiencyReportQueryVo vo); /** * 鍒楄〃鏌ヨ @@ -203,4 +205,6 @@ */ MdcEquipmentDto getWorkLineLast(String tableName); + List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo); + } diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java index cd1ce79..c8dd286 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java @@ -100,15 +100,15 @@ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { result.setMdcEfficiencyList(listDtos); } else { - if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - List<String> equipmentList = mdcEquipmentService.listEquipmentId(vo.getEquipmentType(), vo.getEquipmentIdList()); - if (equipmentList != null && !equipmentList.isEmpty()) { - vo.setEquipmentIdList(equipmentList); - } else { - result.setMdcEfficiencyList(listDtos); - return result; - } + + List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo); + if (equipmentIdList != null && !equipmentIdList.isEmpty()) { + vo.setEquipmentIdList(equipmentIdList); + } else { + result.setMdcEfficiencyList(listDtos); + return result; } + // 鏌ヨ鍒╃敤鐜囨暟鎹� List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo); // 灏佽缁撴灉 @@ -448,14 +448,13 @@ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { result.setMdcEfficiencyList(listDtos); } else { - if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - List<String> equipmentList = mdcEquipmentService.listEquipmentId(vo.getEquipmentType(), vo.getEquipmentIdList()); - if (equipmentList != null && !equipmentList.isEmpty()) { - vo.setEquipmentIdList(equipmentList); - } else { - result.setMdcEfficiencyList(listDtos); - return result; - } + + List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo); + if (equipmentIdList != null && !equipmentIdList.isEmpty()) { + vo.setEquipmentIdList(equipmentIdList); + } else { + result.setMdcEfficiencyList(listDtos); + return result; } // 鏌ヨ鍒╃敤鐜囨暟鎹� List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyPOList(vo); @@ -797,16 +796,16 @@ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { result.setMdcEfficiencyList(listDtos); } else { - if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - List<String> equipmentList = mdcEquipmentService.listEquipmentId(vo.getEquipmentType(), vo.getEquipmentIdList()); - if (equipmentList != null && !equipmentList.isEmpty()) { - vo.setEquipmentIdList(equipmentList); - } else { - result.setMdcEfficiencyList(listDtos); - return result; - } + + List<String> equipmentIdList = mdcEquipmentService.listEquipmentIdShift(vo); + if (equipmentIdList != null && !equipmentIdList.isEmpty()) { + vo.setEquipmentIdList(equipmentIdList); + } else { + result.setMdcEfficiencyList(listDtos); + return result; } + // 鐝鍒╃敤鐜囨暟鎹� List<MdcEquipmentStatisticalShiftInfo> mdcEquipmentStatisticalShiftInfoList = mdcEfficiencyReportMapper.efficiencyShiftSumList(vo); diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java index 588b583..b9a7384 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java @@ -375,6 +375,9 @@ ControlSystem controlSystem = controlSystemService.getByDriveType(mdcEquipmentDto.getDriveType()); // 鏌ヨ璁惧鐘舵�� EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId()); + if (equipmentLog == null) { + return mdcEquipmentDto; + } Integer oporation = equipmentLog.getOporation(); if (controlSystem != null) { @@ -721,8 +724,25 @@ } @Override - public List<String> listEquipmentId(String equipmentType, List<String> equipmentIdList) { - List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList)); + public List<String> listEquipmentId(MdcEfficiencyReportQueryVo vo) { + LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>(); + if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) { + queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()); + } + if (StringUtils.isNotEmpty(vo.getEquipmentType())) { + queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceLevel())) { + queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel()); + } + if (StringUtils.isNotEmpty(vo.getDriveType())) { + queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceCategory())) { + queryWrapper.eq(MdcEquipment::getDeviceCategory, vo.getDeviceCategory()); + } + List<MdcEquipment> list = super.list(queryWrapper); +// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList)); return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList()); } @@ -853,4 +873,27 @@ } } + @Override + public List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo) { + LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>(); + if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) { + queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()); + } + if (StringUtils.isNotEmpty(vo.getEquipmentType())) { + queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceLevel())) { + queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel()); + } + if (StringUtils.isNotEmpty(vo.getDriveType())) { + queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceCategory())) { + queryWrapper.eq(MdcEquipment::getDeviceCategory, vo.getDeviceCategory()); + } + List<MdcEquipment> list = super.list(queryWrapper); +// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList)); + return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList()); + } + } diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java index 0275ff7..16dd654 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java @@ -1,7 +1,5 @@ package org.jeecg.modules.mdc.service.impl; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; import org.jeecg.modules.mdc.dto.MdcEquipmentDto; @@ -125,7 +123,7 @@ return result == null ? BigDecimal.ZERO : result; } - @Transactional(readOnly = true) +// @Transactional(readOnly = true) List<MdcProcessCount> processCount(MdcEquipment mdcEquipment) { Date initDate = null; //鍙栨渶鍚庣殑缁熻鏁版嵁 -- Gitblit v1.9.3