From 1279d6eee2934b2765ce4ea1bf3a4d45d931760d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 18 六月 2024 10:35:59 +0800
Subject: [PATCH] webservice推送设备状态和设备利用率
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 116 +++++++++++++++++++++++-----------------------------------
1 files changed, 46 insertions(+), 70 deletions(-)
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 1e21981..5e141e1 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.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
+ queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDriveType())) {
+ queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
+ queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
+ }
+ 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());
}
@@ -769,7 +789,7 @@
Integer min = mdcEquipmentThreshold.getMinThreshold();
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧" + mdcEquipmentThreshold.getChineseName() + "鎶ヨ锛�");
- messageDTO.setCategory("棰勮娑堟伅");
+ messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
MdcOverrunAlarm mdcOverrunAlarm = new MdcOverrunAlarm();
@@ -846,78 +866,34 @@
*/
@Override
public MdcEquipmentDto getWorkLineLast(String tableName) {
- return this.baseMapper.findWorkLineLast(tableName);
+ try {
+ return this.baseMapper.findWorkLineLast(tableName);
+ } catch (Exception e) {
+ return null;
+ }
}
- /**
- * 璁惧杩愯鐘舵�佺粺璁�
- */
@Override
- public List<MdcCommonVo> getEquipmentStatusStatistics(String userId, String key) {
- List<MdcCommonVo> result = new ArrayList<>();
- MdcCommonVo mdcCommonVo1 = new MdcCommonVo();
- mdcCommonVo1.setName("鍏虫満");
- mdcCommonVo1.setValue(0);
- result.add(mdcCommonVo1);
- MdcCommonVo mdcCommonVo2 = new MdcCommonVo();
- mdcCommonVo2.setName("鎶ヨ");
- mdcCommonVo2.setValue(0);
- result.add(mdcCommonVo2);
- MdcCommonVo mdcCommonVo3 = new MdcCommonVo();
- mdcCommonVo3.setName("寰呮満");
- mdcCommonVo3.setValue(0);
- result.add(mdcCommonVo3);
- MdcCommonVo mdcCommonVo4 = new MdcCommonVo();
- mdcCommonVo4.setName("杩愯");
- mdcCommonVo4.setValue(0);
- result.add(mdcCommonVo4);
- MdcEquipmentStatusVo mdcEquipmentStatusVo = new MdcEquipmentStatusVo();
- List<String> equipmentIdList = this.getEquipmentIdsProduction(userId, key);
- if (equipmentIdList == null || equipmentIdList.isEmpty()) {
- return result;
+ public List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo) {
+ LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) {
+ queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
}
- List<EquipmentLog> logList = this.baseMapper.getEquipmentStatusList(equipmentIdList);
- if (logList != null && !logList.isEmpty()) {
- for (EquipmentLog equipmentLog : logList) {
- if (equipmentLog.getOporation() != null) {
- switch (equipmentLog.getOporation()) {
- case 1:
- case 2:
- mdcEquipmentStatusVo.setWaitCount(mdcEquipmentStatusVo.getWaitCount() + 1);
- break;
- case 3:
- mdcEquipmentStatusVo.setRunCount(mdcEquipmentStatusVo.getRunCount() + 1);
- break;
- case 22:
- mdcEquipmentStatusVo.setAlarmCount(mdcEquipmentStatusVo.getAlarmCount() + 1);
- break;
- default:
- mdcEquipmentStatusVo.setCloseCount(mdcEquipmentStatusVo.getCloseCount() + 1);
- break;
- }
- } else {
- mdcEquipmentStatusVo.setCloseCount(mdcEquipmentStatusVo.getCloseCount() + 1);
- }
- }
+ if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
+ queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
}
- result.clear();
- MdcCommonVo mdcCommonVo5 = new MdcCommonVo();
- mdcCommonVo5.setName("鍏虫満");
- mdcCommonVo5.setValue(mdcEquipmentStatusVo.getCloseCount());
- result.add(mdcCommonVo5);
- MdcCommonVo mdcCommonVo6 = new MdcCommonVo();
- mdcCommonVo6.setName("鎶ヨ");
- mdcCommonVo6.setValue(mdcEquipmentStatusVo.getAlarmCount());
- result.add(mdcCommonVo6);
- MdcCommonVo mdcCommonVo7 = new MdcCommonVo();
- mdcCommonVo7.setName("寰呮満");
- mdcCommonVo7.setValue(mdcEquipmentStatusVo.getWaitCount());
- result.add(mdcCommonVo7);
- MdcCommonVo mdcCommonVo8 = new MdcCommonVo();
- mdcCommonVo8.setName("杩愯");
- mdcCommonVo8.setValue(mdcEquipmentStatusVo.getRunCount());
- result.add(mdcCommonVo8);
- return result;
+ if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
+ queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDriveType())) {
+ queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
+ queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
+ }
+ 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());
}
}
--
Gitblit v1.9.3