From 31ecdb8c700529a59dd762f0c47f0ed9c66d5092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 25 九月 2025 20:40:07 +0800
Subject: [PATCH] 工控网任务
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java
index 5a321dc..6915e01 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java
@@ -355,14 +355,25 @@
if(StringUtils.isBlank(sendPathLine)){
return null;
}
- //鍘绘帀棣栦綅鎷彿锛屾帓闄ゅ彂閭ｇ鏈哄簥娉ㄩ噴
- String sendPath = escapeSqlWildcard(StringUtils.trim(StringUtils.removeEnd(StringUtils.removeStart(sendPathLine,"("),")")));
+ //鍘绘帀鏈熬鎷彿(鍙戦偅绉�) ,鏈熬璺緞鍒嗛殧绗�
+ String tempPath = StringUtils.removeEnd(StringUtils.removeEnd(StringUtils.removeEnd(sendPathLine,")"),"/"),"\\");
+ //鍘绘帀鍓�2浣嶅彲鑳界殑娉ㄩ噴(*-)銆�
+ String sendPath = escapeSqlWildcard(StringUtils.trim(StringUtils.substring(tempPath,2)));
- List<Machine> machines = lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).likeLeft(Machine::getProgSendDir,sendPath).list();
+ List<Machine> machines = lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).like(Machine::getProgSendDir,sendPath).list();
if(machines.isEmpty()){
return null;
}else{
return machines.get(0);
}
}
+
+ /**
+ * 鏍规嵁璁惧缂栧彿鏌ヨ鏈哄簥
+ * @param equipmentCode 璁惧缂栧彿
+ * @return 鏈哄簥瀵硅薄
+ */
+ public Machine getByEquipmentCode(String equipmentCode) {
+ return this.lambdaQuery().eq(Machine::getEquipmentCode, equipmentCode).one();
+ }
}
--
Gitblit v1.9.3