From d21d6d9c777f794c1fbbe0106bf22b4def58b6da Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 27 六月 2025 16:31:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
index 30a4fe8..8543ae1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
@@ -2,15 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import org.jeecg.common.api.CommonAPI;
import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
-import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.EquipmentRepairStatus;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
-import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.dto.EamEquipmentExtendDto;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcBoardMapper;
@@ -68,6 +64,9 @@
@Resource
private MdcBoardMapper mdcBoardMapper;
+
+ @Resource
+ private IMdcDeviceCalendarService mdcDeviceCalendarService;
/**
* 璁惧鐘舵��
@@ -172,7 +171,7 @@
mdcBoardRateVo.setOpenRate(equipmentStatisticalInfo.getOpenLong().divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP));
}
if (equipmentStatisticalInfo.getOpenLong().compareTo(BigDecimal.ZERO) > 0) {
- mdcBoardRateVo.setStartRate(equipmentStatisticalInfo.getProcessLong().multiply(new BigDecimal("100").divide(equipmentStatisticalInfo.getOpenLong(), 2, RoundingMode.HALF_UP)));
+ mdcBoardRateVo.setStartRate(equipmentStatisticalInfo.getProcessLong().multiply(new BigDecimal("100")).divide(equipmentStatisticalInfo.getOpenLong(), 2, RoundingMode.HALF_UP));
}
statisticsMap.put(date, mdcBoardRateVo);
}
@@ -311,8 +310,8 @@
String realName = commonAPI.translateDictFromTable("sys_user", "realname", "username", mdcBoardEquRealTImeVo.getEquipmentManager());
mdcBoardEquRealTImeVo.setEquipmentManager(realName);
mdcBoardEquRealTImeVo.setAlarm("鏃�");
- if (mdcBoardEquRealTImeVo.getOporation() != null) {
- switch (mdcBoardEquRealTImeVo.getOporation()) {
+ if (mdcBoardEquRealTImeVo.getOperation() != null) {
+ switch (mdcBoardEquRealTImeVo.getOperation()) {
case 1:
case 2:
mdcBoardEquRealTImeVo.setOporationDict("寰呮満");
@@ -334,30 +333,30 @@
}
} else {
mdcBoardEquRealTImeVo.setOporationDict("鍏虫満");
- mdcBoardEquRealTImeVo.setOporation(0);
+ mdcBoardEquRealTImeVo.setOperation(0);
}
//璁惧杩愯鏁版嵁
Map<String, Object> mapData = equipmentWorkLineService.getDataList(mdcBoardEquRealTImeVo.getSaveTableName());
if (mapData != null) {
if (mapData.containsKey("Sequencenumber")) {
Object object = mapData.get("Sequencenumber");
- mdcBoardEquRealTImeVo.setSequenceNumber(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setSequenceNumber(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
- if (mapData.containsKey("spindlespeed")) {
- Object object = mapData.get("spindlespeed");
- mdcBoardEquRealTImeVo.setSpindleSpeed(object == null ? "" : object.toString());
+ if (mapData.containsKey("actualspindlespeed")) {
+ Object object = mapData.get("actualspindlespeed");
+ mdcBoardEquRealTImeVo.setSpindleSpeed(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
if (mapData.containsKey("spindleload")) {
Object object = mapData.get("spindleload");
- mdcBoardEquRealTImeVo.setSpindleLoad(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setSpindleLoad(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
if (mapData.containsKey("spindlebeilv")) {
Object object = mapData.get("spindlebeilv");
- mdcBoardEquRealTImeVo.setSpindlebeilv(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setSpindlebeilv(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
if (mapData.containsKey("feedbeilv")) {
Object object = mapData.get("feedbeilv");
- mdcBoardEquRealTImeVo.setFeedbeilv(object == null ? "" : object.toString());
+ mdcBoardEquRealTImeVo.setFeedbeilv(object == null || "鍏虫満".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
}
}
// 缁翠繚鐘舵��
@@ -383,7 +382,12 @@
} else {
mdcBoardEquRealTImeVo.setReportRepairStatus("鏃�");
}
- // 涓嬫鐐规涓嬫淇濆吇
+ // 鐝
+ String shift = mdcDeviceCalendarService.findShiftByEquId(equipmentId);
+ if (StringUtils.isNotBlank(shift)) {
+ mdcBoardEquRealTImeVo.setShift(shift);
+ }
+ // 鐐规 淇濆吇
Date nextInspection = mdcBoardMapper.findInsOrMain(equipmentId, MaintenanceCategoryEnum.POINT_INSPECTION.name());
if (nextInspection != null) {
mdcBoardEquRealTImeVo.setNextInspection(nextInspection);
--
Gitblit v1.9.3