From 2de8567d25edbe0c020f75182b44016bfcc85d0b Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期三, 03 七月 2024 14:03:23 +0800
Subject: [PATCH] 修改参数采集
---
/dev/null | 20 --
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 2
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 6
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java | 3
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 105 ++++++----
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 423 +++++++++++++++++++++++++++--------------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java | 9
7 files changed, 355 insertions(+), 213 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/Properties.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/Properties.java
deleted file mode 100644
index fc06c6b..0000000
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/Properties.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Created by Jellyleo on 2019骞�12鏈�19鏃�
- * Copyright 漏 2019 jellyleo.com
- * All rights reserved.
- */
-package com.jcdm.main.da.opcuaconfig.init;
-
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-/**
- * @ClassName: Properties
- * @Description: OpcUa鍙傛暟
- * @author yyt
- * @date 2023骞�10鏈�13鏃�
- */
-@Getter
-@Configuration
-@PropertySource("classpath:opcua.properties")
-public class Properties {
- @Value("${opcua.server.endpoint.url}")
- private String endpointUrl;
- @Value("${opcua.server.idp.username}")
- private String idpUsername;
- @Value("${opcua.server.idp.password}")
- private String idpPassword;
- @Value("${opcua.client.app.name}")
- private String appName;
- @Value("${opcua.client.app.uri}")
- private String appUri;
- @Value("${opcua.client.cert.path}")
- private String certPath;
- @Value("${opcua.client.cert.file}")
- private String certFile;
- @Value("${opcua.client.cert.alias}")
- private String certAlias;
- @Value("${opcua.client.cert.common.name}")
- private String commonName;
- @Value("${opcua.client.cert.organization}")
- private String organization;
- @Value("${opcua.client.cert.organization.unit}")
- private String orgUnit;
- @Value("${opcua.client.cert.locality.name}")
- private String localityName;
- @Value("${opcua.client.cert.state.name}")
- private String stateName;
- @Value("${opcua.client.cert.country.code}")
- private String countryCode;
- @Value("${opcua.client.cert.dns.name}")
- private String dnsName;
- @Value("${opcua.client.cert.ip.address}")
- private String ipAddress;
- @Value("${opcua.client.cert.keystore.password}")
- private String keyPassword;
-}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
index b486d42..fadbeca 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
@@ -90,4 +90,6 @@
void manualWorkstationsAddBasicParameters(DaParamCollection daParamCollection);
void preInstallOut(DaParamCollection daParamCollection);
+
+ void saveParameters(DaParamCollection daParamCollection);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index fa722ee..9da4f4a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -265,15 +265,12 @@
@Override
public void saveCampaignTimeParameters(DaParamCollection daParamCollection) {
-// List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
-// .eq(BsFormulaChildInfo::getProcessesCode, daParamCollection.getLocationCode())
-// .eq(BsFormulaChildInfo::getSpareField4, "1")
-// );
+
BsFormulaChildInfo childInfo = daParamCollection.getFormulaChildEntity();
if(StringUtils.isNotBlank(childInfo.getResults())){
if(!childInfo.getResults().equals("OK")){
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("MOZU1."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -281,35 +278,16 @@
}
}else {
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("MOZU1."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
return;
}
-// BsFormulaChildInfo bsFormulaChildInfo = new BsFormulaChildInfo();
-// bsFormulaChildInfo.setProcessesCode(daParamCollection.getLocationCode());
-// bsFormulaChildInfo.setProductCode(daParamCollection.getProductCode());
-// bsFormulaChildInfo.setSpareField4("1");
-// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
+
String result = childInfo.getResults();
if(result != null && !result.isEmpty()){
try {
-// //鏇存柊鍙傛暟閲囬泦閰嶇疆琛�
-// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
-// daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
-// daCollectionParamConf.setCollectParameterId("OUTT");
-// List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
-// DaParamCollection saveData = new DaParamCollection();
-// saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
-// saveData.setProductCode(daParamCollection.getProductCode());
-// saveData.setLocationCode(daParamCollection.getLocationCode());
-// saveData.setSfcCode(daParamCollection.getProductBarcode());
-// saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
-// saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
-// saveData.setCollectionTime(new Date());
-// saveData.setParamValue(DateUtil.formatDateTime(new Date()));
-// daParamCollectionMapper.insertDaParamCollection(saveData);
//澧炲姞杩囩珯璁板綍
DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
@@ -326,18 +304,11 @@
//娣诲姞鍩虹鍙傛暟
this.manualWorkstationsAddBasicParameters(daParamCollection);
-// //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
-// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
-// daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo());
-// daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode());
-// List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
-// daPassingStationCollections.get(0).setOutboundTime(new Date());
-// int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
-
-// OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode());
+ //鍗婅嚜鍔ㄥ伐浣嶏紝鍏堝皢鑷姩鏁版嵁淇濆瓨鍒版暟鎹簱
+ this.saveParameters(daParamCollection);
//缁檕pc鍙�21
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("MOZU1."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
if(daParamCollection.getLocationCode().equals("OP240")){
try{
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
@@ -357,7 +328,7 @@
}catch (Exception e){
System.out.println(e.getMessage());
}
-// RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));
+
}
@@ -367,6 +338,62 @@
}
}
+
+ //鍗婅嚜鍔ㄥ伐浣嶏紝鍏堝皢鑷姩鏁版嵁淇濆瓨鍒版暟鎹簱
+ public void saveParameters(DaParamCollection daParamCollection) {
+ //娣诲姞鑷姩宸ヤ綅鍙傛暟鏁版嵁
+ //鏌ヨ鍙傛暟閰嶇疆琛�
+ List<DaCollectionParamConf> list = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode, daParamCollection.getLocationCode())//宸ヤ綅
+ .eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//鏄惁閲囬泦
+ );//绫诲瀷
+
+ List<String> collectAddressList = list.stream()
+ .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> paramCollectionList = null;//妯＄粍 鍙傛暟鍊�
+ try {
+ paramCollectionList = miloService.readFromOpcUa(collectAddressList);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ if (CollUtil.isNotEmpty(paramCollectionList)) {
+ List<DaParamCollection> saveParamList = new ArrayList<>();//灏佽鍙傛暟閲囬泦list
+ List<DaParamCollectionTemp> saveParamListTemp = new ArrayList<>();//灏佽鍙傛暟閲囬泦list
+ for (int i = 0; i < paramCollectionList.size(); i++) {
+ DaParamCollection collection = new DaParamCollection();
+ collection.setSfcCode(daParamCollection.getProductBarcode());//妯＄粍鐮�
+ collection.setParamCode(list.get(i).getCollectParameterId());//鍙傛暟缂栫爜
+ collection.setParamName(list.get(i).getCollectParameterName());//鍙傛暟鍚嶇О
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(paramCollectionList.get(i).getValue())) {
+ paramValue = paramCollectionList.get(i).getValue().toString();//鍙傛暟鍊�
+ }
+ collection.setParamValue(paramValue);//鍙傛暟鍊�
+ collection.setLocationCode(daParamCollection.getLocationCode());//宸ヤ綅
+ collection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ saveParamList.add(collection);//灏佽鍙傛暟閲囬泦list
+
+ DaParamCollectionTemp collectionTemp = new DaParamCollectionTemp();
+ collectionTemp.setSfcCode(daParamCollection.getProductBarcode());//妯＄粍鐮�
+ collectionTemp.setParamCode(list.get(i).getCollectParameterId());//鍙傛暟缂栫爜
+ collectionTemp.setParamName(list.get(i).getCollectParameterName());//鍙傛暟鍚嶇О
+
+ if (ObjectUtil.isNotNull(paramCollectionList.get(i).getValue())) {
+ paramValue = paramCollectionList.get(i).getValue().toString();//鍙傛暟鍊�
+ }
+ collectionTemp.setParamValue(paramValue);//鍙傛暟鍊�
+ collectionTemp.setLocationCode(daParamCollection.getLocationCode());//宸ヤ綅
+ collectionTemp.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ saveParamListTemp.add(collectionTemp);//灏佽鍙傛暟閲囬泦list
+
+ }
+ //鎻掑叆鍙傛暟閲囬泦琛�
+ daParamCollectionService.insertBatch(saveParamList);
+ //鎻掑叆鍙傛暟閲囬泦琛�
+ daParamCollectionTempService.insertBatch(saveParamListTemp);
+ }
+ }
@Override
public void insertBatch(List<DaParamCollection> confList){
try{
@@ -446,11 +473,7 @@
daPassingStationCollections.get(0).setOutboundTime(new Date());
int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
-// OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode());
-
- //缁檕pc鍙�21
try {
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
String strA = daParamCollection.getLocationCode();
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build());
} catch (Exception e) {
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
index 9cdbaec..7ac0084 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollectionTemp.domain.DaParamCollectionTemp;
/**
@@ -63,4 +64,6 @@
* @return 缁撴灉
*/
public int deleteDaParamCollectionTempById(Long id);
+
+ void insertBatch(List<DaParamCollectionTemp> confList);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
index ef11255..998550b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
@@ -103,4 +103,13 @@
{
return daParamCollectionTempMapper.deleteDaParamCollectionTempById(id);
}
+ @Override
+ public void insertBatch(List<DaParamCollectionTemp> confList){
+ try{
+ this.saveBatch(confList);
+ }catch (Exception e){
+ return;
+ }
+
+ }
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 8843f0d..26ddd2d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -10,16 +10,12 @@
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
-
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,7 +39,7 @@
private IOmProductionOrdeInfoService omProductionOrdeInfoService;
- @Resource
+ @Autowired
private IDaOpcuaConfigService daOpcuaConfigService;
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 7476628..cd2544f 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
@@ -8,10 +8,7 @@
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.framework.websocket.WebSocketUsers;
-import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
@@ -104,7 +101,7 @@
}
}else if (Constants.RECORD_SN.equals(tab)){//姹備笅鍙戞ā缁勭爜璇�9
if (Constants.ONE.equals(valueString)){
- /*if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device) ){*/
+ if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device) ){
//鏌ヨ瑕佺敓浜х殑宸ュ崟
List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
.eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE));//宸ュ崟鐘舵��
@@ -113,7 +110,9 @@
Long id = orderList.get(0).getId();
String productNum = orderList.get(0).getProductNum();//妯＄粍鐮�
//涓嬪彂浜у搧妯＄粍鐮�
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_ModuleCode").value(productNum).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_WorkOrderNumber").value(productNum).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_ProductType").value(productNum).build());
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());
//鏇存柊宸ュ崟鐘舵�佷负鎵ц涓�
@@ -128,7 +127,7 @@
}else{
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//娌℃湁瑕佺敓浜х殑宸ュ崟
}
- /* }*/
+ }
}
}else if (Constants.RECORD_DATA.equals(tab)){//鍑哄叆绔�
if (Constants.ONE.equals(valueString)){//鍏ョ珯
@@ -136,6 +135,8 @@
if (Constants.OP030.equals(device)){
//鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
boolean b = true;//OCVResultFeedBack(thoroughfare, device);
+
+ //鍥涗釜鐢佃姱鐨勭姸鎬�
if (b){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
@@ -151,15 +152,6 @@
//鍒嗘010-065娈�
if (Constants.OP010.equals(device)){
//010宸ヤ綅鏃犺繃绔欒褰曪紝鍙粰鏀捐淇″彿
- /*List<SendFactoryMes> collect = sendFactoryMesList.stream().filter(x -> device.equals(x.getLocationCode())).collect(Collectors.toList());
- if (CollUtil.isNotEmpty(collect)){
- for (SendFactoryMes sendFactoryMes : collect) {
- ChildVO childVO = new ChildVO();
- childVO.setItemCode(sendFactoryMes.getItemCode());
- childVO.setItemText(sendFactoryMes.getItemText());
- childVO.setItemType(sendFactoryMes.getItemType());
- }
- }*/
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,21);
}else if (Constants.OP020_OP065.contains(device)){
@@ -170,7 +162,7 @@
result = 23;
}else{
result = savePassingStation(thoroughfare, device,cellCodeList);//淇濆瓨杩囩珯
- if(result==21) {
+ if(result == 21) {
result = saveParamCollection(thoroughfare, device,cellCodeList);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
}
}
@@ -178,37 +170,21 @@
log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,result);
} else if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
-
- //涓婄嚎鎶ュ伐
-
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
} else {
- //2:鍛婄煡MES宸ヤ綅宸ヤ綔瀹屾垚锛岃姹傝褰曞伐浣嶆暟鎹�
- //淇濆瓨鍙傛暟閲囬泦璁板綍
- saveParamPassingData(device,thoroughfare);
- //淇濆瓨杩囩珯璁板綍
- DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
- Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
- String moduleCode = null;
- if (ObjectUtil.isNotNull(value1)){
- moduleCode = value1.toString();
- log.info("璇诲彇宸ヤ綅{}鐨凪oduleCode鏁版嵁锛歿}",device,moduleCode);
- }
- passingStationCollection.setSfcCode(moduleCode);
- passingStationCollection.setLocationCode(device);
- passingStationCollection.setInboundTime(new Date());
- String stationStatus = Constants.PASS;
- ReadWriteEntity stationStatusRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus");
- if (ObjectUtil.isNotNull(stationStatusRead.getValue())){
- String string = stationStatusRead.getValue().toString();
- if (Constants.TWO.equals(string)){
- stationStatus = Constants.UN_PASS;
+ Integer result = 21;
+ Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
+ if (ObjectUtil.isNull(modulCodeObjcet) && modulCodeObjcet.toString().trim().isEmpty()){
+ result = 23;
+ }else{
+ String moduleCode = modulCodeObjcet.toString();
+ result = savePassingStation(thoroughfare, device,moduleCode);//淇濆瓨杩囩珯
+ if(result == 21) {
+ result = saveParamCollection(thoroughfare, device,moduleCode);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
}
}
- passingStationCollection.setOutRsSign(stationStatus);
- passingStationCollection.setCreateTime(new Date());
- daPassingStationCollectionService.save(passingStationCollection);
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
- log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,21);
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,result);
}
}
} /*else if (Constants.RECORD_CHECK_CODE_1.equals(tab)) {
@@ -239,6 +215,7 @@
*/
private static List<String> readCellCodeList(String thoroughfare, String device){
List<String> cellCodeList = new ArrayList<>();
+ Map map = new HashMap();
//鐢佃姱鐮佸湴鍧�
List<String> readList = new ArrayList<>();
readList.add(thoroughfare + "." + device +".CellCode_1");
@@ -248,17 +225,71 @@
try {
List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(readList);//鐢佃姱鐮�
for (ReadWriteEntity readWriteEntity : readWriteEntityList) {
- if (ObjectUtil.isNotNull(readWriteEntity.getValue())){
- if(!"".equals(readWriteEntity.getValue().toString().trim())){
- cellCodeList.add(readWriteEntity.getValue().toString());//灏佽鐢佃姱鐮�
- }
-
+ if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !"".equals(readWriteEntity.getValue().toString().trim())){
+ cellCodeList.add(readWriteEntity.getValue().toString());//灏佽鐢佃姱鐮�
+ }else{
+ cellCodeList.add("");//灏佽鐢佃姱鐮�
}
}
+
} catch (Exception e) {
throw new RuntimeException(e);
}
return cellCodeList;
+ }
+
+
+ /**
+ * 淇濆瓨杩囩珯鏁版嵁
+ * @param thoroughfare 閫氶亾
+ * @param device 宸ヤ綅
+ * @param moduleCode 妯＄粍鍙�
+ * @return list
+ * @throws Exception e
+ */
+ private static Integer savePassingStation(String thoroughfare, String device,String moduleCode){
+ Integer result = 21;
+
+ try {
+ //璇昏繘绔欐椂闂�
+ Date startTime = new Date();
+ ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//杩涚珯鏃堕棿
+ if (ObjectUtil.isNotNull(startTimeRead.getValue())){
+ startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
+ }else{
+ result = 23;
+ log.info("璇诲彇鍒板伐浣峽}鐨凷tartTime鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
+ return result;
+ }
+
+ //璇诲伐绔欑姸鎬�
+ String stationStatus = Constants.PASS;
+ ReadWriteEntity stationStatusRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus");//绔欑姸鎬佸湴鍧�
+ if (ObjectUtil.isNotNull(stationStatusRead.getValue())){
+ String string = stationStatusRead.getValue().toString();
+ if (Constants.TWO.equals(string)){
+ stationStatus = Constants.UN_PASS;
+ }
+ }else{
+ result = 23;
+ log.info("璇诲彇鍒板伐浣峽}StationStatus鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
+ return result;
+ }
+
+ DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
+ passingStationCollection.setSfcCode(moduleCode);//鐢佃姱鐮�
+ passingStationCollection.setLocationCode(device);//宸ヤ綅
+ passingStationCollection.setInboundTime(startTime);//杩涚珯鏃堕棿
+ passingStationCollection.setOutboundTime(new Date());//鍑虹珯鏃堕棿
+ passingStationCollection.setOutRsSign(stationStatus);//绔欑姸鎬佸��
+ passingStationCollection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ daPassingStationCollectionService.save(passingStationCollection);
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return result;
}
/**
@@ -281,6 +312,7 @@
}else{
result = 23;
log.info("璇诲彇鍒板伐浣峽}鐨凷tartTime鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
+ return result;
}
//璇诲伐绔欑姸鎬�
@@ -293,13 +325,14 @@
}
}else{
result = 23;
- log.info("璇诲彇鍒板伐浣峽}StationStatuss鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
+ log.info("璇诲彇鍒板伐浣峽}StationStatus鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
+ return result;
}
List<DaPassingStationCollection> passingList = new ArrayList<>();
for (String cellCode : cellCodeList) {
DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
- if (ObjectUtil.isNotNull(cellCode)){
+ if (ObjectUtil.isNotNull(cellCode) && !cellCode.isEmpty()){
passingStationCollection.setSfcCode(cellCode);//鐢佃姱鐮�
passingStationCollection.setLocationCode(device);//宸ヤ綅
passingStationCollection.setInboundTime(startTime);//杩涚珯鏃堕棿
@@ -307,9 +340,6 @@
passingStationCollection.setOutRsSign(stationStatus);//绔欑姸鎬佸��
passingStationCollection.setCollectionTime(new Date());//閲囬泦鏃堕棿
passingList.add(passingStationCollection);
- }else{
- result = 23;
- log.info("璇诲彇鍒板伐浣峽}CellCode鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
}
}
@@ -324,8 +354,84 @@
return result;
}
+
/**
- * 淇濆瓨鐢佃姱杩囩珯璁板綍
+ * 淇濆瓨鍙傛暟鏁版嵁鍜屽彂閫佸伐鍘侻ES
+ * @param thoroughfare 閫氶亾
+ * @param device 宸ヤ綅
+ * @param moduleCode 妯＄粍鍙�
+ * @return list
+ * @throws Exception e
+ */
+ private static Integer saveParamCollection(String thoroughfare, String device,String moduleCode){
+ Integer result = 21;//杩斿洖缁撴灉
+
+ try {
+ //鏌ヨ鍙傛暟閰嶇疆琛�
+ List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode, device)//宸ヤ綅
+ .eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//鏄惁閲囬泦
+ );
+ if (CollUtil.isNotEmpty(list)){
+
+ List<String> collect = list.stream()
+ .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(collect);
+
+ List<DaParamCollection> collectionList = new ArrayList<>();
+ List<ChildVO> mesList = new ArrayList<>();
+ for (int i = 0; i < readWriteEntityList.size(); i++) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setSfcCode(moduleCode);//妯＄粍鐮�
+ daParamCollection.setParamCode(list.get(i).getCollectParameterId());//鍙傛暟缂栫爜
+ daParamCollection.setParamName(list.get(i).getCollectParameterName());//鍙傛暟鍚嶇О
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(readWriteEntityList.get(i).getValue())){
+ paramValue = readWriteEntityList.get(i).getValue().toString();//鍙傛暟鍊�
+ }
+ daParamCollection.setParamValue(paramValue);//鍙傛暟鍊�
+ daParamCollection.setLocationCode(device);//宸ヤ綅
+ daParamCollection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ collectionList.add(daParamCollection);//灏佽鍙傛暟閲囬泦list
+
+ //鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
+ ChildVO childVO = new ChildVO();
+ childVO.setItemCode(list.get(i).getCollectParameterId());//鍙傛暟缂栫爜
+ childVO.setItemType(list.get(i).getItemType());
+ childVO.setItemValue(paramValue);//鍙傛暟鍊�
+ childVO.setItemText(list.get(i).getCollectParameterName());
+ childVO.setCheckResult("1");
+ childVO.setCheckTime(new Date().toString());
+ mesList.add(childVO);
+ }
+
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ //鎻掑叆鍙傛暟閲囬泦琛�
+ daParamCollectionService.insertBatch(collectionList);
+ //涓婁紶鍒板伐鍘俶es
+ ParentVO parentVO = new ParentVO();
+ parentVO.setStationCode(device);//宸ヤ綅
+ parentVO.setSiteCode("3983");
+
+ parentVO.setRecordId(UUID.randomUUID().toString());
+ parentVO.setTotalResult("1");
+ parentVO.setProductNum(moduleCode);
+ parentVO.setCheckList(mesList);
+
+ log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
+ HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute();
+ log.info("鎵ц宸ュ巶MES鏂规硶end锛岃繑鍥炴暟鎹細{}",execute.body());
+
+ });
+ }
+ }catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return result;
+ }
+
+ /**
+ * 淇濆瓨鍙傛暟鏁版嵁鍜屽彂閫佸伐鍘侻ES
* @param thoroughfare 閫氶亾
* @param device 宸ヤ綅
* @param cellCodeList 鐢佃姱鐮侀泦鍚�
@@ -341,7 +447,7 @@
List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
.eq(DaCollectionParamConf::getProcessesCode, device)//宸ヤ綅
.eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//鏄惁閲囬泦
- .eq(DaCollectionParamConf::getRemarks, Constants.ONE));//绫诲瀷
+ );//绫诲瀷
if (CollUtil.isNotEmpty(list)) {
List<DaParamCollection> saveParamList = new ArrayList<>();//灏佽鍙傛暟閲囬泦list
List<DaCollectionParamConf> confColl1 = list.stream().filter(x -> Constants.INT_ONE.equals(x.getKeyNum())).collect(Collectors.toList());
@@ -371,7 +477,7 @@
List<ReadWriteEntity> paramCollectionList0 = miloService.readFromOpcUa(collect0);//鐢佃姱 鍙傛暟鍊�
//绗竴涓數鑺殑鏁版嵁
- if (CollUtil.isNotEmpty(paramCollectionList1)) {
+ if (CollUtil.isNotEmpty(paramCollectionList1) && !cellCodeList.get(0).isEmpty()) {
List<ChildVO> mesChildList1 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist1
for (int i = 0; i < paramCollectionList1.size(); i++) {
DaParamCollection daParamCollection = new DaParamCollection();
@@ -396,10 +502,10 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList1.add(childVO);
- mesList.add(0, mesChildList1);
}
+ mesList.add(0, mesChildList1);
}
- if (CollUtil.isNotEmpty(paramCollectionList2)) {
+ if (CollUtil.isNotEmpty(paramCollectionList2) && !cellCodeList.get(1).isEmpty()) {
List<ChildVO> mesChildList2 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist2
for (int i = 0; i < paramCollectionList2.size(); i++) {
@@ -425,10 +531,10 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList2.add(childVO);
- mesList.add(1, mesChildList2);
}
+ mesList.add(1, mesChildList2);
}
- if (CollUtil.isNotEmpty(paramCollectionList3)) {
+ if (CollUtil.isNotEmpty(paramCollectionList3) && !cellCodeList.get(2).isEmpty()) {
List<ChildVO> mesChildList3 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist3
for (int i = 0; i < paramCollectionList3.size(); i++) {
DaParamCollection daParamCollection = new DaParamCollection();
@@ -453,10 +559,10 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList3.add(childVO);
- mesList.add(2, mesChildList3);
}
+ mesList.add(2, mesChildList3);
}
- if (CollUtil.isNotEmpty(paramCollectionList4)) {
+ if (CollUtil.isNotEmpty(paramCollectionList4)&& !cellCodeList.get(3).isEmpty()) {
List<ChildVO> mesChildList4 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4
for (int i = 0; i < paramCollectionList4.size(); i++) {
DaParamCollection daParamCollection = new DaParamCollection();
@@ -481,43 +587,47 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList4.add(childVO);
- mesList.add(3, mesChildList4);
}
+ mesList.add(3, mesChildList4);
}
//鍏叡鍙傛暟
if (CollUtil.isNotEmpty(paramCollectionList0)) {
for (int i = 0; i < cellCodeList.size(); i++) {//寰幆4涓數鑺�
- List<ChildVO> mesChildList0 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist0
- for (int j = 0; j < paramCollectionList0.size(); j++) {
- DaParamCollection daParamCollection = new DaParamCollection();
- daParamCollection.setSfcCode(cellCodeList.get(i));//鐢佃姱鐮�
- daParamCollection.setParamCode(confColl0.get(j).getCollectParameterId());//鍙傛暟缂栫爜
- daParamCollection.setParamName(confColl0.get(j).getCollectParameterName());//鍙傛暟鍚嶇О
- String paramValue = "";
- if (ObjectUtil.isNotNull(paramCollectionList0.get(j).getValue())) {
- paramValue = paramCollectionList0.get(j).getValue().toString();//鍙傛暟鍊�
- }
- if(confColl0.get(j).getCollectParameterName().contains("鏃堕棿") && !"".equals(paramValue)){
- paramValue = format.parse(TimeUtil.test(TimeUtil.stringProcessing(paramValue))).toString();
- }
- daParamCollection.setParamValue(paramValue);//鍙傛暟鍊�
- daParamCollection.setLocationCode(device);//宸ヤ綅
- daParamCollection.setCollectionTime(new Date());//閲囬泦鏃堕棿
- saveParamList.add(daParamCollection);
+ if(!cellCodeList.get(i).isEmpty()){
+ List<ChildVO> mesChildList0 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist0
+ for (int j = 0; j < paramCollectionList0.size(); j++) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setSfcCode(cellCodeList.get(i));//鐢佃姱鐮�
+ daParamCollection.setParamCode(confColl0.get(j).getCollectParameterId());//鍙傛暟缂栫爜
+ daParamCollection.setParamName(confColl0.get(j).getCollectParameterName());//鍙傛暟鍚嶇О
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(paramCollectionList0.get(j).getValue())) {
+ paramValue = paramCollectionList0.get(j).getValue().toString();//鍙傛暟鍊�
+ }
+ if(confColl0.get(j).getCollectParameterName().contains("鏃堕棿") && !"".equals(paramValue)){
+ paramValue = format.parse(TimeUtil.test(TimeUtil.stringProcessing(paramValue))).toString();
+ }
+ daParamCollection.setParamValue(paramValue);//鍙傛暟鍊�
+ daParamCollection.setLocationCode(device);//宸ヤ綅
+ daParamCollection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ saveParamList.add(daParamCollection);
- //鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
- ChildVO childVO = new ChildVO();
- childVO.setItemCode(confColl0.get(j).getCollectParameterName());//鍙傛暟
- childVO.setItemType(confColl0.get(j).getItemType());
- childVO.setItemValue(paramValue);//鍙傛暟鍊�
- childVO.setItemText(confColl0.get(j).getParameterSetName());
- childVO.setCheckResult("1");
- childVO.setCheckTime(new Date().toString());
- mesChildList0.add(childVO);
+ //鍙戦�佺粰宸ュ巶mes鍙傛暟灏佽
+ ChildVO childVO = new ChildVO();
+ childVO.setItemCode(confColl0.get(j).getCollectParameterName());//鍙傛暟
+ childVO.setItemType(confColl0.get(j).getItemType());
+ childVO.setItemValue(paramValue);//鍙傛暟鍊�
+ childVO.setItemText(confColl0.get(j).getParameterSetName());
+ childVO.setCheckResult("1");
+ childVO.setCheckTime(new Date().toString());
+ mesChildList0.add(childVO);
+ }
+ mesList.add(i, mesChildList0);
}
- mesList.get(i).addAll(mesChildList0);
- /* mesList.add(mesChildList0);*/
+
+ //mesList.get(i).addAll(mesChildList0);
+
}
}
@@ -533,13 +643,14 @@
parentVO.setRecordId(UUID.randomUUID().toString());
parentVO.setTotalResult("1");
for (int i = 0; i < cellCodeList.size(); i++) {//寰幆4涓數鑺�
- parentVO.setProductNum(cellCodeList.get(i));//鐢佃姱鐮�
- parentVO.setCheckList(mesList.get(i));//鍙傛暟
- //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
- log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
- HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute();
- log.info("鎵ц宸ュ巶MES鏂规硶end锛岃繑鍥炴暟鎹細{}",execute.body());
- //});
+ if(!cellCodeList.get(i).isEmpty()){
+ parentVO.setProductNum(cellCodeList.get(i));//鐢佃姱鐮�
+ parentVO.setCheckList(mesList.get(i));//鍙傛暟
+ //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
+ HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute();
+ log.info("鎵ц宸ュ巶MES鏂规硶end锛岃繑鍥炴暟鎹細{}",execute.body());
+ }
}
});
}
@@ -550,57 +661,75 @@
}
/**
- * 淇濆瓨杩囩珯鏁版嵁鍜屽弬鏁颁繚瀛樻暟鎹�
- * @param device 宸ヤ綅鍙�
+ * 030宸ヤ綅杩斿洖ocv娴嬭瘯缁撴灉
+ * @param thoroughfare
+ * @param device
* @throws Exception
*/
- private void saveParamPassingData(String device,String thoroughfare) throws Exception {
-
- //淇濆瓨鍙傛暟閲囬泦鏁版嵁
- List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
- .eq(DaCollectionParamConf::getProcessesCode, device)
- .eq(DaCollectionParamConf::getRemarks, Constants.ONE));
- if (CollUtil.isNotEmpty(list)){
- List<String> collect = list.stream().map(DaCollectionParamConf::getGatherAddress)
- .filter(Objects::nonNull).distinct()
- .collect(Collectors.toList());
- QueryPLCData(device,thoroughfare,collect);
-
- }
+ private boolean OCVResultFeedBack(String thoroughfare, String device) throws Exception {
+ boolean flag = true;
+ Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_1").getValue();
+ /*if (ObjectUtil.isNotNull(value1)){
+ String string = value1.toString();
+ List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
+ .eq(QingYanTestInfo::getKeyCode, string));
+ if (CollUtil.isNotEmpty(list)){
+ QingYanTestInfo qingYanTestInfo = list.get(0);
+ if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(1).build());
+ }else {
+ flag = false;
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
+ }
+ }
+ }*/
+ Object value2 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_2").getValue();
+ /*if (ObjectUtil.isNotNull(value2)){
+ String string = value2.toString();
+ List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
+ .eq(QingYanTestInfo::getKeyCode, string));
+ if (CollUtil.isNotEmpty(list)){
+ QingYanTestInfo qingYanTestInfo = list.get(0);
+ if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(1).build());
+ }else {
+ flag = false;
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(2).build());
+ }
+ }
+ }*/
+ Object value3 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_3").getValue();
+ /*if (ObjectUtil.isNotNull(value3)){
+ String string = value3.toString();
+ List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
+ .eq(QingYanTestInfo::getKeyCode, string));
+ if (CollUtil.isNotEmpty(list)){
+ QingYanTestInfo qingYanTestInfo = list.get(0);
+ if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(1).build());
+ }else {
+ flag = false;
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(2).build());
+ }
+ }
+ }*/
+ Object value4 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_4").getValue();
+ /*if (ObjectUtil.isNotNull(value4)){
+ String string = value4.toString();
+ List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
+ .eq(QingYanTestInfo::getKeyCode, string));
+ if (CollUtil.isNotEmpty(list)){
+ QingYanTestInfo qingYanTestInfo = list.get(0);
+ if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(1).build());
+ }else {
+ flag = false;
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(2).build());
+ }
+ }
+ }*/
+ return flag;
}
- /**
- * 鎵归噺鏌ヨplc绔欑偣鏁版嵁
- * @param device 绔欑偣
- * @param collect 鐐逛綅
- * @throws Exception
- */
- private static void QueryPLCData(String device,String thoroughfare,List<String> collect) throws Exception {
- List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(collect);
- if (CollUtil.isNotEmpty(readWriteEntityList)){
- List<DaParamCollection> collectionList = new ArrayList<>();
- Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
- String moduleCode = null;
- if (ObjectUtil.isNotNull(value1)){
- moduleCode = value1.toString();
- }
- for (int i = 0; i < readWriteEntityList.size(); i++) {
- DaParamCollection daParamCollection = new DaParamCollection();
- if (StrUtil.isNotBlank(moduleCode)){
- daParamCollection.setModuleCode(moduleCode);
- }
- daParamCollection.setParamCode(collect.get(i));
- String paramValue = "";
- if (ObjectUtil.isNotNull(readWriteEntityList.get(i).getValue())){
- paramValue = readWriteEntityList.get(i).getValue().toString();
- }
- daParamCollection.setParamValue(paramValue);
- daParamCollection.setLocationCode(device);
- daParamCollection.setCollectionTime(new Date());
- collectionList.add(daParamCollection);
- }
- daParamCollectionService.insertBatch(collectionList);
- }
- }
}
diff --git a/jcdm-main/src/main/resources/opcua.properties b/jcdm-main/src/main/resources/opcua.properties
deleted file mode 100644
index bc25383..0000000
--- a/jcdm-main/src/main/resources/opcua.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#opcua server
-opcua.server.endpoint.url=opc.tcp://127.0.0.1:49320
-opcua.server.idp.username=
-opcua.server.idp.password=
-
-#opcua client
-opcua.client.app.name=plc
-opcua.client.app.uri=urn:Yyt_PC:UnifiedAutomation:UaExpert
-opcua.client.cert.path=C:/mes/
-opcua.client.cert.file=Yyt_PC-client.pfx
-opcua.client.cert.alias=jlclient-ai
-opcua.client.cert.common.name=UaClient@Jellyleo
-opcua.client.cert.organization=JL
-opcua.client.cert.organization.unit=per
-opcua.client.cert.locality.name=jl
-opcua.client.cert.state.name=JiangSu
-opcua.client.cert.country.code=CN
-opcua.client.cert.dns.name=Jellyleo
-opcua.client.cert.ip.address=administrator
-opcua.client.cert.keystore.password=yyt@8888888888
--
Gitblit v1.9.3