From aec7df791002689120dbccc4baefd6a06c68d8de Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 19 七月 2024 13:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://183.134.244.158:8442/r/Jcdm042-Mes-Module-One
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index ef55561..9377594 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -830,9 +830,11 @@
String cellCode = value1.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
//.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
- .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
+ .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
+ .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
+ );
if (CollUtil.isNotEmpty(list)){
- DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
+ DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(1).build());
}else {
--
Gitblit v1.9.3