From 127f1bc6b4b204cb32462cc24ead9e7821afe095 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期日, 28 四月 2024 17:23:30 +0800
Subject: [PATCH] 更新过站
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 d8ea123..8557a51 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
@@ -21,7 +21,6 @@
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
-import javafx.animation.Timeline;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -388,7 +387,7 @@
List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
if (CollUtil.isNotEmpty(nodeIdList)){
for(int i=0;i<nodeIdList.size();i++){
- if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
+ if(ObjectUtil.isNotEmpty(readWriteEntityList.get(i).getValue()) && !readWriteEntityList.get(i).getValue().toString().equals("0.0")){
DaParamCollection ParamCollection = new DaParamCollection();
ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
ParamCollection.setLocationCode(parts[1]);
@@ -420,6 +419,17 @@
String str = object.toString();
beatTime = Float.valueOf(str).longValue();
}
+ Object ProductStatus = miloService.readFromOpcUa(parts[0] + "." + parts[1] + ".ProductStatus").getValue();
+ log.info("ProductStatus,{}",ProductStatus.toString());
+ String str1="鍚堟牸" ;
+ if (ObjectUtil.isNotEmpty(ProductStatus)){
+ String productStatusString = ProductStatus.toString();
+ if (productStatusString.contains("2") || productStatusString.contains("3")){
+ str1="涓嶅悎鏍�";
+ }else {
+ str1="鍚堟牸";
+ }
+ }
DaPassingStationCollection PassingStationCollection=new DaPassingStationCollection();
PassingStationCollection.setSfcCode(SNCode);
PassingStationCollection.setLocationCode(parts[1]);
@@ -428,7 +438,7 @@
PassingStationCollection.setCollectionTime(new Date());
PassingStationCollection.setCreateTime(new Date());
PassingStationCollection.setBeatTime(beatTime.toString());
- PassingStationCollection.setOutRsSign("鍚堟牸");
+ PassingStationCollection.setOutRsSign(str1);
passingStationCollectionServiceImpl.insertDaPassingStationCollection(PassingStationCollection);
log.info("-------淇濆瓨杩囩珯璁板綍鏁版嵁瀹屾垚---------");
--
Gitblit v1.9.3