From 5b544fc8d6029a71669b3992c5cfea9a044aaf3f Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 04 七月 2024 16:39:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 557 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 409 insertions(+), 148 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 7476628..7bc63c6 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
@@ -6,12 +6,11 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONObject;
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;
@@ -19,9 +18,12 @@
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.da.testDeviceInterfaceTemp.domain.DaTestDeviceInterfaceTemp;
+import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
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;
@@ -30,6 +32,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
import javax.websocket.Session;
import java.text.SimpleDateFormat;
@@ -57,6 +60,8 @@
public static IOmProductionOrdeInfoService omProductionOrdeInfoService;
+ public static IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;
+
@Value("${orderLineUrl}")
private static String orderLineUrl;
@@ -64,12 +69,14 @@
IDaPassingStationCollectionService daPassingStationCollectionService,
IDaCollectionParamConfService collectionParamConfService,
IDaParamCollectionService daParamCollectionService,
- IOmProductionOrdeInfoService omProductionOrdeInfoService) {
+ IOmProductionOrdeInfoService omProductionOrdeInfoService,
+ IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService) {
OPCUaSubscription.miloService = miloService;
OPCUaSubscription.daPassingStationCollectionService = daPassingStationCollectionService;
OPCUaSubscription.collectionParamConfService = collectionParamConfService;
OPCUaSubscription.daParamCollectionService = daParamCollectionService;
OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService;
+ OPCUaSubscription.daTestDeviceInterfaceTempService = daTestDeviceInterfaceTempService;
}
@@ -86,7 +93,7 @@
if (Constants.RECORD_CHECK_CODE.equals(tab)){//鐢佃姱鏍￠獙
if (Constants.ONE.equals(valueString)){
Integer scanResult = 11;
- if (Constants.OP010.equals(device) || Constants.OP030.equals(device)){
+ if (Constants.OP010.equals(device)){
//OP010宸ヤ綅鐢佃姱鏉＄爜鏍￠獙||OP030宸ヤ綅鐢佃姱鏉＄爜鏍￠獙
Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
if (ObjectUtil.isNotNull(value1)){
@@ -98,13 +105,29 @@
// scanResult = 11;
// }
}
+ }else if(Constants.OP030.equals(device)){
+ Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
+ if (ObjectUtil.isNotNull(value1)){
+ String cellCode = value1.toString();
+ //鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
+ boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);
+ //鍥涗釜鐢佃姱鐨勭姸鎬�
+ if (b){
+ scanResult = 11;
+ }else {
+ scanResult = 12;
+ }
+ }else {
+ scanResult = 12;
+ }
+
}
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult1").value(scanResult).build());
log.info("鍐欏叆鍒板伐浣峽}鐨凷canerResult1鏁版嵁锛歿}",device,scanResult);
}
}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 +136,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,14 +153,17 @@
}else{
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//娌℃湁瑕佺敓浜х殑宸ュ崟
}
- /* }*/
+ }*/
+
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());//娌℃湁瑕佺敓浜х殑宸ュ崟
}
}else if (Constants.RECORD_DATA.equals(tab)){//鍑哄叆绔�
if (Constants.ONE.equals(valueString)){//鍏ョ珯
//1:鍛婄煡MES鎵樼洏宸插埌绔欙紝璇锋眰涓嬪彂杩涚珯鐘舵��
if (Constants.OP030.equals(device)){
//鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
- boolean b = true;//OCVResultFeedBack(thoroughfare, device);
+ boolean b = OCVResultFeedBack(thoroughfare, device);
+ //鍥涗釜鐢佃姱鐨勭姸鎬�
if (b){
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
@@ -143,7 +171,25 @@
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,12);
}
- } else {
+ } else if(Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
+ //1銆佽繘绔橮LC缁欎骇鍝佺被鍨嬶紝MES璇诲彇浜у搧绫诲瀷
+ ReadWriteEntity productTypeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".MES_ProductType");//浜у搧绫诲瀷
+ if (ObjectUtil.isNotNull(productTypeRead.getValue())){
+ String productType = productTypeRead.getValue().toString();
+
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ //璋冪敤宸ュ巶MES锛屼繚瀛樺埌鏁版嵁搴�,骞朵笖灏嗗伐鍗曚紶缁橮LC
+ receivingWorkOrders(thoroughfare, device);
+ });
+
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
+
+ }else{
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ }
+
+ }else {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
}
@@ -151,15 +197,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 +207,7 @@
result = 23;
}else{
result = savePassingStation(thoroughfare, device,cellCodeList);//淇濆瓨杩囩珯
- if(result==21) {
+ if(result == 21) {
result = saveParamCollection(thoroughfare, device,cellCodeList);//淇濆瓨鍙傛暟锛屽彂閫佸伐鍘侻ES
}
}
@@ -178,37 +215,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)) {
@@ -229,6 +250,44 @@
}
+ public void receivingWorkOrders(String thoroughfare ,String device)
+ {
+ String paramProductNum = "";
+ try {
+ // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
+ OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "OP230");
+ JSONObject jsonObject = new JSONObject(orderJsonString);
+ // 浠嶫SONObject涓幏鍙杁ata瀵硅薄
+ JSONObject dataObject = jsonObject.getJSONObject("data");
+ String code = jsonObject.getStr("code");
+ // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
+ if(code.equals("success")) {
+ log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俻ack{}鍑哄弬pack锛歿}", paramProductNum, dataObject.getStr("productNum"));
+ OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
+ omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
+ omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
+ omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
+ omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setOnlineCompletionMark("0");
+ omProductionOrdeInfo.setSfResult("0");
+ omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
+ omProductionOrdeInfo.setCreateTime(new Date());
+ omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
+ omProductionOrdeInfoService.save(omProductionOrdeInfo);
+
+ //鍙戦�佺粰鍓嶅彴
+ WebSocketUsers.sendMessageToUserByText(map.get(device), dataObject.getStr("productNum"));
+
+ //鍐橮LC
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_ModuleCode").value(dataObject.getStr("productNum")).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_WorkOrderNumber").value(dataObject.getStr("productionOrderNum")).build());
+
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
/**
* 璇诲彇鐢佃姱鐮�
@@ -239,6 +298,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 +308,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 +395,7 @@
}else{
result = 23;
log.info("璇诲彇鍒板伐浣峽}鐨凷tartTime鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
+ return result;
}
//璇诲伐绔欑姸鎬�
@@ -293,13 +408,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 +423,6 @@
passingStationCollection.setOutRsSign(stationStatus);//绔欑姸鎬佸��
passingStationCollection.setCollectionTime(new Date());//閲囬泦鏃堕棿
passingList.add(passingStationCollection);
- }else{
- result = 23;
- log.info("璇诲彇鍒板伐浣峽}CellCode鏁版嵁锛歿},杩斿洖RecordDataDone鐨勫�间负{}",device,"IS NULL锛�",result);
}
}
@@ -324,8 +437,85 @@
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;//杩斿洖缁撴灉
+ String sendMes = "";
+
+ 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 鐢佃姱鐮侀泦鍚�
@@ -334,14 +524,17 @@
*/
private static Integer saveParamCollection(String thoroughfare, String device,List<String> cellCodeList){
Integer result = 21;//杩斿洖缁撴灉
- List<List<ChildVO>> mesList = new ArrayList<>();//瀛樺偍4涓數鑺殑鍙戦�佺粰MES鐨勫��
-
+ List<ChildVO> mesChildList1 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist1
+ List<ChildVO> mesChildList2 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist2
+ List<ChildVO> mesChildList3 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist3
+ List<ChildVO> mesChildList4 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4
+ List<ChildVO> mesChildList0 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4
try {
//鏌ヨ鍙傛暟閰嶇疆琛�
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,8 +564,7 @@
List<ReadWriteEntity> paramCollectionList0 = miloService.readFromOpcUa(collect0);//鐢佃姱 鍙傛暟鍊�
//绗竴涓數鑺殑鏁版嵁
- if (CollUtil.isNotEmpty(paramCollectionList1)) {
- List<ChildVO> mesChildList1 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist1
+ if (CollUtil.isNotEmpty(paramCollectionList1) && !cellCodeList.get(0).isEmpty()) {
for (int i = 0; i < paramCollectionList1.size(); i++) {
DaParamCollection daParamCollection = new DaParamCollection();
daParamCollection.setSfcCode(cellCodeList.get(0));//鐢佃姱鐮�
@@ -396,11 +588,10 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList1.add(childVO);
- mesList.add(0, mesChildList1);
}
+
}
- if (CollUtil.isNotEmpty(paramCollectionList2)) {
- List<ChildVO> mesChildList2 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist2
+ if (CollUtil.isNotEmpty(paramCollectionList2) && !cellCodeList.get(1).isEmpty()) {
for (int i = 0; i < paramCollectionList2.size(); i++) {
DaParamCollection daParamCollection = new DaParamCollection();
@@ -425,11 +616,9 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList2.add(childVO);
- mesList.add(1, mesChildList2);
}
}
- if (CollUtil.isNotEmpty(paramCollectionList3)) {
- List<ChildVO> mesChildList3 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist3
+ if (CollUtil.isNotEmpty(paramCollectionList3) && !cellCodeList.get(2).isEmpty()) {
for (int i = 0; i < paramCollectionList3.size(); i++) {
DaParamCollection daParamCollection = new DaParamCollection();
daParamCollection.setSfcCode(cellCodeList.get(2));//鐢佃姱鐮�
@@ -453,11 +642,9 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList3.add(childVO);
- mesList.add(2, mesChildList3);
}
}
- if (CollUtil.isNotEmpty(paramCollectionList4)) {
- List<ChildVO> mesChildList4 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4
+ if (CollUtil.isNotEmpty(paramCollectionList4)&& !cellCodeList.get(3).isEmpty()) {
for (int i = 0; i < paramCollectionList4.size(); i++) {
DaParamCollection daParamCollection = new DaParamCollection();
daParamCollection.setSfcCode(cellCodeList.get(3));//鐢佃姱鐮�
@@ -481,43 +668,44 @@
childVO.setCheckResult("1");
childVO.setCheckTime(new Date().toString());
mesChildList4.add(childVO);
- 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()){
+ 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.get(i).addAll(mesChildList0);
- /* mesList.add(mesChildList0);*/
+
+ //mesList.get(i).addAll(mesChildList0);
+
}
}
@@ -533,74 +721,147 @@
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));//鐢佃姱鐮�
+ //灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4
+ List<ChildVO> mesChildList = new ArrayList<>(mesChildList0);
+ switch (i) {
+ case 0 :
+ mesChildList.addAll(mesChildList1);
+ break;
+ case 1 :
+ mesChildList.addAll(mesChildList2);
+ break;
+ case 2 :
+ mesChildList.addAll(mesChildList3);
+ break;
+ case 3 :
+ mesChildList.addAll(mesChildList4);
+ break;
+
+ }
+ parentVO.setCheckList(mesChildList);//鍙傛暟
+ //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());
+ }
}
});
}
}catch (Exception e) {
+ log.error(e.getMessage());
throw new RuntimeException(e);
}
return result;
}
/**
- * 淇濆瓨杩囩珯鏁版嵁鍜屽弬鏁颁繚瀛樻暟鎹�
- * @param device 宸ヤ綅鍙�
+ * 030宸ヤ綅杩斿洖ocv娴嬭瘯缁撴灉
+ * @param thoroughfare
+ * @param device
+ * @param cellCode
* @throws Exception
*/
- private void saveParamPassingData(String device,String thoroughfare) throws Exception {
+ private boolean OCVResultFeedBack(String thoroughfare, String device,String cellCode) throws Exception {
+ boolean flag = true;
- //淇濆瓨鍙傛暟閲囬泦鏁版嵁
- List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
- .eq(DaCollectionParamConf::getProcessesCode, device)
- .eq(DaCollectionParamConf::getRemarks, Constants.ONE));
+ List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
+ .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
+ .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
if (CollUtil.isNotEmpty(list)){
- List<String> collect = list.stream().map(DaCollectionParamConf::getGatherAddress)
- .filter(Objects::nonNull).distinct()
- .collect(Collectors.toList());
- QueryPLCData(device,thoroughfare,collect);
-
+ DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
+ if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
+ 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());
+ }
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempById(daTestDeviceInterfaceTemp.getId());
}
+ return flag;
}
-
/**
- * 鎵归噺鏌ヨplc绔欑偣鏁版嵁
- * @param device 绔欑偣
- * @param collect 鐐逛綅
+ * 030宸ヤ綅杩斿洖ocv娴嬭瘯缁撴灉
+ * @param thoroughfare
+ * @param device
* @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);
+ 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 cellCode = value1.toString();
+ List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
+ .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
+ .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
+ if (CollUtil.isNotEmpty(list)){
+ DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
+ if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
+ 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());
}
- 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);
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempById(daTestDeviceInterfaceTemp.getId());
}
- daParamCollectionService.insertBatch(collectionList);
}
+ Object value2 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_2").getValue();
+ if (ObjectUtil.isNotNull(value2)){
+ String cellCode = value2.toString();
+ List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
+ .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
+ .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
+ if (CollUtil.isNotEmpty(list)){
+ DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
+ if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
+ 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());
+ }
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempById(daTestDeviceInterfaceTemp.getId());
+ }
+ }
+
+ Object value3 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_3").getValue();
+ if (ObjectUtil.isNotNull(value3)){
+ String cellCode = value3.toString();
+ List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
+ .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
+ .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
+ if (CollUtil.isNotEmpty(list)){
+ DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
+ if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
+ 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());
+ }
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempById(daTestDeviceInterfaceTemp.getId());
+ }
+ }
+
+ Object value4 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_4").getValue();
+ if (ObjectUtil.isNotNull(value4)){
+ String cellCode = value4.toString();
+ List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
+ .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
+ .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
+ if (CollUtil.isNotEmpty(list)){
+ DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
+ if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
+ 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());
+ }
+ daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempById(daTestDeviceInterfaceTemp.getId());
+ }
+ }
+
+ return flag;
}
+
+
}
--
Gitblit v1.9.3