From 05181bde55a539a7ee8b307d28fad7a0c68ef639 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期日, 28 七月 2024 11:14:28 +0800
Subject: [PATCH] 修改采集
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 7 +------
1 files changed, 1 insertions(+), 6 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 5899843..0bec478 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
@@ -549,7 +549,7 @@
daParamCollectionService.insertBatch(collectionList);
//濡傛灉220宸ヤ綅锛岃繘琛屾姤宸�,鍥犱负涓婂眰绯荤粺鍙敮鎸�6浣嶏紝鎵�鏈夋姤宸ュ伐浣嶄慨鏀逛负M1P220
- if("M1OP220".equals(device)) {
+ if(Constants.OP220.equals(device)) {
getWorkReportResultFeedback(moduleCode, "M1P220", format.format(new Date()));
}
@@ -874,7 +874,6 @@
private boolean OCVResultFeedBack(String thoroughfare, String device,String cellCode) throws Exception {
boolean flag = true;
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -904,7 +903,6 @@
if (ObjectUtil.isNotNull(value1)){
String cellCode = value1.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -931,7 +929,6 @@
if (ObjectUtil.isNotNull(value2)){
String cellCode = value2.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -959,7 +956,6 @@
if (ObjectUtil.isNotNull(value3)){
String cellCode = value3.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
@@ -987,7 +983,6 @@
if (ObjectUtil.isNotNull(value4)){
String cellCode = value4.toString();
List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
- //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
);
--
Gitblit v1.9.3