From e2670e7912ea7316d1f9fb518d980b8a4ef94055 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 四月 2024 10:23:28 +0800
Subject: [PATCH] 点位订阅
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 204 insertions(+), 35 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 c4683f6..5dd407c 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,6 +1,10 @@
package com.jcdm.main.plcserver.sub;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
@@ -8,7 +12,11 @@
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.om.productionOrde.domain.OmProductionOrdeInfo;
+import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.conf.OPCElement;
+import com.jcdm.main.plcserver.util.TimeUtil;
+import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
@@ -16,6 +24,7 @@
import org.springframework.stereotype.Component;
import javax.websocket.Session;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -23,8 +32,17 @@
@Component
public class OPCUaSubscription implements SubscriptionCallback {
+ public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
//鑷姩宸ヤ綅
public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
+
+ //閲囬泦妯＄粍宸ヤ綅
+ public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP330");
+
+ //绌虹殑
+ public List<String> nullList = Arrays.asList("OP250","OP260");
+
public static MiloService miloService;
@@ -36,15 +54,18 @@
public static IDaParamCollectionService daParamCollectionService;
+ public static IOmProductionOrdeInfoService omProductionOrdeInfoService;
+
public OPCUaSubscription(MiloService miloService,
IDaPassingStationCollectionService daPassingStationCollectionService,
IDaCollectionParamConfService collectionParamConfService,
- IDaParamCollectionService daParamCollectionService) {
+ IDaParamCollectionService daParamCollectionService,
+ IOmProductionOrdeInfoService omProductionOrdeInfoService) {
OPCUaSubscription.miloService = miloService;
this.daPassingStationCollectionService = daPassingStationCollectionService;
- this.collectionParamConfService = collectionParamConfService;
- this.daParamCollectionService = daParamCollectionService;
-
+ OPCUaSubscription.collectionParamConfService = collectionParamConfService;
+ OPCUaSubscription.daParamCollectionService = daParamCollectionService;
+ OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService;
}
@@ -76,20 +97,44 @@
String recordDataDoneValue = "";
if("1".equals(tabVlaue)){
- recordDataDoneValue = "11";
- //鏍￠獙鍏ョ珯鏄惁鍙互宸ヤ綔
- //杩涚珯淇濆瓨鏁版嵁
-// inSaveDate(thoroughfare,device)
- //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
-
- if(automaticList.stream().noneMatch(s -> s.equals(device))){
- //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
- WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
- }
//璇锋眰宸ュ崟
+// if(device.equals("OP230")){
+// getFactoryOrder("OP230");
+// }
+
+ //鑷姩宸ヤ綅
+ //plc缁欐垜浠竴涓猵ack鐮侊紝鎷縫ack鐮佹牎楠屽嚭鍨嬪彿
+ if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
+ //璇绘ā缁勭爜
+ 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";
+
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+
+
+ //璇锋眰宸ュ崟
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ }
+ }else {
+ //鎵嬪姩宸ヤ綅澶勭悊閫昏緫
+// if(automaticList.stream().noneMatch(s -> s.equals(device))){
+ //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
+// }
+ //鏍￠獙鍚堟牸涓嶅悎鏍煎鏋滃悎鏍煎彲浠ヨ繘绔�
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ }
+
}else if("2".equals(tabVlaue)){
if(automaticList.stream().anyMatch(s -> s.equals(device))){
@@ -111,7 +156,7 @@
else if (("AngleResult").equals(tab)) {
if("1".equals(tabVlaue)||"2".equals(tabVlaue)){
List<String> list = new ArrayList<>();
- String[] suffixes = {"Torque", "Angle", "Result", "Result1"};
+ String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};
for (String suffix : suffixes) {
String string = thoroughfare + "." + device + "." + suffix;
@@ -139,43 +184,102 @@
return SNCode;
}
-
/**
* 鍑虹珯淇濆瓨鏁版嵁
*/
public String outSaveDate(String thoroughfare,String device) {
+ String snCode = "";
String result = "";
+ String read = thoroughfare + "." + device + ".";
+
try {
- //璇诲彇SNCode
- String PACKCode = thoroughfare + "." + device + ".PACKCode";
- Object PACKCodeObject = miloService.readFromOpcUa(PACKCode).getValue();
- if(null == PACKCodeObject || "".equals(PACKCodeObject)){
- result = "22";
+ 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 PACKCodeParam = PACKCodeObject.toString();
- //1銆佹洿鏂板伐鍗曚俊鎭�
- //updateOrderInfo();
+
+ String workOrderNo = "";
+ String productCode = "";
//2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
- saveStationInfo(PACKCodeParam,thoroughfare,device);
+// String workOrderNo = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue().toString();
+// String productCode = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue().toString();
+ 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(PACKCodeParam,thoroughfare,device,"","");
+ 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());
}
return result;
}
+
+// /**
+// * 鍑虹珯淇濆瓨鏁版嵁
+// */
+// public String outSaveDate(String thoroughfare,String device) {
+// String result = "";
+// try {
+// //璇诲彇SNCode
+// String PACKCode = thoroughfare + "." + device + ".PACKCode";
+// Object PACKCodeObject = miloService.readFromOpcUa(PACKCode).getValue();
+// if(null == PACKCodeObject || "".equals(PACKCodeObject)){
+// result = "22";
+// }else{
+// String PACKCodeParam = PACKCodeObject.toString();
+// //1銆佹洿鏂板伐鍗曚俊鎭�
+// //updateOrderInfo();
+// //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
+// saveStationInfo(PACKCodeParam,thoroughfare,device);
+// //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
+// SaveParamData(PACKCodeParam,thoroughfare,device,"","");
+//
+// result = "21";
+//
+// }
+//
+// }catch (Exception e) {
+//
+// }
+// return result;
+// }
+
/**
* 淇濆瓨杩囩珯閲囬泦
*/
- public void saveStationInfo(String packCode,String thoroughfare,String device) throws Exception {
+ public void saveStationInfo(String packCode,String thoroughfare,String device,String workOrderNo,String productCode) throws Exception {
+ SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
+ sdf.setTimeZone(TimeZone.getTimeZone("GMT+8")); // CST閫氬父琛ㄧず涓浗鏍囧噯鏃堕棿锛屽嵆涓滃叓鍖�
String prefix = thoroughfare+"."+device+".";
- String workOrderNo = miloService.readFromOpcUa(prefix + "WorkOrderNumber").getValue().toString();
String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
String stationStatus = miloService.readFromOpcUa(prefix + "StationStatus").getValue().toString();
@@ -183,8 +287,12 @@
DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
daPassingStationCollection.setSfcCode(packCode);
daPassingStationCollection.setWorkOrderNo(workOrderNo);
-// daPassingStationCollection.setInboundTime(startTime);//鍏ョ珯鏃堕棿
-// daPassingStationCollection.setOutboundTime(stopTime);//鍑虹珯鏃堕棿
+ daPassingStationCollection.setProductCode(productCode);
+ daPassingStationCollection.setLocationCode(device);
+ String strt = TimeUtil.stringProcessing(startTime);
+ String end = TimeUtil.stringProcessing(stopTime);
+ daPassingStationCollection.setInboundTime(sdf.parse(strt));//鍏ョ珯鏃堕棿
+ daPassingStationCollection.setOutboundTime(sdf.parse(end));//鍑虹珯鏃堕棿
daPassingStationCollection.setOutRsSign(stationStatus);//鍑虹珯鏄惁鍚堟牸
daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
}
@@ -202,14 +310,24 @@
if(!nodeIdList.isEmpty()){
List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
+ for (int i = 0; i < readWriteEntityList.size(); i++) {
+ if(readWriteEntityList.get(i).getValue() == null){
+ readWriteEntityList.get(i).setValue(" ");
+ }
+ }
List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
for(int i=0;i<nodeIdList.size();i++){
if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
+ String tt = readWriteEntityList.get(i).getValue().toString();
DaParamCollection ParamCollection = new DaParamCollection();
-// ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
ParamCollection.setParamCode(list.get(i).getCollectParameterId());
ParamCollection.setLocationCode(device);
- ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
+ if(tt.contains("Time")){
+ String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
+ ParamCollection.setParamValue(str);
+ }else {
+ ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
+ }
ParamCollection.setSfcCode(packCode);
ParamCollection.setParamName(list.get(i).getCollectParameterName());
ParamCollection.setParamUpper(list.get(i).getParamUpper());
@@ -226,6 +344,57 @@
}
daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
}
+ addBaseData(workOrderNo,productType,device,packCode);
}
+
+ public static void addBaseData(String workOrderNo,String productCode,String locationCode,String packCode){
+ Map<String, String> map = new HashMap<>();
+ map.put("GC", "鍗楁禂宸ュ巶");
+ map.put("CXBH", "Pack绾�");
+ map.put("SBBH", "璁惧001");
+ map.put("YGBH", "鍛樺伐001");
+ List<DaParamCollection> confList = new ArrayList<>();
+ map.forEach((key, value) -> {
+ List<DaCollectionParamConf> daCollectionParamConfs = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode,locationCode)
+ .like(DaCollectionParamConf::getCollectParameterId,key));
+ DaParamCollection saveData = new DaParamCollection();
+ saveData.setWorkOrderNo(workOrderNo);
+ saveData.setProductCode(productCode);
+ saveData.setLocationCode(locationCode);
+ saveData.setSfcCode(packCode);
+ saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
+ saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
+ saveData.setCollectionTime(new Date());
+ saveData.setParamValue(value);
+ confList.add(saveData);
+ });
+ daParamCollectionService.insertBatch(confList);
+ }
+
+ public static void getFactoryOrder(String locationCode){
+ String productionWorkOrder = RestfulService.getProductionWorkOrderRequest("", locationCode);
+ JSONObject jsonObject = new JSONObject(productionWorkOrder);
+ JSONObject dataObject = jsonObject.getJSONObject("data");
+
+ String productNum = dataObject.getStr("productNum");
+ String stationCode = dataObject.getStr("stationCode");
+ String materialCode = dataObject.getStr("materialCode");
+ String productionOrderNum = dataObject.getStr("productionOrderNum");
+
+ OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
+ omProductionOrdeInfo.setProductNum(productNum);
+ omProductionOrdeInfo.setWorkOrderNo(productionOrderNum);
+ omProductionOrdeInfo.setStationCode(stationCode);
+ omProductionOrdeInfo.setProductCode(materialCode);
+ omProductionOrdeInfoService.save(omProductionOrdeInfo);
+ }
+
+ public static void updateOrderInfo(String packCode){
+ OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, packCode));
+ one.setOrderStatus("5");
+ omProductionOrdeInfoService.saveOrUpdate(one);
+ }
+
}
--
Gitblit v1.9.3