From 9db215895121e5bedee61cfe1ce1cca5cf8888f9 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期三, 04 六月 2025 11:18:34 +0800
Subject: [PATCH] 设备监控-列表添加状态查询条件

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 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..516ec3f 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
@@ -22,12 +22,14 @@
 import org.jeecg.modules.mdcJc.service.IMdcJcRcJobreportService;
 import org.jeecg.modules.system.entity.MdcProduction;
 import org.jeecg.modules.system.service.IMdcProductionService;
+import org.joda.time.LocalDateTime;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -68,6 +70,9 @@
 
     @Resource
     private MdcBoardMapper mdcBoardMapper;
+
+    @Resource
+    private IMdcDeviceCalendarService mdcDeviceCalendarService;
 
     /**
      * 璁惧鐘舵��
@@ -172,7 +177,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 +316,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 +339,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());
+                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 +388,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