From cd44522023ba6fece1d93670bfef5f73b5d09f57 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 26 六月 2024 09:43:42 +0800
Subject: [PATCH] add mainCode
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 940 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 538 insertions(+), 402 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 f7c6934..503c6ea 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
@@ -2,12 +2,12 @@
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
@@ -15,56 +15,42 @@
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.query.ProductOrderChild;
+import com.jcdm.main.da.passingStationCollection.query.ProductOrderQuery;
+import com.jcdm.main.da.passingStationCollection.query.ProductOrderVO;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
-import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
-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.jcdm.main.work.domain.KeyCodeRelation;
+import com.jcdm.main.work.domain.QingYanTestInfo;
+import com.jcdm.main.work.domain.SendFactoryMes;
+import com.jcdm.main.work.domain.WorkOrder;
+import com.jcdm.main.work.service.*;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.websocket.Session;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
+@Slf4j
@Component
public class OPCUaSubscription implements SubscriptionCallback {
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- //鏂拌嚜鍔ㄥ伐绔�
- public List<String> automaticList = Arrays.asList("OP280","OP310A","OP310B", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
-
- //閲囬泦妯＄粍宸ヤ綅 ModuleCode
- public List<String> moduleCodeList = Arrays.asList("OP300A","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
-
- //鍖哄垎妯＄粍鍨嬪彿宸ヤ綅
- public List<String> distinguishingModules = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330");
-
- //鍖哄垎灏忚溅鐮�
- public List<String> agvId = Arrays.asList("OP360", "OP390", "OP470","OP280");
-
-
- //鍖哄垎pack鍨嬪彿鐨勫伐浣�
- public List<String> packIdList = Arrays.asList("OP280","OP360","OP390","OP470");
-
- //娴嬭瘯璁惧鎵嬪姩宸ヤ綅
- public List<String> testList = Arrays.asList("OP430-1","OP430-2","OP430-3","OP430-4","OP480-1","OP480-2","OP480-3","OP440");
-
-
- //绌虹殑
- public List<String> nullList = Arrays.asList("OP250","OP260");
public static MiloService miloService;
- Map<String, Session> map = WebSocketUsers.getUsers();
public IDaPassingStationCollectionService daPassingStationCollectionService;
@@ -73,17 +59,37 @@
public static IDaParamCollectionService daParamCollectionService;
public static IOmProductionOrdeInfoService omProductionOrdeInfoService;
+ public static WorkOrderService workOrderService;
+ public static KeyCodeCheckService keyCodeCheckService;
+ public static KeyCodeRelationService keyCodeRelationService;
+ public static QingYanTestInfoService qingYanTestInfoService;
+ public static SendFactoryMesService sendFactoryMesService;
+ public static List<SendFactoryMes> sendFactoryMesList;
+
+ @Value("${orderLineUrl}")
+ private static String orderLineUrl;
public OPCUaSubscription(MiloService miloService,
IDaPassingStationCollectionService daPassingStationCollectionService,
IDaCollectionParamConfService collectionParamConfService,
IDaParamCollectionService daParamCollectionService,
- IOmProductionOrdeInfoService omProductionOrdeInfoService) {
+ IOmProductionOrdeInfoService omProductionOrdeInfoService,
+ WorkOrderService workOrderService,
+ KeyCodeCheckService keyCodeCheckService,
+ KeyCodeRelationService keyCodeRelationService,
+ QingYanTestInfoService qingYanTestInfoService,
+ List<SendFactoryMes> sendFactoryMesList) {
OPCUaSubscription.miloService = miloService;
this.daPassingStationCollectionService = daPassingStationCollectionService;
OPCUaSubscription.collectionParamConfService = collectionParamConfService;
OPCUaSubscription.daParamCollectionService = daParamCollectionService;
OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService;
+ OPCUaSubscription.workOrderService = workOrderService;
+ OPCUaSubscription.keyCodeCheckService = keyCodeCheckService;
+ OPCUaSubscription.keyCodeRelationService = keyCodeRelationService;
+ OPCUaSubscription.qingYanTestInfoService = qingYanTestInfoService;
+ OPCUaSubscription.sendFactoryMesList = sendFactoryMesList;
+
}
@@ -91,405 +97,535 @@
public void onSubscribe(String identifier, Object value) {
try {
- if(null != value && Integer.valueOf(value.toString())!= 0) {
+ if(null != value && !Constants.ZERO.equals(value.toString())) {
String[] nodes = identifier.split("[.]");
String thoroughfare = nodes[0];//閫氶亾
String device = nodes[1];//璁惧
String tab = nodes[2];//鏍囪
- String tabVlaue = value.toString();//鍦板潃鍊�
-
- if (("RecordData").equals(tab)) {
- String recordDataDoneValue = "";
-
- if("1".equals(tabVlaue)){
-
- //璇锋眰宸ュ崟
-// if(device.equals("OP230")){
-// getFactoryOrder("OP230");
-// }
-
- //鑷姩宸ヤ綅
- if(automaticList.stream().anyMatch(s -> s.equals(device))){
- //plc缁欐垜浠竴涓ā缁勭爜锛屾嬁妯＄粍鐮佹牎楠屽嚭鍨嬪彿
- if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- //璇绘ā缁勭爜
- Object moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
-
- if(moduleCode!=null){
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
- }else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
- }
- }else {
- if(agvId.stream().anyMatch(s -> s.equals(device))){
- Object agvIdObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue();
- //agvId 灏忚溅鐮佹槸鍚︿负绌�
- if(agvIdObject!=null){
- String PACKCode = thoroughfare + "." + device + ".MPACKCode";
- OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvIdObject.toString()));
- //灏忚溅鐮佹煡鎵惧伐鍗曟槸鍚︿负绌�
- if(one!=null){
- String packId = one.getProductNum();
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
- }else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
- }
- }else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
- }
-
- }else {
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".PACKCode").getValue();
- if(packCodeObject!=null){
- //pack 濡傛灉鍖哄垎鍨嬪彿鐨勮瘽灏辫澶勭悊
- //璁板綍鏁版嵁瀹屾垚
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
- }else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
- }
-
- }
- }
- }else {
- //鎵嬪姩宸ヤ綅澶勭悊閫昏緫
- WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
-
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
- }
-
-
- }else if("2".equals(tabVlaue)){
- if(automaticList.stream().anyMatch(s -> s.equals(device))){
- //鑷姩宸ヤ綅
- //鍑虹珯淇濆瓨鏁版嵁
- recordDataDoneValue = outSaveDate(thoroughfare,device);
- //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());
- }else {
- //鎵嬪姩宸ヤ綅
- if(device.contains("OP330")){
- String str = device.substring(0,5);
- WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
- }else {
- WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
- }
- if(testList.stream().anyMatch(s -> s.equals(device))){
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+ String valueString = value.toString();//鍦板潃鍊�
+ if (Constants.RECORD_CHECK_CODE.equals(tab)){
+ if (Constants.ONE.equals(valueString)){
+ Integer scanResult = 11;
+ if (Constants.OP010.equals(device) || Constants.OP030.equals(device)){
+ //OP010宸ヤ綅鐢佃姱鏉＄爜鏍￠獙||OP030宸ヤ綅鐢佃姱鏉＄爜鏍￠獙
+ Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
+ if (ObjectUtil.isNotNull(value1)){
+ String keyCode = value1.toString();
+ log.info("璇诲彇鍒板伐浣峽}鐨凷caner鏁版嵁锛歿}",device,keyCode);
+ //浠呮牎楠岄暱搴︽槸鍚﹀悎鏍�
+// List<KeyCodeCheck> collect = keyCodeCheckService.list().stream().filter(x -> x.getKeyCode().contains(keyCode)).collect(Collectors.toList());
+// if (CollUtil.isNotEmpty(collect)){
+// scanResult = 11;
+// }
}
}
- }else {
- System.out.println("^");
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult1").value(scanResult).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凷canerResult1鏁版嵁锛歿}",device,scanResult);
}
- }
- //淇濆瓨鎷х揣鏁版嵁
- else if (("AngleResult").equals(tab)) {
- if("1".equals(tabVlaue)||"2".equals(tabVlaue)){
- List<String> list = new ArrayList<>();
- String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};
-
- for (String suffix : suffixes) {
- String string = thoroughfare + "." + device + "." + suffix;
- list.add(string);
+ }else if (Constants.RECORD_DATA.equals(tab)){
+ if (Constants.ONE.equals(valueString)){
+ //1:鍛婄煡MES鎵樼洏宸插埌绔欙紝璇锋眰涓嬪彂杩涚珯鐘舵��
+ if (Constants.OP030.equals(device)){
+ //鍙嶉鐢佃姱ocv妫�娴嬬粨鏋�
+ boolean b = OCVResultFeedBack(thoroughfare, device);
+ if (b){
+ 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());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,12);
+ }
+ } else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,11);
}
- List<ReadWriteEntity> list1 = miloService.readFromOpcUa(list);
- List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
- String joinedString = String.join(",", collect.toString());
- WebSocketUsers.sendMessageToUserByText(map.get(device), TightenTheConversionOkNg(joinedString));
+ }else if (Constants.TWO.equals(valueString)){
+ //鍒嗘010-065娈�
+ List<String> PART1 = new ArrayList<>();
+ PART1.add(Constants.OP020);
+ PART1.add(Constants.OP030);
+ PART1.add(Constants.OP040);
+ PART1.add(Constants.OP050);
+ PART1.add(Constants.OP060);
+ PART1.add(Constants.OP065);
+ 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 (PART1.contains(device)){
+ //020宸ヤ綅淇濆瓨杩囩珯璁板綍+鍙傛暟鏁版嵁
+ List<DaPassingStationCollection> passingList = getDaPassingStationCollections(thoroughfare, device);
+ if (CollUtil.isNotEmpty(passingList)){
+ daPassingStationCollectionService.insertBatch(passingList);
+ }
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
+ log.info("鍐欏叆鍒板伐浣峽}鐨凴ecordDataDone鏁版嵁锛歿}",device,21);
+ } else if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
+ //涓嬪彂鍒荤爜淇℃伅-涓烘ā缁勭爜
+ ProductOrderQuery query = new ProductOrderQuery();
+ query.setSiteCode("3983");
+ query.setStationCode(device);
+ List<WorkOrder> collect = workOrderService.list().stream()
+ .sorted(Comparator.comparing(WorkOrder::getCreateTime).reversed())
+ .collect(Collectors.toList());
+ if (CollUtil.isNotEmpty(collect)){
+ query.setProductNum(collect.get(0).getProductNum());
+ }
+// ProductOrderVO vo = daPassingStationCollectionService.queryMessFromLine(query);
+ ProductOrderVO vo = new ProductOrderVO();
+ ProductOrderChild child = new ProductOrderChild();
+ child.setModel("modelCode123123123");
+ child.setStationCode("M1OP100-1");
+ child.setProductNum("productNum123113");
+ child.setMaterialCode("materialCode2323");
+ child.setProductionOrderNum("proOrderNum123");
+ vo.setData(child);
+ vo.setCode(Constants.SUCCESS);
+ if (Constants.SUCCESS.equals(vo.getCode())){
+ WorkOrder workOrder = new WorkOrder();
+ ProductOrderChild data = vo.getData();
+ workOrder.setId(123L);
+ workOrder.setProductNum(data.getProductNum());
+ workOrder.setProductionOrderNum(data.getProductionOrderNum());
+ workOrder.setStationCode(data.getStationCode());
+ workOrder.setMaterialCode(data.getMaterialCode());
+ workOrder.setModel(data.getModel());
+ workOrder.setCreateTime(new Date());
+ workOrderService.save(workOrder);
+ //鍐欏叆妯＄粍鐮併�佸伐鍗曞彿銆佷骇鍝佸瀷鍙峰埌plc
+ log.info("鍐欏叆妯＄粍鐮併�佸伐鍗曞彿銆佷骇鍝佸瀷鍙峰埌plc");
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(data.getModel()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(data.getProductionOrderNum()).build());
+ //杩欓噷plc褰曞叆鐨勪骇鍝佸瀷鍙风被鍨嬫槸int绫诲瀷锛屽伐鍘俶es杩斿洖鏁版嵁涓嶆槸int绫诲瀷锛屽彲鑳戒細鍑虹幇闂
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductType").value(data.getProductNum()).build());
+ //缁戝畾妯＄粍鐮佸拰鐢佃姱鐮佹暟鎹�
+ List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode, device)
+ .eq(DaCollectionParamConf::getRemarks,Constants.ONE));
+ List<String> collect3 = list.stream().filter(x -> Constants.INT_ZERO.equals(x.getKeyNum())).map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<String> collect1 = list.stream().filter(x -> Constants.INT_ONE.equals(x.getKeyNum())|| Constants.INT_TWO.equals(x.getKeyNum()))
+ .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+// List<String> collect2 = list.stream().filter(x -> Constants.INT_TWO.equals(x.getKeyNum()))
+// .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> paramCollectionList1 = miloService.readFromOpcUa(collect1);
+ List<ReadWriteEntity> paramCollectionList3 = miloService.readFromOpcUa(collect3);
+ if (CollUtil.isNotEmpty(paramCollectionList1)){
+ List<KeyCodeRelation> relationList = new ArrayList<>();
+ for (ReadWriteEntity readWriteEntity : paramCollectionList1) {
+ if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && StrUtil.isNotBlank(readWriteEntity.getValue().toString())){
+ KeyCodeRelation keyCodeRelation = new KeyCodeRelation();
+ keyCodeRelation.setModuleCode(data.getModel());
+ keyCodeRelation.setKeyCode(readWriteEntity.getValue().toString());
+ keyCodeRelation.setProductionOrderNum(data.getProductionOrderNum());
+ keyCodeRelation.setProductNum(data.getProductNum());
+ keyCodeRelation.setCreateTime(new Date());
+ relationList.add(keyCodeRelation);
+ }
+ }
+ if (CollUtil.isNotEmpty(relationList)){
+ keyCodeRelationService.insertBatch(relationList);
+ }
+ }
+ if (CollUtil.isNotEmpty(paramCollectionList3)){
+ QueryPLCData(device,thoroughfare,collect3);
+ }
+ //淇濆瓨杩囩珯璁板綍
+ DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
+ passingStationCollection.setModuleCode(data.getModel());
+
+ 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();
+ log.info("璇诲彇宸ヤ綅{}StationStatus锛歿}",device,string);
+ if (Constants.TWO.equals(string)){
+ stationStatus = Constants.UN_PASS;
+ }
+ }
+ 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);
+ } 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.setModuleCode(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;
+ }
+ }
+ 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);
+ }
+ }
+ } else if (Constants.RECORD_SN.equals(tab)){
+ if (Constants.ONE.equals(valueString)){
+ if (Constants.OP070.equals(device)){
+ //OP070涓嬪彂浜у搧妯＄粍鐮�
+ String string = UUID.randomUUID().toString();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(string).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());
+ }
+ }
+ } else if (Constants.RECORD_CHECK_CODE_1.equals(tab)) {
+ if (Constants.OP100_1.equals(device)){
+ //閽㈠甫鏉＄爜鏍￠獙--鍙戦�佺粰宸ュ巶mes
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult11").value(11).build());
+ } else if (Constants.OP100_2.equals(device)) {
+ //PET甯︽潯鐮佹牎楠�--鍙戦�佺粰宸ュ巶mes
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult12").value(11).build());
}
}
}
} catch (Exception e) {
-
- }
- }
-
-
-
- /**
- * 鑾峰彇SNCode
- */
- public String getSNCode(){
- String SNCode = "";
- return SNCode;
- }
-
- /**
- * 鍑虹珯淇濆瓨鏁版嵁
- */
- public String outSaveDate(String thoroughfare,String device) {
- String snCode = "";
- String result = "";
- String read = thoroughfare + "." + device + ".";
-
- try {
- if(nullList.stream().noneMatch(s -> s.equals(device))){
- if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
- read = read + "ModuleCode";
- }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);
- }
-
- result = "21";
-
- }
-
- }catch (Exception e) {
System.out.println(e.getMessage());
+ log.info(e.getMessage());
}
- return result;
}
-
-
-// /**
-// * 鍑虹珯淇濆瓨鏁版嵁
-// */
-// public String outSaveDate(String thoroughfare,String device) {
-// String result = "";
-// try {
-// //璇诲彇SNCode
-// String PACKCode = thoroughfare + "." + device + ".PACKCode";
-// Object PACKCodeObject = miloService.readFromOpcUa(PACKCode).getValue();
-// if(null == PACKCodeObject || "".equals(PACKCodeObject)){
-// result = "22";
-// }else{
-// String PACKCodeParam = PACKCodeObject.toString();
-// //1銆佹洿鏂板伐鍗曚俊鎭�
-// //updateOrderInfo();
-// //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
-// saveStationInfo(PACKCodeParam,thoroughfare,device);
-// //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
-// SaveParamData(PACKCodeParam,thoroughfare,device,"","");
-//
-// result = "21";
-//
-// }
-//
-// }catch (Exception e) {
-//
-// }
-// return result;
-// }
/**
- * 淇濆瓨杩囩珯閲囬泦
+ * 淇濆瓨鐢佃姱杩囩珯璁板綍
+ * @param thoroughfare 閫氶亾
+ * @param device 宸ヤ綅
+ * @return list
+ * @throws Exception e
*/
- public void saveStationInfo(String packCode,String thoroughfare,String device,String workOrderNo,String productCode) throws Exception {
- SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
- sdf.setTimeZone(TimeZone.getTimeZone("GMT+8")); // CST閫氬父琛ㄧず涓浗鏍囧噯鏃堕棿锛屽嵆涓滃叓鍖�
- String prefix = thoroughfare+"."+device+".";
- String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
- String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
- String stationStatus = miloService.readFromOpcUa(prefix + "StationStatus").getValue().toString();
-
- DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
- daPassingStationCollection.setSfcCode(packCode);
- daPassingStationCollection.setWorkOrderNo(workOrderNo);
- daPassingStationCollection.setProductCode(productCode);
- daPassingStationCollection.setLocationCode(device);
- String strt = TimeUtil.stringProcessing(startTime);
- String end = TimeUtil.stringProcessing(stopTime);
- daPassingStationCollection.setInboundTime(sdf.parse(strt));//鍏ョ珯鏃堕棿
- daPassingStationCollection.setOutboundTime(sdf.parse(end));//鍑虹珯鏃堕棿
- daPassingStationCollection.setOutRsSign(stationStatus);//鍑虹珯鏄惁鍚堟牸
- daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
- }
-
- public static void 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<String> nodeIdList = list.stream().map(info -> {
- String nodeid = info.getGatherAddress();
- return nodeid;
- }).collect(Collectors.toList());
-
- if(!nodeIdList.isEmpty()){
- List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
- for (int i = 0; i < readWriteEntityList.size(); i++) {
- if(readWriteEntityList.get(i).getValue() == null){
- readWriteEntityList.get(i).setValue(" ");
+ private static List<DaPassingStationCollection> getDaPassingStationCollections(String thoroughfare, String device) throws Exception {
+ List<String> readList = new ArrayList<>();
+ readList.add(thoroughfare + "." + device +".CellCode_1");
+ readList.add(thoroughfare + "." + device +".CellCode_2");
+ readList.add(thoroughfare + "." + device +".CellCode_3");
+ readList.add(thoroughfare + "." + device +".CellCode_4");
+ List<String> keyCodeList = new ArrayList<>();
+ List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(readList);
+ List<DaPassingStationCollection> passingList = new ArrayList<>();
+ for (ReadWriteEntity readWriteEntity : readWriteEntityList) {
+ DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
+ passingStationCollection.setLocationCode(device);
+ passingStationCollection.setInboundTime(new Date());
+ if (ObjectUtil.isNotNull(readWriteEntity.getValue())){
+ passingStationCollection.setKeyCode(readWriteEntity.getValue().toString());
+ keyCodeList.add(readWriteEntity.getValue().toString());
+ }
+ 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;
}
}
- 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();
- ParamCollection.setParamCode(list.get(i).getCollectParameterId());
- ParamCollection.setLocationCode(device);
- if(tt.contains("Time")){
-// String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
-// ParamCollection.setParamValue(str);
- ParamCollection.setParamValue(TimeUtil.getYyyyDdMm(TimeUtil.stringProcessing(tt)));
- }else {
- ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
+ passingStationCollection.setOutRsSign(stationStatus);
+ passingStationCollection.setCreateTime(new Date());
+ passingList.add(passingStationCollection);
+ }
+ //鍙傛暟閲囬泦
+ //淇濆瓨鍙傛暟閲囬泦鏁版嵁
+ List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode, device)
+ .eq(DaCollectionParamConf::getRemarks, Constants.ONE));
+ if (CollUtil.isNotEmpty(list)){
+ List<DaParamCollection> saveParamList = new ArrayList<>();
+ List<DaCollectionParamConf> confColl1 = list.stream().filter(x -> Constants.INT_ONE.equals(x.getKeyNum())).collect(Collectors.toList());
+ List<DaCollectionParamConf> confColl2 = list.stream().filter(x -> Constants.INT_TWO.equals(x.getKeyNum())).collect(Collectors.toList());
+ List<DaCollectionParamConf> confColl3 = list.stream().filter(x -> Constants.INT_THREE.equals(x.getKeyNum())).collect(Collectors.toList());
+ List<DaCollectionParamConf> confColl4 = list.stream().filter(x -> Constants.INT_FOUR.equals(x.getKeyNum())).collect(Collectors.toList());
+ List<DaCollectionParamConf> confColl0 = list.stream().filter(x -> Constants.INT_ZERO.equals(x.getKeyNum())).collect(Collectors.toList());
+ List<String> collect1 = confColl1.stream().map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> paramCollectionList1 = miloService.readFromOpcUa(collect1);
+ List<String> collect2 = confColl2.stream()
+ .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> paramCollectionList2 = miloService.readFromOpcUa(collect2);
+ List<String> collect3 = confColl3.stream()
+ .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> paramCollectionList3 = miloService.readFromOpcUa(collect3);
+ List<String> collect4 = confColl4.stream()
+ .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> paramCollectionList4 = miloService.readFromOpcUa(collect4);
+ List<String> collect0 = confColl0.stream()
+ .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList());
+ List<ReadWriteEntity> paramCollectionList0 = miloService.readFromOpcUa(collect0);
+
+
+ if (CollUtil.isNotEmpty(paramCollectionList1)){
+ List<ChildVO> checkList = new ArrayList<>();
+ for (int i = 0; i < paramCollectionList1.size(); i++) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ if (CollUtil.isNotEmpty(keyCodeList) && keyCodeList.size() == 4){
+ daParamCollection.setKeyCode(keyCodeList.get(0));
}
- ParamCollection.setSfcCode(packCode);
- if(device.contains("OP360")){
- String node = nodeIdList.get(i);
- Object value = miloService.readFromOpcUa("PACK.OP360.ModuleSNCode"+node.charAt(node.length()-1)).getValue();
- if(value!=null){
- ParamCollection.setModuleCode(value.toString());
+
+ daParamCollection.setParamCode(paramCollectionList1.get(i).getIdentifier());
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(paramCollectionList1.get(i).getValue())){
+ paramValue = paramCollectionList1.get(i).getValue().toString();
+ }
+ daParamCollection.setParamValue(paramValue);
+ daParamCollection.setLocationCode(device);
+ daParamCollection.setCollectionTime(new Date());
+ saveParamList.add(daParamCollection);
+ ChildVO childVO = new ChildVO();
+ childVO.setItemCode(confColl1.get(i).getCollectParameterName());
+ childVO.setItemType(confColl1.get(i).getItemType());
+ childVO.setItemValue(paramValue);
+ childVO.setItemText(confColl1.get(i).getParameterSetName());
+ childVO.setCheckResult("1");
+ childVO.setCheckTime(new Date().toString());
+ checkList.add(childVO);
+ }
+ //涓婁紶鍒板伐鍘俶es
+ ParentVO vo = new ParentVO();
+ vo.setStationCode(device);
+ vo.setCheckList(checkList);
+ vo.setSiteCode("3983");
+ vo.setRecordId(UUID.randomUUID().toString());
+ vo.setTotalResult("1");
+ if (CollUtil.isNotEmpty(keyCodeList) && keyCodeList.size() == 4){
+ vo.setProductNum(keyCodeList.get(0));
+ }
+ try{
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ log.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
+ HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(vo)).execute();
+ System.out.println(execute.body());
+ log.info("寮傛鏂规硶鎵ц缁撴潫");
+ });
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+ if (CollUtil.isNotEmpty(paramCollectionList2)){
+ for (int i = 0; i < paramCollectionList2.size(); i++) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ if (CollUtil.isNotEmpty(keyCodeList) && keyCodeList.size() == 4){
+ daParamCollection.setKeyCode(keyCodeList.get(1));
+ }
+
+ daParamCollection.setParamCode(paramCollectionList2.get(i).getIdentifier());
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(paramCollectionList2.get(i).getValue())){
+ paramValue = paramCollectionList2.get(i).getValue().toString();
+ }
+ daParamCollection.setParamValue(paramValue);
+ daParamCollection.setLocationCode(device);
+ daParamCollection.setCollectionTime(new Date());
+ saveParamList.add(daParamCollection);
+ }
+ }
+ if (CollUtil.isNotEmpty(paramCollectionList3)){
+ for (int i = 0; i < paramCollectionList3.size(); i++) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ if (CollUtil.isNotEmpty(keyCodeList) && keyCodeList.size() == 4){
+ daParamCollection.setKeyCode(keyCodeList.get(2));
+ }
+
+ daParamCollection.setParamCode(paramCollectionList3.get(i).getIdentifier());
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(paramCollectionList3.get(i).getValue())){
+ paramValue = paramCollectionList3.get(i).getValue().toString();
+ }
+ daParamCollection.setParamValue(paramValue);
+ daParamCollection.setLocationCode(device);
+ daParamCollection.setCollectionTime(new Date());
+ saveParamList.add(daParamCollection);
+ }
+ }
+ if (CollUtil.isNotEmpty(paramCollectionList4)){
+ for (int i = 0; i < paramCollectionList4.size(); i++) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ if (CollUtil.isNotEmpty(keyCodeList) && keyCodeList.size() == 4){
+ daParamCollection.setKeyCode(keyCodeList.get(3));
+ }
+
+ daParamCollection.setParamCode(paramCollectionList4.get(i).getIdentifier());
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(paramCollectionList4.get(i).getValue())){
+ paramValue = paramCollectionList4.get(i).getValue().toString();
+ }
+ daParamCollection.setParamValue(paramValue);
+ daParamCollection.setLocationCode(device);
+ daParamCollection.setCollectionTime(new Date());
+ saveParamList.add(daParamCollection);
+ }
+ }
+ if (CollUtil.isNotEmpty(paramCollectionList0)){
+ for (int i = 0; i < paramCollectionList0.size(); i++) {
+ if (CollUtil.isNotEmpty(keyCodeList) && keyCodeList.size() == 4){
+ for (String s : keyCodeList) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setKeyCode(s);
+ daParamCollection.setParamCode(paramCollectionList0.get(i).getIdentifier());
+ String paramValue = "";
+ if (ObjectUtil.isNotNull(paramCollectionList0.get(i).getValue())){
+ paramValue = paramCollectionList0.get(i).getValue().toString();
+ }
+ daParamCollection.setParamValue(paramValue);
+ daParamCollection.setLocationCode(device);
+ daParamCollection.setCollectionTime(new Date());
+ saveParamList.add(daParamCollection);
}
}
- 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());
- ParamCollection.setWorkOrderNo(workOrderNo);
- ParamCollection.setProductCode(productType);
- daParamCollectionlist.add(ParamCollection);
-// daParamCollectionService.insertDaParamCollection(ParamCollection);
}
}
- daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
- }
- addBaseData(workOrderNo,productType,device,packCode);
-
- }
-
- public static void addBaseData(String workOrderNo,String productCode,String locationCode,String packCode){
- Map<String, String> map = new HashMap<>();
- map.put("GC", "鍗楁禂宸ュ巶");
- map.put("CXBH", "Pack绾�");
- map.put("SBBH", "璁惧001");
- map.put("YGBH", "鍛樺伐001");
- List<DaParamCollection> confList = new ArrayList<>();
- map.forEach((key, value) -> {
- List<DaCollectionParamConf> daCollectionParamConfs = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
- .eq(DaCollectionParamConf::getProcessesCode,locationCode)
- .like(DaCollectionParamConf::getCollectParameterId,key));
- DaParamCollection saveData = new DaParamCollection();
- saveData.setWorkOrderNo(workOrderNo);
- saveData.setProductCode(productCode);
- saveData.setLocationCode(locationCode);
- saveData.setSfcCode(packCode);
- saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
- saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
- saveData.setCollectionTime(new Date());
- saveData.setParamValue(value);
- confList.add(saveData);
- });
- daParamCollectionService.insertBatch(confList);
- }
-
- public static void getFactoryOrder(String locationCode){
- String productionWorkOrder = RestfulService.getProductionWorkOrderRequest("", locationCode);
- JSONObject jsonObject = new JSONObject(productionWorkOrder);
- JSONObject dataObject = jsonObject.getJSONObject("data");
-
- String productNum = dataObject.getStr("productNum");
- String stationCode = dataObject.getStr("stationCode");
- String materialCode = dataObject.getStr("materialCode");
- String productionOrderNum = dataObject.getStr("productionOrderNum");
-
- OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
- omProductionOrdeInfo.setProductNum(productNum);
- omProductionOrdeInfo.setWorkOrderNo(productionOrderNum);
- omProductionOrdeInfo.setStationCode(stationCode);
- omProductionOrdeInfo.setProductCode(materialCode);
- omProductionOrdeInfoService.save(omProductionOrdeInfo);
- }
-
- public static void updateOrderInfo(String packCode){
- OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, packCode));
- one.setOrderStatus("5");
- omProductionOrdeInfoService.saveOrUpdate(one);
- }
-
- public static void avgFunction(){
-
- }
-
- public static String TightenTheConversionOkNg(String param){
- // 鍘婚櫎棣栧熬鐨勬柟鎷彿锛岀劧鍚庢寜鐓ч�楀彿鍒嗗壊瀛楃涓�
- String[] parts = param.substring(1, param.length() - 1).split(",");
-
- // 鍒涘缓涓�涓柊鐨凷tringBuilder鏉ユ瀯寤烘浛鎹㈠悗鐨勫瓧绗︿覆
- StringBuilder sb = new StringBuilder();
- sb.append('['); // 娣诲姞宸︽柟鎷彿
-
- for (int i = 0; i < parts.length; i++) {
- String part = parts[i].trim(); // 鍘婚櫎鍙兘鐨勭┖鏍�
- float value;
- try {
- value = Float.parseFloat(part); // 灏濊瘯灏嗗瓧绗︿覆杞崲涓烘诞鐐规暟
- String replacement;
- 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(','); // 娣诲姞閫楀彿锛堥櫎浜嗘渶鍚庝竴涓厓绱狅級
- }
- } catch (NumberFormatException e) {
- // 濡傛灉杞崲澶辫触锛屽垯淇濇寔鍘熸牱锛堟垨杩涜鍏朵粬閿欒澶勭悊锛�
- sb.append(part);
- if (i < parts.length - 1) {
- sb.append(',');
- }
+ daParamCollectionService.insertBatch(saveParamList);
}
- }
- sb.append(']'); // 娣诲姞鍙虫柟鎷彿
- return sb.toString();
+ return passingList;
}
-
/**
- * 鏍￠獙鏄惁瀛樺湪NG
- * @param packCode sfcCode
- * @return boolean
+ * 030宸ヤ綅杩斿洖ocv娴嬭瘯缁撴灉
+ * @param thoroughfare
+ * @param device
+ * @throws Exception
*/
- public boolean checkIsNG(String packCode,String modelCode){
- List<DaPassingStationCollection> list = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>()
- .eq(StrUtil.isNotBlank(packCode),DaPassingStationCollection::getSfcCode, packCode)
- .eq(DaPassingStationCollection::getOutRsSign, Constants.UN_PASS));
- return CollUtil.isEmpty(list);
+ 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;
}
+ /**
+ * 淇濆瓨杩囩珯鏁版嵁鍜屽弬鏁颁繚瀛樻暟鎹�
+ * @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);
+
+ }
+ }
+
+ /**
+ * 鎵归噺鏌ヨ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);
+ }
+ }
}
--
Gitblit v1.9.3