From c9c1560eeffdc73c38ab8ef6e1492b164b2360f5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 16 六月 2024 09:32:56 +0800
Subject: [PATCH] 临时表功能上传
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 3e8cebc..99ba9d3 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
@@ -24,6 +24,8 @@
import com.jcdm.main.plcserver.conf.OPCElement;
import com.jcdm.main.plcserver.util.TimeUtil;
import com.jcdm.main.restful.factoryMes.service.RestfulService;
+import com.jcdm.main.restful.qingYan.doman.ChildVO;
+import com.jcdm.main.restful.qingYan.doman.ParentVO;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
@@ -35,6 +37,7 @@
import javax.websocket.Session;
import java.text.SimpleDateFormat;
+import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
@@ -313,7 +316,7 @@
saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
//3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
- SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
+ List<DaParamCollection> daParamCollectionList = SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
//濡傛灉鏄湯灏惧伐绔欒鎶ュ伐
if(device.equals("OP500")){
@@ -322,7 +325,7 @@
updateOrderInfo(snCode);
}
try{
- daParamCollectionService.pushGeelycvMesFeedback(snCode,device);
+ daParamCollectionService.automaticWorkstationPushGeelycvMesFeedback(snCode,device,daParamCollectionList);
}catch (Exception e){
}
result = "21";
@@ -391,11 +394,12 @@
daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
}
- public static void SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception {
+ public static List<DaParamCollection> SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception {
List<DaCollectionParamConf> list;
DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
daCollectionParamConf.setGatherAddress(thoroughfare+ "." + device);
list = collectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf);
+ List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
List<String> nodeIdList = list.stream().map(info -> {
String nodeid = info.getGatherAddress();
@@ -409,11 +413,12 @@
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();
+ ChildVO childVO = new ChildVO();
ParamCollection.setParamCode(list.get(i).getCollectParameterId());
ParamCollection.setLocationCode(device);
if(tt.contains("Time")){
@@ -445,12 +450,16 @@
}
}
daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
- }
- addBaseData(workOrderNo,productType,device,packCode);
+ }
+ List<DaParamCollection> baseDataList = addBaseData(workOrderNo,productType,device,packCode);
+ for (int i = 0; i < baseDataList.size(); i++){
+ daParamCollectionlist.add(baseDataList.get(i));
+ }
+ return daParamCollectionlist;
}
- public static void addBaseData(String workOrderNo,String productCode,String locationCode,String packCode){
+ public static List<DaParamCollection> addBaseData(String workOrderNo,String productCode,String locationCode,String packCode){
Map<String, String> map = new HashMap<>();
map.put("GC", "鍗楁禂宸ュ巶");
map.put("CXBH", "Pack绾�");
@@ -473,6 +482,7 @@
confList.add(saveData);
});
daParamCollectionService.insertBatch(confList);
+ return confList;
}
public static void getFactoryOrder(String locationCode){
@@ -517,13 +527,22 @@
try {
value = Float.parseFloat(part); // 灏濊瘯灏嗗瓧绗︿覆杞崲涓烘诞鐐规暟
String replacement;
- if (value == 1f) {
+ if(i<2){
+ replacement = part;
+ }else{
+ if (value == 1f) {
+ replacement = "OK";
+ } else{
+ replacement = "NG";
+ }
+ }
+ /* if (value == 1f) {
replacement = "OK";
} else if (value == 2f) {
replacement = "NG";
} else {
replacement = part; // 濡傛灉涓嶆槸1鎴�2锛屽垯淇濇寔涓嶅彉
- }
+ }*/
sb.append(replacement);
if (i < parts.length - 1) {
sb.append(','); // 娣诲姞閫楀彿锛堥櫎浜嗘渶鍚庝竴涓厓绱狅級
@@ -594,6 +613,8 @@
}
daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+ logger.info("宸ヤ綅{}鍥炲21",device);
+
return "21";
}else {
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
--
Gitblit v1.9.3