From 5fbc7a423b6d51716695ff8317337fc40719e2a6 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 15 七月 2024 10:39:42 +0800
Subject: [PATCH] 修改参数采集
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 12dc6e2..801adc5 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
@@ -289,11 +289,11 @@
omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
- omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
omProductionOrdeInfo.setOnlineCompletionMark("0");
omProductionOrdeInfo.setSfResult("0");
- omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
+ omProductionOrdeInfo.setProductModel(dataObject.getStr("model"));
omProductionOrdeInfo.setCreateTime(new Date());
omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
omProductionOrdeInfoService.save(omProductionOrdeInfo);
@@ -483,6 +483,8 @@
paramValue = readWriteEntityList.get(i).getValue().toString();//鍙傛暟鍊�
if("DATE".equals(list.get(i).getCollectParameterType()) && !paramValue.isEmpty()){
paramValue = format.parse(TimeUtil.test(TimeUtil.stringProcessing(paramValue))).toString();
+ }else if("MODEL".equals(list.get(i).getCollectParameterType()) && !paramValue.isEmpty()){
+ paramValue = Constants.materialMap.get(paramValue);
}
}
daParamCollection.setParamValue(paramValue);//鍙傛暟鍊�
@@ -522,6 +524,11 @@
parentVO.setTotalResult("1");
}
parentVO.setProductNum(moduleCode);
+
+ //娣诲姞鍩虹鏁版嵁
+ List<ChildVO> basicList = getCollectParamBasicData(device);
+ mesList.addAll(basicList);
+
parentVO.setCheckList(mesList);
log.info("鎵ц宸ュ巶MES鏂规硶start锛屽伐浣嶅彿{} 浼犲叆鏁版嵁锛歿}",device ,parentVO);
@@ -761,6 +768,11 @@
break;
}
+
+ //娣诲姞鍩虹鏁版嵁
+ List<ChildVO> basicList = getCollectParamBasicData(device);
+ mesChildList.addAll(basicList);
+
parentVO.setCheckList(mesChildList);//鍙傛暟
//CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
@@ -921,12 +933,44 @@
HttpRequest httpRequest = HttpRequest.get(url);
result = response.body();
}catch (Exception e){
- e.printStackTrace();
+ throw new RuntimeException(e);
}finally {
return result;
}
-
}
+ /**
+ * 鑾峰彇閲囬泦鍙傛暟鍩虹鏁版嵁
+ * @param stationCode
+ * @return list
+ */
+ public static List<ChildVO> getCollectParamBasicData(String stationCode) {
+ List<ChildVO> basicList = new ArrayList<>();
+ try {
+ //鏌ヨ鍙傛暟閰嶇疆琛�
+ List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode, stationCode)//宸ヤ綅
+ .eq(DaCollectionParamConf::getCollectParameterType, "BASIC")//閲囬泦鍙傛暟绫诲瀷
+ );
+ if (CollUtil.isNotEmpty(list)){
+ for(DaCollectionParamConf conf:list){
+ ChildVO childVO = new ChildVO();
+ childVO.setItemCode(conf.getCollectParameterId());//鍙傛暟
+ childVO.setItemType(conf.getItemType());
+ childVO.setItemValue(conf.getParamCentral());//鍙傛暟鍊�
+ childVO.setItemText(conf.getCollectParameterName());
+ childVO.setCheckResult("1");
+ childVO.setCheckTime(format.format(new Date()));
+ basicList.add(childVO);
+ }
+ }
+ return basicList;
+ }catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
}
--
Gitblit v1.9.3