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 | 132 ++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 54 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 d432dc1..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;
@@ -277,58 +280,61 @@
if(nullList.stream().noneMatch(s -> s.equals(device))){
if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
read = read + "ModuleCode";
- if(device.equals("OP365")){
- try {
- result = saveStationInfo365(thoroughfare,device);
- return result;
- }catch (Exception e){
- e.printStackTrace();
- }
- }
+
}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();
- }
-
- 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";
-
- }
}
}
+ 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();
+ 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銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
+ List<DaParamCollection> daParamCollectionList = SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
+
+ //濡傛灉鏄湯灏惧伐绔欒鎶ュ伐
+ if(device.equals("OP500")){
+ RestfulService.getWorkReportResultFeedback(snCode,device,format.format(new Date()));
+ //1銆佹洿鏂板伐鍗曚俊鎭�
+ updateOrderInfo(snCode);
+ }
+ try{
+ daParamCollectionService.automaticWorkstationPushGeelycvMesFeedback(snCode,device,daParamCollectionList);
+ }catch (Exception e){
+ }
+ result = "21";
+
+ }
+
+ }
}catch (Exception e) {
- System.out.println(e.getMessage());
+ logger.error("鍑虹珯淇濆瓨鏁版嵁寮傚父锛�"+e);
}
return result;
}
@@ -388,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();
@@ -406,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")){
@@ -442,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绾�");
@@ -470,6 +482,7 @@
confList.add(saveData);
});
daParamCollectionService.insertBatch(confList);
+ return confList;
}
public static void getFactoryOrder(String locationCode){
@@ -514,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(','); // 娣诲姞閫楀彿锛堥櫎浜嗘渶鍚庝竴涓厓绱狅級
@@ -590,10 +612,12 @@
passingStationCollections.add(daPassingStationCollection);
}
daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
- //miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+// 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());
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
return "22";
}
}
--
Gitblit v1.9.3