From 88c8493c8ccd1d487966069f65ca2c9610683bdf Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 11 六月 2024 09:10:34 +0800
Subject: [PATCH] 打印
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 227 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 180 insertions(+), 47 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 8a3770f..3e8cebc 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,18 +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;
@@ -21,6 +27,9 @@
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -29,9 +38,11 @@
import java.util.*;
import java.util.stream.Collectors;
-
+@Slf4j
@Component
public class OPCUaSubscription implements SubscriptionCallback {
+
+ private static final Logger logger = LoggerFactory.getLogger("sys-user");
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -39,7 +50,7 @@
public List<String> automaticList = Arrays.asList("OP280","OP310A","OP310B", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
//閲囬泦妯＄粍宸ヤ綅 ModuleCode
- public List<String> moduleCodeList = Arrays.asList("OP300A","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
+ public List<String> moduleCodeList = Arrays.asList("OP300A","OP310A","OP310B","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
//鍖哄垎妯＄粍鍨嬪彿宸ヤ綅
public List<String> distinguishingModules = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330");
@@ -71,22 +82,28 @@
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;
}
@Override
public void onSubscribe(String identifier, Object value) {
+ logger.info("鍦板潃锛�"+identifier+"鍊硷細"+value);
try {
if(null != value && Integer.valueOf(value.toString())!= 0) {
String[] nodes = identifier.split("[.]");
@@ -112,6 +129,16 @@
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());
@@ -147,15 +174,15 @@
}else {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
}
-
}
}
}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());
+// }
}
@@ -169,16 +196,34 @@
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());
}else {
//鎵嬪姩宸ヤ綅
- if(device.contains("OP330")){
- String str = device.substring(0,5);
- WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
- }else {
+// if(device.contains("OP330")){
+// String str = device.substring(0,5);
+// WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
+// }else {
WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
- }
+// }
if(testList.stream().anyMatch(s -> s.equals(device))){
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+// 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("^");
@@ -198,11 +243,15 @@
List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
String joinedString = String.join(",", collect.toString());
WebSocketUsers.sendMessageToUserByText(map.get(device), TightenTheConversionOkNg(joinedString));
+ if(device.contains("270") || device.contains("260")){
+ logger.info("璇诲彇鍒板伐浣峽}鐨凷caner鏁版嵁锛歿}",device,TightenTheConversionOkNg(joinedString));
+ }
}
}
}
} catch (Exception e) {
-
+ logger.info("璁㈤槄鏂规硶鎶ラ敊:{}"+e.getMessage());
+ logger.error("璁㈤槄鏂规硶鎶ラ敊",e);
}
}
@@ -228,46 +277,61 @@
if(nullList.stream().noneMatch(s -> s.equals(device))){
if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
read = read + "ModuleCode";
+
}else {
read = read + "PACKCode";
}
}
- snCode = miloService.readFromOpcUa(read).getValue().toString();
-
- if(null == snCode || "".equals(snCode)){
- result = "22";
- }else{
-
- String workOrderNo = "";
- String productCode = "";
- //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
- Object orderNumberObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue();
- if(orderNumberObject!=null){
- workOrderNo = orderNumberObject.toString();
+ if(device.equals("OP365")){
+ try {
+ result = saveStationInfo365(thoroughfare,device);
+ return result;
+// return saveStationInfo365(thoroughfare,device);
+// return result;
+ }catch (Exception e){
+ e.printStackTrace();
}
+ }else {
+ snCode = miloService.readFromOpcUa(read).getValue().toString();
- Object productCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue();
- if(productCodeObject!=null){
- productCode = productCodeObject.toString();
+ if(null == snCode || "".equals(snCode)){
+ result = "22";
+ }else{
+
+ String workOrderNo = "";
+ String productCode = "";
+ //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
+ Object orderNumberObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue();
+ if(orderNumberObject!=null){
+ workOrderNo = orderNumberObject.toString();
+ }
+
+ Object productCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue();
+ if(productCodeObject!=null){
+ productCode = productCodeObject.toString();
+ }
+
+ saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
+ //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
+ SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
+
+ //濡傛灉鏄湯灏惧伐绔欒鎶ュ伐
+ if(device.equals("OP500")){
+ RestfulService.getWorkReportResultFeedback(snCode,device,format.format(new Date()));
+ //1銆佹洿鏂板伐鍗曚俊鎭�
+ updateOrderInfo(snCode);
+ }
+ try{
+ daParamCollectionService.pushGeelycvMesFeedback(snCode,device);
+ }catch (Exception e){
+ }
+ result = "21";
+
}
-
- saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
- //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
- SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
-
- //濡傛灉鏄湯灏惧伐绔欒鎶ュ伐
- if(device.equals("OP500")){
- RestfulService.getWorkReportResultFeedback(snCode,device,format.format(new Date()));
- //1銆佹洿鏂板伐鍗曚俊鎭�
- updateOrderInfo(snCode);
- }
-
- result = "21";
}
-
}catch (Exception e) {
- System.out.println(e.getMessage());
+ logger.error("鍑虹珯淇濆瓨鏁版嵁寮傚父锛�"+e);
}
return result;
}
@@ -321,8 +385,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);
}
@@ -355,7 +419,7 @@
if(tt.contains("Time")){
// String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
// ParamCollection.setParamValue(str);
- ParamCollection.setParamValue(TimeUtil.getYyyyDdMm(TimeUtil.stringProcessing(tt)));
+ ParamCollection.setParamValue(TimeUtil.test(TimeUtil.stringProcessing(tt)));
}else {
ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
}
@@ -476,4 +540,73 @@
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 String saveStationInfo365(String thoroughfare,String device) throws Exception {
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ String prefix = thoroughfare+"."+device+".";
+ List<DaPassingStationCollection> passingStationCollections = new ArrayList<>();
+ String ModuleCodeA = "";
+ String ModuleCodeB = "";
+ String StationStatusA = "";
+ String StationStatusB = "";
+
+ 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 "21";
+ }else {
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
+ return "22";
+ }
+ }
+
+ 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