From 19f59c243e8df97c8b9fd9dba4e758be8235d68b Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 25 十一月 2025 17:02:54 +0800
Subject: [PATCH] 添加卧转立扫码、卧转立、大车、大理片笼基础任务流转逻辑
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceConfigServiceImpl.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceConfigServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceConfigServiceImpl.java
index 1488243..292bd8f 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceConfigServiceImpl.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceConfigServiceImpl.java
@@ -135,9 +135,9 @@
// 璁惧绫诲瀷杩囨护
if (deviceType != null && !deviceType.trim().isEmpty()) {
- String convertedDeviceType = convertDeviceTypeFromString(deviceType);
- if (convertedDeviceType != null) {
- wrapper.eq(DeviceConfig::getDeviceType, convertedDeviceType);
+ List<String> convertedDeviceTypes = convertDeviceTypeFromString(deviceType);
+ if (convertedDeviceTypes != null && !convertedDeviceTypes.isEmpty()) {
+ wrapper.in(DeviceConfig::getDeviceType, convertedDeviceTypes);
}
}
@@ -315,24 +315,42 @@
/**
* 瀛楃涓茶浆鎹负璁惧绫诲瀷
*/
- private String convertDeviceTypeFromString(String deviceType) {
- if (deviceType == null) return null;
+ private List<String> convertDeviceTypeFromString(String deviceType) {
+ if (deviceType == null) {
+ return Collections.emptyList();
+ }
- switch (deviceType.trim().toLowerCase()) {
+ String normalized = deviceType.trim().toLowerCase();
+ switch (normalized) {
case "load_vehicle":
case "涓婂ぇ杞�":
+ case "涓婂ぇ杞﹁澶�":
+ case "澶ц溅璁惧":
case "1":
- return DeviceConfig.DeviceType.LOAD_VEHICLE;
+ return Arrays.asList(
+ DeviceConfig.DeviceType.LOAD_VEHICLE,
+ "澶ц溅璁惧"
+ );
case "large_glass":
case "澶х悊鐗�":
+ case "澶х悊鐗囩":
case "2":
- return DeviceConfig.DeviceType.LARGE_GLASS;
+ return Arrays.asList(
+ DeviceConfig.DeviceType.LARGE_GLASS,
+ "澶х悊鐗囩"
+ );
case "glass_storage":
case "鐜荤拑瀛樺偍":
+ case "鍗у紡缂撳瓨":
+ case "鐜荤拑瀛樺偍璁惧":
case "3":
- return DeviceConfig.DeviceType.GLASS_STORAGE;
+ return Arrays.asList(
+ DeviceConfig.DeviceType.GLASS_STORAGE,
+ "鍗у紡缂撳瓨",
+ "鐜荤拑瀛樺偍璁惧"
+ );
default:
- return null;
+ return Collections.emptyList();
}
}
@@ -624,12 +642,12 @@
}
// 璁惧绫诲瀷杩囨护
- if (deviceType != null && !deviceType.trim().isEmpty()) {
- String convertedDeviceType = convertDeviceTypeFromString(deviceType);
- if (convertedDeviceType != null) {
- wrapper.eq(DeviceConfig::getDeviceType, convertedDeviceType);
- }
+ if (deviceType != null && !deviceType.trim().isEmpty()) {
+ List<String> convertedDeviceTypes = convertDeviceTypeFromString(deviceType);
+ if (convertedDeviceTypes != null && !convertedDeviceTypes.isEmpty()) {
+ wrapper.in(DeviceConfig::getDeviceType, convertedDeviceTypes);
}
+ }
// 璁惧鐘舵�佽繃婊�
if (deviceStatus != null && !deviceStatus.trim().isEmpty()) {
--
Gitblit v1.8.0