From a60fef88880990c61fa45072b092150c1ffec437 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 25 五月 2024 10:12:58 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 23 ++++++-----
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 72 ++++++++++++++++++++++-------------
2 files changed, 58 insertions(+), 37 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index fb51ea8..52557f1 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.common.utils.StringUtils;
import com.jcdm.main.bs.formula.service.IBsFormulaInfoService;
import com.jcdm.main.bs.formula.service.impl.BsFormulaInfoServiceImpl;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
@@ -206,17 +207,19 @@
@Override
public void addTighteningParameters(DaParamCollection daParamCollection) {
- String tightenData = daParamCollection.getTightenTheArray();
- tightenData = tightenData.replace("[", "").replace("]", "").replace(" ", "");
- String[] tightenDataParts = tightenData.split(",");
String paramCode = daParamCollection.getParamCode();
- String[] paramCodeParts = paramCode.split(",");
- for (int i = 0; i < paramCodeParts.length; i++) {
- daParamCollection.setParamValue(tightenDataParts[i]);
- daParamCollection.setParamCode(paramCodeParts[i]);
- daParamCollection.setCollectionTime(new Date());
- daParamCollection.setSfcCode(daParamCollection.getProductBarcode());
- daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ String tightenData = daParamCollection.getTightenTheArray();
+ if(StringUtils.isNotBlank(paramCode)&&StringUtils.isNotBlank(tightenData)){
+ tightenData = tightenData.replace("[", "").replace("]", "").replace(" ", "");
+ String[] tightenDataParts = tightenData.split(",");
+ String[] paramCodeParts = paramCode.split(",");
+ for (int i = 0; i < paramCodeParts.length; i++) {
+ daParamCollection.setParamValue(tightenDataParts[i]);
+ daParamCollection.setParamCode(paramCodeParts[i]);
+ daParamCollection.setCollectionTime(new Date());
+ daParamCollection.setSfcCode(daParamCollection.getProductBarcode());
+ daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ }
}
}
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 1452680..ba7bcee 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
@@ -172,10 +172,11 @@
}
}else {
//鎵嬪姩宸ヤ綅澶勭悊閫昏緫
- WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
-
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+// if (map.containsKey(device)){
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+// }
}
@@ -212,7 +213,8 @@
// } else {
// writeToOpc(RecordDataDoneAddress, (short) 22);
// }
- writeToOpc(RecordDataDoneAddress, (short) 21);
+// writeToOpc(RecordDataDoneAddress, (short) 21);
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
}
@@ -540,32 +542,48 @@
* 淇濆瓨杩囩珯閲囬泦
*/
public void saveStationInfo365(String thoroughfare,String device) throws Exception {
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
String prefix = thoroughfare+"."+device+".";
List<DaPassingStationCollection> passingStationCollections = new ArrayList<>();
- String ModuleCodeA = miloService.readFromOpcUa(prefix + "ModuleCodeA").getValue().toString();
- String ModuleCodeB = miloService.readFromOpcUa(prefix + "ModuleCodeB").getValue().toString();
- String StationStatusA = miloService.readFromOpcUa(prefix + "StationStatusA").getValue().toString();
- String StationStatusB = miloService.readFromOpcUa(prefix + "StationStatusB").getValue().toString();
- String[] modeles = {ModuleCodeA,ModuleCodeB};
- String[] StationStatus = {StationStatusA,StationStatusB};
+ String ModuleCodeA = "";
+ String ModuleCodeB = "";
+ String StationStatusA = "";
+ String StationStatusB = "";
- String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
- String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
- for (int i = 0; i < 2; i++) {
- DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
- String strt = TimeUtil.stringProcessing(startTime);
- String end = TimeUtil.stringProcessing(stopTime);
- daPassingStationCollection.setInboundTime(format.parse(TimeUtil.test(strt)));//鍏ョ珯鏃堕棿
- daPassingStationCollection.setOutboundTime(format.parse(TimeUtil.test(end)));//鍑虹珯鏃堕棿
- daPassingStationCollection.setSfcCode(modeles[i]);
- daPassingStationCollection.setLocationCode(device);
- daPassingStationCollection.setOutRsSign(StationStatus[i]);//鍑虹珯鏄惁鍚堟牸
- passingStationCollections.add(daPassingStationCollection);
+ Object objectModuleCodeA = miloService.readFromOpcUa(prefix + "ModuleCodeA").getValue();
+ Object objectModuleCodeB = miloService.readFromOpcUa(prefix + "ModuleCodeB").getValue();
+ Object objectStationStatusA = miloService.readFromOpcUa(prefix + "StationStatusA").getValue();
+ Object objectStationStatusB = miloService.readFromOpcUa(prefix + "StationStatusB").getValue();
+
+ if(ObjectUtil.isNotNull(objectModuleCodeA) && ObjectUtil.isNotNull(objectStationStatusA) && ObjectUtil.isNotNull(objectModuleCodeB) && ObjectUtil.isNotNull(objectStationStatusB)){
+ ModuleCodeA = objectModuleCodeA.toString();
+ ModuleCodeB = objectModuleCodeB.toString();
+ StationStatusA = objectStationStatusA.toString();
+ StationStatusB = objectStationStatusB.toString();
+
+ String[] modeles = {ModuleCodeA,ModuleCodeB};
+ String[] StationStatus = {StationStatusA,StationStatusB};
+
+ String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
+ String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
+ for (int i = 0; i < 2; i++) {
+ DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ String strt = TimeUtil.stringProcessing(startTime);
+ String end = TimeUtil.stringProcessing(stopTime);
+ daPassingStationCollection.setInboundTime(format.parse(TimeUtil.test(strt)));//鍏ョ珯鏃堕棿
+ daPassingStationCollection.setOutboundTime(format.parse(TimeUtil.test(end)));//鍑虹珯鏃堕棿
+ daPassingStationCollection.setSfcCode(modeles[i]);
+ daPassingStationCollection.setLocationCode(device);
+ daPassingStationCollection.setOutRsSign(StationStatus[i]);//鍑虹珯鏄惁鍚堟牸
+ passingStationCollections.add(daPassingStationCollection);
+ }
+ daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+ return;
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
+ return;
}
- daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
- return;
}
private static void writeToOpc(String identifier, short value) {
--
Gitblit v1.9.3