From a4362dfe3e0e9c6fad426685da0065455799d018 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 10 七月 2024 20:06:15 +0800
Subject: [PATCH] cvt交互逻辑更新
---
jcdm-ui/src/views/main/kb/cvt/index.vue | 18 ++++--
jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js | 2
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java | 24 +++++--
jcdm-main/src/main/java/com/jcdm/main/plcserver/init/CustomRunner.java | 9 ++
jcdm-main/src/main/java/com/jcdm/main/plcserver/callback/InitCallback.java | 111 +++++++++++++++++++++---------------
5 files changed, 102 insertions(+), 62 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
index 029e9f8..15c89c8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
@@ -157,13 +157,23 @@
public AjaxResult initializedData(@RequestParam String sfcCode, @RequestParam String locationCode) {
try {
- String nodeId = "CFL4CVT." + locationCode + ".MesSNCode";
- ReadWriteEntity entity = new ReadWriteEntity(nodeId, sfcCode);
- miloService.writeToOpcUa(entity);
- String SaveSNCode ="CFL4CVT." + locationCode + ".SaveSNCode";
- ReadWriteEntity SaveSNCodeEntity = new ReadWriteEntity(SaveSNCode, 11);
- miloService.writeToOpcUa(SaveSNCodeEntity);
- return AjaxResult.success("SFC Code updated successfully");
+ String str = "CFL4CVT."+locationCode+".RecordData";
+ Object recordDataObject = miloService.readFromOpcUa(str).getValue();
+ if(Integer.valueOf(recordDataObject.toString())== 1){
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier("CFL4CVT." + locationCode + ".MesSNCode").value(sfcCode).build());
+ ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT." + locationCode + ".MesRecordDataDone", 11);
+ miloService.writeToOpcShort(entity);
+ return AjaxResult.success("鎵爜鎴愬姛");
+ }else {
+ return AjaxResult.error(500,"鏈繘绔欑姝㈡壂鐮�");
+ }
+// ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT." + locationCode + ".MesSNCode", sfcCode);
+// miloService.writeToOpcChar(entity);
+// String nodeId = "CFL4CVT." + locationCode + ".MesSNCode";
+// String SaveSNCode ="CFL4CVT." + locationCode + ".SaveSNCode";
+// ReadWriteEntity SaveSNCodeEntity = new ReadWriteEntity(SaveSNCode, 11);
+// miloService.writeToOpcShort(SaveSNCodeEntity);
+// return AjaxResult.success("SFC Code updated successfully");
} catch (Exception e) {
throw new RuntimeException("Failed to update SFC Code in OPC UA", e);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/callback/InitCallback.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/callback/InitCallback.java
index d7a6c53..94af5de 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/callback/InitCallback.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/callback/InitCallback.java
@@ -54,53 +54,31 @@
String ecpStr = "";//寮傚父璁板綍鏍囪
try {
if (null != value) {
- //BCOP40杩涚珯鏍￠獙
- if (identifier.equals("CFL4CVT.BCOP040.RecordData") && null != value && "1".equals(value.toString())) {
- //寰呮坊鍔犱粠杩囩珯閲囬泦琛ㄥ彇sfc_code鍐欏叆plc鐨剆ncode鏂规硶
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BCOP040.MesRecordDataDone", 11);
- miloService.writeToOpcByte(entity);
+ //BCOP010鍑虹珯鏍￠獙
+ if (identifier.equals("CFL4CVT.BCOP010.RecordData") && null != value && "2".equals(value.toString())) {
+ ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BCOP010.MesRecordDataDone", 21);
+ miloService.writeToOpcShort(entity);
}
//BCOP40鍑虹珯鏍￠獙
else if (identifier.equals("CFL4CVT.BCOP040.RecordData") && null != value && "2".equals(value.toString())) {
- SaveData("CFL4CVT.BCOP40.RecordData");
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BCOP040.MesRecordDataDone", 21);
- miloService.writeToOpcByte(entity);
- }
- //BCOP60杩涚珯鏍￠獙
- else if (identifier.equals("CFL4CVT.BCOP060.RecordData") && null != value && "1".equals(value.toString())) {
- //寰呮坊鍔犱粠杩囩珯閲囬泦琛ㄥ彇sfc_code鍐欏叆plc鐨剆ncode鏂规硶
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BCOP060.MesRecordDataDone", 11);
- miloService.writeToOpcByte(entity);
+ SaveData("CFL4CVT.BCOP040.RecordData");
}
//BCOP60鍑虹珯鏍￠獙
else if (identifier.equals("CFL4CVT.BCOP060.RecordData") && null != value && "2".equals(value.toString())) {
SaveData("CFL4CVT.BCOP060.RecordData");
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BCOP060.MesRecordDataDone", 21);
- miloService.writeToOpcByte(entity);
- }
- //BCOP100杩涚珯鏍￠獙
- else if (identifier.equals("CFL4CVT.BCOP100.RecordData") && null != value && "1".equals(value.toString())) {
- //寰呮坊鍔犱粠杩囩珯閲囬泦琛ㄥ彇sfc_code鍐欏叆plc鐨剆ncode鏂规硶
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BCOP100.MesRecordDataDone", 11);
- miloService.writeToOpcByte(entity);
}
//BCOP100鍑虹珯鏍￠獙
else if (identifier.equals("CFL4CVT.BCOP100.RecordData") && null != value && "2".equals(value.toString())) {
SaveData("CFL4CVT.BCOP100.RecordData");
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BCOP100.MesRecordDataDone", 21);
- miloService.writeToOpcByte(entity);
- }//BP020杩涚珯鏍￠獙
- else if (identifier.equals("CFL4CVT.BP020.RecordData") && null != value && "1".equals(value.toString())) {
- //寰呮坊鍔犱粠杩囩珯閲囬泦琛ㄥ彇sfc_code鍐欏叆plc鐨剆ncode鏂规硶
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BP020.MesRecordDataDone", 11);
- miloService.writeToOpcByte(entity);
+
}
//BP020鍑虹珯鏍￠獙
else if (identifier.equals("CFL4CVT.BP020.RecordData") && null != value && "2".equals(value.toString())) {
SaveData("CFL4CVT.BP020.RecordData");
- ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.BP020.MesRecordDataDone", 21);
- miloService.writeToOpcByte(entity);
-
+ }
+ else if(identifier.equals("CFL4CVT.OP220.RecordData") && null != value && "2".equals(value.toString())) {
+ ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT.OP220.MesRecordDataDone", 21);
+ miloService.writeToOpcShort(entity);
}
}
@@ -114,11 +92,56 @@
}
}
+// public void SaveData(String Node) throws Exception {
+// String[] parts = Node.split("[.]");
+// Object SNCodeObject = miloService.readFromOpcUa(parts[0] + "." + parts[1] + ".Code1").getValue();
+//
+// if (null != SNCodeObject) {
+// String SNCode = SNCodeObject.toString();
+// List<DaCollectionParamConf> list;
+// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+// daCollectionParamConf.setGatherAddress(parts[0] + "." + parts[1]);
+// list = collectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf);
+//
+// List<String> nodeIdList = list.stream().map(info -> {
+// String nodeid = info.getGatherAddress();
+// return nodeid;
+// }).collect(Collectors.toList());
+//
+// if (!nodeIdList.isEmpty()) {
+// List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
+// List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
+// for (int i = 0; i < nodeIdList.size(); i++) {
+// DaParamCollection ParamCollection = new DaParamCollection();
+// if (!readWriteEntityList.get(i).getValue().toString().equals("0.0")) {
+// ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
+// ParamCollection.setLocationCode(parts[1]);
+// Object value = readWriteEntityList.get(i).getValue();
+// if (ObjectUtils.isNotEmpty(value)) {
+// String string = value.toString();
+// ParamCollection.setParamValue(string);
+// }
+// ParamCollection.setSfcCode(SNCode);
+// ParamCollection.setParamName(list.get(i).getCollectParameterName());
+// ParamCollection.setParamUpper(list.get(i).getParamUpper());
+// ParamCollection.setParamLower(list.get(i).getParamLower());
+// ParamCollection.setUnit(list.get(i).getCollectParameterUnit());
+// ParamCollection.setState("鍚堟牸");
+// ParamCollection.setType(list.get(i).getCollectParameterType());
+// ParamCollection.setCollectionTime(new Date());
+// daParamCollectionlist.add(ParamCollection);
+// }
+// }
+// daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
+// }
+// }
+// }
+
public void SaveData(String Node) throws Exception {
String[] parts = Node.split("[.]");
- Object SNCodeObject = miloService.readFromOpcUa(parts[0] + "." + parts[1] + ".Code1").getValue();
-
- if (null != SNCodeObject) {
+ Object SNCodeObject = miloService.readFromOpcUa(parts[0] + "." + parts[1] + ".RecordData").getValue();
+ if(null != SNCodeObject)
+ {
String SNCode = SNCodeObject.toString();
List<DaCollectionParamConf> list;
DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
@@ -130,19 +153,15 @@
return nodeid;
}).collect(Collectors.toList());
- if (!nodeIdList.isEmpty()) {
+ if(!nodeIdList.isEmpty()){
List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
- for (int i = 0; i < nodeIdList.size(); i++) {
+ for(int i=0;i<nodeIdList.size();i++){
DaParamCollection ParamCollection = new DaParamCollection();
- if (!readWriteEntityList.get(i).getValue().toString().equals("0.0")) {
+ if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
ParamCollection.setLocationCode(parts[1]);
- Object value = readWriteEntityList.get(i).getValue();
- if (ObjectUtils.isNotEmpty(value)) {
- String string = value.toString();
- ParamCollection.setParamValue(string);
- }
+ ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
ParamCollection.setSfcCode(SNCode);
ParamCollection.setParamName(list.get(i).getCollectParameterName());
ParamCollection.setParamUpper(list.get(i).getParamUpper());
@@ -155,13 +174,11 @@
}
}
daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
+ ReadWriteEntity entity = new ReadWriteEntity(parts[0] + "." + parts[1] +".MesRecordDataDone", 21);
+ miloService.writeToOpcShort(entity);
}
}
}
- public void WriteSNCode(String Node) throws Exception {
-
-
- }
}
\ No newline at end of file
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/init/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/init/CustomRunner.java
index 959a992..28cbb6b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/init/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/init/CustomRunner.java
@@ -45,6 +45,7 @@
daTileMatchRulesService);
List<String> lists = getList();
+ System.out.println("璁㈤槄鍐呭锛�"+lists);
miloService.subscriptionFromOpcUa(lists,InitCallback);
}
@@ -56,7 +57,13 @@
lists.add("CFL4CVT.BCOP060.RecordData");//璇锋眰淇濆瓨
lists.add("CFL4CVT.BCOP100.RecordData");//璇锋眰淇濆瓨
lists.add("CFL4CVT.BP020.RecordData");//璇锋眰淇濆瓨
-
+ lists.add("CFL4CVT.OP220.RecordData");//璇锋眰淇濆瓨
+ lists.add("CFL4CVT.BCOP010.MesRecordDataDone");//璇锋眰淇濆瓨
+ lists.add("CFL4CVT.BCOP040.MesRecordDataDone");//璇锋眰淇濆瓨
+ lists.add("CFL4CVT.BCOP060.MesRecordDataDone");//璇锋眰淇濆瓨
+ lists.add("CFL4CVT.BCOP100.MesRecordDataDone");//璇锋眰淇濆瓨
+ lists.add("CFL4CVT.BP020.MesRecordDataDone");//璇锋眰淇濆瓨
+ lists.add("CFL4CVT.OP220.MesRecordDataDone");//璇锋眰淇濆瓨
return lists;
}
}
diff --git a/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js b/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js
index af05118..56f7ca4 100644
--- a/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js
+++ b/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js
@@ -78,7 +78,7 @@
export function initializedData(query) {
return request({
- url: '/da/passingStationCollection/',
+ url: '/da/passingStationCollection/initializedData',
method: 'get',
params: query
})
diff --git a/jcdm-ui/src/views/main/kb/cvt/index.vue b/jcdm-ui/src/views/main/kb/cvt/index.vue
index 25bb022..866977f 100644
--- a/jcdm-ui/src/views/main/kb/cvt/index.vue
+++ b/jcdm-ui/src/views/main/kb/cvt/index.vue
@@ -94,7 +94,7 @@
engineCheckList:[],
showFlag:false,
buttondisabled:true,
- locationCode: "鏈厤缃伐浣�",
+ locationCode: "鏈厤缃甀P",
locationName: "鏈厤缃伐浣�",
scannerFlag: false,
@@ -159,13 +159,19 @@
this.scannerFlag = true
console.log("鏉＄爜锛�",this.form.engineNo)
if(this.form.engineNo !== null && this.form.engineNo !== undefined) {
- addPassingStationCollection({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{
- console.log("rrrrr",res)
- })
- if(this.locationCode === 'BCOP040'|| this.locationCode === 'BCOP060'|| this.locationCode === 'BCOP100'|| this.locationCode === 'BP020' ){
+ console.log("鏉＄爜2锛�",this.locationCode)
initializedData({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{
+ if(res.code===500){
+ this.$createElement;
+ }else {
+ addPassingStationCollection({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{
+ console.log("rrrrr",res)})
+ this.$message({
+ message: '鎵爜鎴愬姛',
+ type: 'success'
+ });
+ }
})
- }
}else{
this.reset();
this.buttondisabled = true
--
Gitblit v1.9.3