From 652d170d32afc15682bbdef4d630b057e67361c7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 19 四月 2024 15:47:43 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index ead8275..d30aebf 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -5,15 +5,9 @@
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
-import org.jeecg.modules.mdc.entity.Equipment;
-import org.jeecg.modules.mdc.entity.MdcEquipment;
-import org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo;
-import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
+import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcHomeMapper;
-import org.jeecg.modules.mdc.service.IEquipmentService;
-import org.jeecg.modules.mdc.service.IEquipmentWorkLineService;
-import org.jeecg.modules.mdc.service.IMdcEquipmentService;
-import org.jeecg.modules.mdc.service.IMdcHomeService;
+import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcProduction;
@@ -51,6 +45,9 @@
@Resource
private IMdcProductionService mdcProductionService;
+
+ @Resource
+ private IEquipmentLogService equipmentLogService;
/**
* 璁惧杩愯鐘舵�佺粺璁�
@@ -383,6 +380,10 @@
*/
@Override
public MdcHomeEfficiencyVo getEquipmentLevelEfficiencyStatistics(String equipmentId) {
+ MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
+ if (mdcEquipment == null) {
+ return null;
+ }
MdcHomeEfficiencyVo result = new MdcHomeEfficiencyVo();
String date = DateUtils.format(DateUtils.toDate(LocalDate.now().plusDays(-1).toString(), DateUtils.STR_DATE), DateUtils.STRDATE);
MdcEquipmentStatisticalInfo mdcEquipmentStatisticalInfo = mdcHomeMapper.getUtilizationByDay(Arrays.asList(equipmentId.split(",")), date);
@@ -409,6 +410,10 @@
*/
@Override
public Map<String, Object> getEquipmentAnnualEfficiencyStatistics(String equipmentId) {
+ MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
+ if (mdcEquipment == null) {
+ return null;
+ }
Map<String, Object> result = new HashMap<>();
Date end = DateUtils.toDate(LocalDate.now().plusMonths(-1).toString(), DateUtils.STR_DATE);
Date start = DateUtils.toDate(LocalDate.now().plusMonths(-12).toString(), DateUtils.STR_DATE);
@@ -469,6 +474,9 @@
}
String saveTableName = mdcEquipment.getSaveTableName();
MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
+ // 鏌ヨ璁惧鐘舵��
+ EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
+ Integer oporation = equipmentLog.getOporation();
if ("LSV2".equals(mdcEquipment.getDriveType())) {
dto.setSpindlebeilv(dto.getSFeed());
dto.setFeedbeilv(dto.getFFeed());
@@ -478,6 +486,11 @@
dto.setOPTVersion(dto.getOPTVersion());
dto.setPLCVersion(dto.getPLCVersion());
}
+ if (oporation == 22) {
+ dto.setALRMstate(equipmentLog.getAlarm());
+ } else {
+ dto.setALRMstate("鏃�");
+ }
return dto;
}
}
--
Gitblit v1.9.3