From 5564c5450bb12bf9f31b0fc12133b34fab9b91f9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 27 九月 2024 15:18:36 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java | 13 +++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java | 10 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml | 12 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcSubLargeScreenService.java | 10 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java | 21 ++++++++++
5 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java
index dd399e1..aa774a4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java
@@ -31,4 +31,14 @@
* @return
*/
List<EquipmentAlarmDto> list(@Param("equipmentAlarmVo") EquipmentAlarmVo equipmentAlarmVo);
+
+ /**
+ * 鎶ヨ鍒楄〃
+ *
+ * @param productionId
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ List<EquipmentAlarm> equipmentAlarm(@Param("productionId") String productionId, @Param("startDate") String startDate, @Param("endDate") String endDate);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
index b024828..c570ff3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
@@ -67,4 +67,16 @@
, t1.EquipmentID DESC
</if>
</select>
+
+ <select id="equipmentAlarm" resultType="org.jeecg.modules.mdc.entity.EquipmentAlarm">
+ SELECT
+ t1.*
+ FROM
+ EquipmentAlarm t1
+ LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
+ LEFT JOIN mdc_production_equipment t3 ON t2.id = t3.equipment_id
+ WHERE
+ t3.production_id = #{productionId}
+ AND t1.collectTime BETWEEN #{startDate} AND #{endDate}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java
index 5048d9e..8faddb5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.mdc.entity.EquipmentAlarm;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdcJc.entity.MdcProductDayschedule;
import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto;
@@ -42,12 +43,12 @@
return Result.ok(result);
}
-// @ApiOperation(value = "鍒嗘帶鐪嬫澘-璁惧瀹炴椂鐘舵��", notes = "鍒嗘帶鐪嬫澘-璁惧瀹炴椂鐘舵��")
-// @GetMapping("/equipmentStatus")
-// public Result<?> equipmentStatus(String productionId) {
-// List<MdcEquipmentMonitor> result = mdcSubLargeScreenService.equipmentStatus(productionId);
-// return Result.ok(result);
-// }
+ @ApiOperation(value = "鍒嗘帶鐪嬫澘-璁惧鎶ヨ", notes = "鍒嗘帶鐪嬫澘-璁惧鎶ヨ")
+ @GetMapping("/equipmentAlarm")
+ public Result<?> equipmentAlarm(String productionId) {
+ List<EquipmentAlarm> result = mdcSubLargeScreenService.equipmentAlarm(productionId);
+ return Result.ok(result);
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcSubLargeScreenService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcSubLargeScreenService.java
index 40f20d6..bc14302 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcSubLargeScreenService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcSubLargeScreenService.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.screen.service;
+import org.jeecg.modules.mdc.entity.EquipmentAlarm;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto;
@@ -26,4 +27,13 @@
*/
List<MdcEquipmentMonitor> equipmentStatus(String productionId);
+ /**
+ * 璁惧鎶ヨ
+ *
+ * @param productionId
+ * @return
+ */
+ List<EquipmentAlarm> equipmentAlarm(String productionId);
+
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
index fa40a9f..04c55cf 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.screen.service.impl;
+import org.jeecg.modules.mdc.entity.EquipmentAlarm;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
+import org.jeecg.modules.mdc.mapper.EquipmentAlarmMapper;
import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto;
import org.jeecg.modules.screen.mapper.MdcSubLargeScreenMapper;
import org.jeecg.modules.screen.service.MdcSubLargeScreenService;
@@ -10,6 +12,9 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -22,6 +27,9 @@
@Resource
private MdcSubLargeScreenMapper mdcSubLargeScreenMapper;
+
+ @Resource
+ private EquipmentAlarmMapper equipmentAlarmMapper;
private final String today = LocalDate.now().toString();
@@ -80,4 +88,17 @@
}
return result;
}
+
+ /**
+ * 璁惧鎶ヨ
+ *
+ * @param productionId
+ * @return
+ */
+ @Override
+ public List<EquipmentAlarm> equipmentAlarm(String productionId) {
+ String startDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.of(LocalDate.now(), LocalTime.MIN));
+ String endDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(1));
+ return equipmentAlarmMapper.equipmentAlarm(productionId, startDate, endDate);
+ }
}
--
Gitblit v1.9.3