From 1ccd6932893e47722574e6d1147e63b2ec4972c1 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 17 五月 2024 08:45:52 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 211 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 158 insertions(+), 53 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 12af80d..b4679e5 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
@@ -1,17 +1,24 @@
package com.jcdm.main.plcserver.sub;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
+import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.da.testDeviceInterface.domain.DaTestDeviceInterface;
+import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.conf.OPCElement;
@@ -50,6 +57,9 @@
//鍖哄垎pack鍨嬪彿鐨勫伐浣�
public List<String> packIdList = Arrays.asList("OP280","OP360","OP390","OP470");
+ //娴嬭瘯璁惧鎵嬪姩宸ヤ綅
+ public List<String> testList = Arrays.asList("OP430-1","OP430-2","OP430-3","OP430-4","OP480-1","OP480-2","OP480-3","OP440");
+
//绌虹殑
public List<String> nullList = Arrays.asList("OP250","OP260");
@@ -67,16 +77,21 @@
public static IOmProductionOrdeInfoService omProductionOrdeInfoService;
+ private static IDaTestDeviceInterfaceService daTestDeviceInterfaceService;
+
+
public OPCUaSubscription(MiloService miloService,
IDaPassingStationCollectionService daPassingStationCollectionService,
IDaCollectionParamConfService collectionParamConfService,
IDaParamCollectionService daParamCollectionService,
- IOmProductionOrdeInfoService omProductionOrdeInfoService) {
+ IOmProductionOrdeInfoService omProductionOrdeInfoService,
+ IDaTestDeviceInterfaceService daTestDeviceInterfaceService) {
OPCUaSubscription.miloService = miloService;
this.daPassingStationCollectionService = daPassingStationCollectionService;
OPCUaSubscription.collectionParamConfService = collectionParamConfService;
OPCUaSubscription.daParamCollectionService = daParamCollectionService;
OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService;
+ OPCUaSubscription.daTestDeviceInterfaceService = daTestDeviceInterfaceService;
}
@@ -91,20 +106,7 @@
String tab = nodes[2];//鏍囪
String tabVlaue = value.toString();//鍦板潃鍊�
- //璇锋眰涓嬪彂SN鍙�
- if (("RecordSN").equals(tab) && "1".equals(tabVlaue)) {
- //鑾峰彇SN鍙锋柟娉�
- String SNCode = getSNCode();
-
- //涓嬪彂SN
- String SNCodeAddress = thoroughfare + "." + device + ".SNCode";
- miloService.writeToOpcChar(ReadWriteEntity.builder().identifier(SNCodeAddress).value(SNCode).build());
- //涓嬪彂SN瀹屾垚
- String recordSNDoneAddress = thoroughfare + "." + device + ".RecordSNDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(recordSNDoneAddress).value(1).build());
- }
- //璇锋眰璁板綍鏁版嵁
- else if (("RecordData").equals(tab)) {
+ if (("RecordData").equals(tab)) {
String recordDataDoneValue = "";
if("1".equals(tabVlaue)){
@@ -117,49 +119,60 @@
//鑷姩宸ヤ綅
if(automaticList.stream().anyMatch(s -> s.equals(device))){
//plc缁欐垜浠竴涓ā缁勭爜锛屾嬁妯＄粍鐮佹牎楠屽嚭鍨嬪彿
- if(distinguishingModules.stream().anyMatch(s -> s.equals(device))) {
+ if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
//璇绘ā缁勭爜
-// String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
-// String productTye = thoroughfare + "." + device + ".ProductType";
-// if (null != moduleCode && moduleCode.length() == 24) {
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7, 8))).build());
-// //杩涚珯淇濆瓨鏁版嵁
-//// inSaveDate(thoroughfare,device)
-// //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
-//
+ Object moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
+ if(device.equals("OP365")){
+ Object moduleCodeA = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCodeA").getValue();
+ Object moduleCodeB = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCodeB").getValue();
+ if(moduleCodeA!=null && moduleCodeB!=null){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
+ }
+ return;
+ }
+
+ if(moduleCode!=null){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
-//
-//
-// //璇锋眰宸ュ崟
-// } else {
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
-// }
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
+ }
}else {
if(agvId.stream().anyMatch(s -> s.equals(device))){
- String agvId = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue().toString();
- String PACKCode = thoroughfare + "." + device + ".MPACKCode";
- if (null != agvId) {
- OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvId));
- String packId = one.getProductNum();
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
- } else {
+ Object agvIdObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue();
+ //agvId 灏忚溅鐮佹槸鍚︿负绌�
+ if(agvIdObject!=null){
+ String PACKCode = thoroughfare + "." + device + ".MPACKCode";
+ OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvIdObject.toString()));
+ //灏忚溅鐮佹煡鎵惧伐鍗曟槸鍚︿负绌�
+ if(one!=null){
+ String packId = one.getProductNum();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ }
+ }else {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
}
- }
- //pack 濡傛灉鍖哄垎鍨嬪彿鐨勮瘽灏辫澶勭悊
- //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ }else {
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".PACKCode").getValue();
+ if(packCodeObject!=null){
+ //pack 濡傛灉鍖哄垎鍨嬪彿鐨勮瘽灏辫澶勭悊
+ //璁板綍鏁版嵁瀹屾垚
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
+ }
+ }
}
}else {
//鎵嬪姩宸ヤ綅澶勭悊閫昏緫
-// if(automaticList.stream().noneMatch(s -> s.equals(device))){
- //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
- WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
-// }
- //鏍￠獙鍚堟牸涓嶅悎鏍煎鏋滃悎鏍煎彲浠ヨ繘绔�
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
@@ -182,6 +195,27 @@
}else {
WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
}
+ if(testList.stream().anyMatch(s -> s.equals(device))){
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+// Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
+// DaTestDeviceInterface deviceInterfaceOne = null;
+//
+// if (ObjectUtil.isNotNull(packCodeObject)) {
+// String modelCode = packCodeObject.toString();
+// deviceInterfaceOne = daTestDeviceInterfaceService.getOne(new LambdaQueryWrapper<DaTestDeviceInterface>()
+// .eq(DaTestDeviceInterface::getProductNum, modelCode)
+// .eq(DaTestDeviceInterface::getStationCode, device));
+// }
+//
+// if (deviceInterfaceOne != null && "1".equals(deviceInterfaceOne.getTotalResult())) {
+// writeToOpc(RecordDataDoneAddress, (short) 21);
+// } else {
+// writeToOpc(RecordDataDoneAddress, (short) 22);
+// }
+ writeToOpc(RecordDataDoneAddress, (short) 21);
+ }
+
+
}
}else {
System.out.println("^");
@@ -231,6 +265,13 @@
if(nullList.stream().noneMatch(s -> s.equals(device))){
if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
read = read + "ModuleCode";
+ if(device.equals("OP365")){
+ try {
+ saveStationInfo365(thoroughfare,device);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
}else {
read = read + "PACKCode";
}
@@ -264,7 +305,10 @@
//1銆佹洿鏂板伐鍗曚俊鎭�
updateOrderInfo(snCode);
}
-
+ try{
+ daParamCollectionService.pushGeelycvMesFeedback(snCode,device);
+ }catch (Exception e){
+ }
result = "21";
}
@@ -324,8 +368,8 @@
daPassingStationCollection.setLocationCode(device);
String strt = TimeUtil.stringProcessing(startTime);
String end = TimeUtil.stringProcessing(stopTime);
- daPassingStationCollection.setInboundTime(sdf.parse(strt));//鍏ョ珯鏃堕棿
- daPassingStationCollection.setOutboundTime(sdf.parse(end));//鍑虹珯鏃堕棿
+ daPassingStationCollection.setInboundTime(format.parse(TimeUtil.test(strt)));//鍏ョ珯鏃堕棿
+ daPassingStationCollection.setOutboundTime(format.parse(TimeUtil.test(end)));//鍑虹珯鏃堕棿
daPassingStationCollection.setOutRsSign(stationStatus);//鍑虹珯鏄惁鍚堟牸
daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
}
@@ -356,12 +400,20 @@
ParamCollection.setParamCode(list.get(i).getCollectParameterId());
ParamCollection.setLocationCode(device);
if(tt.contains("Time")){
- String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
- ParamCollection.setParamValue(str);
+// String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
+// ParamCollection.setParamValue(str);
+ ParamCollection.setParamValue(TimeUtil.test(TimeUtil.stringProcessing(tt)));
}else {
ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
}
ParamCollection.setSfcCode(packCode);
+ if(device.contains("OP360")){
+ String node = nodeIdList.get(i);
+ Object value = miloService.readFromOpcUa("PACK.OP360.ModuleSNCode"+node.charAt(node.length()-1)).getValue();
+ if(value!=null){
+ ParamCollection.setModuleCode(value.toString());
+ }
+ }
ParamCollection.setParamName(list.get(i).getCollectParameterName());
ParamCollection.setParamUpper(list.get(i).getParamUpper());
ParamCollection.setParamLower(list.get(i).getParamLower());
@@ -471,4 +523,57 @@
return sb.toString();
}
+
+ /**
+ * 鏍￠獙鏄惁瀛樺湪NG
+ * @param packCode sfcCode
+ * @return boolean
+ */
+ public boolean checkIsNG(String packCode,String modelCode){
+ List<DaPassingStationCollection> list = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>()
+ .eq(StrUtil.isNotBlank(packCode),DaPassingStationCollection::getSfcCode, packCode)
+ .eq(DaPassingStationCollection::getOutRsSign, Constants.UN_PASS));
+ return CollUtil.isEmpty(list);
+ }
+
+ /**
+ * 淇濆瓨杩囩珯閲囬泦
+ */
+ public void saveStationInfo365(String thoroughfare,String device) throws Exception {
+ 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 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);
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+ return;
+ }
+
+ private static void writeToOpc(String identifier, short value) {
+ try {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(identifier).value(value).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
}
--
Gitblit v1.9.3