From dc4d5cb49cba56d843f72c5244a04e8efd0beb40 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 04 六月 2024 10:55:49 +0800
Subject: [PATCH] update

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java |   57 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 41 insertions(+), 16 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..cb3f76b 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,12 @@
 
     @Resource
     private IMdcProductionService mdcProductionService;
+
+    @Resource
+    private IEquipmentLogService equipmentLogService;
+
+    @Resource
+    private IMdcFeedbackService mdcFeedbackService;
 
     /**
      * 璁惧杩愯鐘舵�佺粺璁�
@@ -383,6 +383,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 +413,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,15 +477,32 @@
         }
         String saveTableName = mdcEquipment.getSaveTableName();
         MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
-        if ("LSV2".equals(mdcEquipment.getDriveType())) {
-            dto.setSpindlebeilv(dto.getSFeed());
-            dto.setFeedbeilv(dto.getFFeed());
-            dto.setRapidfeed(dto.getRapidfeed());
-            dto.setNCVersion(dto.getNCVersion());
-            dto.setTNCVersion(dto.getTNCVersion());
-            dto.setOPTVersion(dto.getOPTVersion());
-            dto.setPLCVersion(dto.getPLCVersion());
+        if (dto != null) {
+            if ("LSV2".equals(mdcEquipment.getDriveType())) {
+                dto.setSpindlebeilv(dto.getSFeed());
+                dto.setFeedbeilv(dto.getFFeed());
+                dto.setRapidfeed(dto.getRapidfeed());
+                dto.setNCVersion(dto.getNCVersion());
+                dto.setTNCVersion(dto.getTNCVersion());
+                dto.setOPTVersion(dto.getOPTVersion());
+                dto.setPLCVersion(dto.getPLCVersion());
+            }
+            // 鏌ヨ璁惧鐘舵��
+            EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
+            Integer oporation = equipmentLog.getOporation();
+            if (oporation == 22) {
+                dto.setALRMstate(equipmentLog.getAlarm());
+            } else {
+                dto.setALRMstate("鏃�");
+            }
+        } else {
+            return null;
         }
         return dto;
     }
+
+    @Override
+    public List<MdcFeedback> getFeedbackList(String key) {
+        return mdcFeedbackService.getFeedbackList(key);
+    }
 }

--
Gitblit v1.9.3