From 706d57aa682845cf1bc01cbfd1087c4c0f33093f Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 12 十一月 2024 09:46:48 +0800
Subject: [PATCH] 优化
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 183 ++++++++++++++++++++++++++++++---------------
1 files changed, 120 insertions(+), 63 deletions(-)
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 0b93010..c06fb9a 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
@@ -58,6 +58,8 @@
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
+import static org.apache.commons.lang3.SystemUtils.getUserName;
+
/**
* 璁惧浜у搧杩囩▼鍙傛暟閲囬泦Service涓氬姟灞傚鐞�
*
@@ -265,12 +267,14 @@
@Override
public void saveCampaignTimeParameters(DaParamCollection daParamCollection) {
+ String locationCode = daParamCollection.getLocationCode();
+ String thoroughfare = Constants.thoroughfareMap.get(locationCode);
BsFormulaChildInfo childInfo = daParamCollection.getFormulaChildEntity();
if(StringUtils.isNotBlank(childInfo.getResults())){
if(!childInfo.getResults().equals("OK")){
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("MOZU1."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare+"."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -278,7 +282,7 @@
}
}else {
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("MOZU1."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare+"."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -308,8 +312,8 @@
this.saveParameters(daParamCollection);
//缁檕pc鍙�21
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("MOZU1."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
- if(daParamCollection.getLocationCode().equals("M1OP100-1") || daParamCollection.getLocationCode().equals("M1OP100-2") ){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare+"."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
+ /* if(daParamCollection.getLocationCode().equals("M1OP100-1") || daParamCollection.getLocationCode().equals("M1OP100-2") ){
try{
//鏇存柊宸ュ崟鐘舵�佷负宸叉墽琛�
LambdaUpdateWrapper<OmProductionOrdeInfo> updateWrapper = new LambdaUpdateWrapper<>();
@@ -337,7 +341,7 @@
System.out.println(e.getMessage());
}
- }
+ }*/
} catch (Exception e) {
@@ -371,6 +375,7 @@
for (int i = 0; i < paramCollectionList.size(); i++) {
DaParamCollection collection = new DaParamCollection();
collection.setSfcCode(daParamCollection.getProductBarcode());//妯＄粍鐮�
+ collection.setWorkOrderNo(daParamCollection.getWorkOrderNo());//宸ュ崟鍙�
collection.setParamCode(list.get(i).getCollectParameterId());//鍙傛暟缂栫爜
collection.setParamName(list.get(i).getCollectParameterName());//鍙傛暟鍚嶇О
String paramValue = "";
@@ -402,6 +407,59 @@
daParamCollectionTempService.insertBatch(saveParamListTemp);
}
}
+
+ public void addCollectParamBasicData(String stationCode,String modelCode){
+ List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>().like(DaCollectionParamConf::getCollectParameterId, "YGBH"));
+ if(!confList.isEmpty()){
+ DaCollectionParamConf daCollectionParamConf = confList.get(0);
+ DaParamCollection collection = new DaParamCollection();
+ collection.setSfcCode(modelCode);//妯＄粍鐮�
+ collection.setParamCode(daCollectionParamConf.getCollectParameterId());//鍙傛暟缂栫爜
+ collection.setParamName(daCollectionParamConf.getCollectParameterName());//鍙傛暟鍚嶇О
+ collection.setParamValue(getUserName());//鍙傛暟鍊�
+ collection.setLocationCode(stationCode);//宸ヤ綅
+ collection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ daParamCollectionService.save(collection);
+
+ DaParamCollectionTemp collectionTemp = new DaParamCollectionTemp();
+ collectionTemp.setSfcCode(modelCode);//妯＄粍鐮�
+ collectionTemp.setParamCode(daCollectionParamConf.getCollectParameterId());//鍙傛暟缂栫爜
+ collectionTemp.setParamName(daCollectionParamConf.getCollectParameterName());//鍙傛暟鍚嶇О
+ collectionTemp.setParamValue(getUserName());//鍙傛暟鍊�
+ collectionTemp.setLocationCode(stationCode);//宸ヤ綅
+ collectionTemp.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ daParamCollectionTempService.save(collectionTemp);
+ }
+ }
+
+ @Override
+ public void pushStartStopTime(String paramCode, String paramName, String productNum) {
+ ParentVO parentVO = new ParentVO();
+ parentVO.setSiteCode("3983");
+ parentVO.setRecordId(String.valueOf(Instant.now().toEpochMilli()));
+ parentVO.setStationCode("OP165");
+ parentVO.setProductNum(productNum);
+ parentVO.setTotalResult("1");
+ List<ChildVO> listChildVo = new ArrayList<>();
+ ChildVO childVO = new ChildVO();
+ childVO.setItemCode(paramCode);
+ childVO.setItemType("3");
+ childVO.setItemText(paramName);
+ childVO.setItemValue(format.format(new Date()));
+ childVO.setCheckResult("1");
+ childVO.setCheckTime(format.format(new Date()));
+ listChildVo.add(childVO);
+ parentVO.setCheckList(listChildVo);
+ try{
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
+ System.out.println(execute.body());
+ });
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+
@Override
public void insertBatch(List<DaParamCollection> confList){
try{
@@ -542,6 +600,12 @@
@Override
public void pushGeelycvMesFeedback(String packID, String stationCode) {
+ //娣诲姞鍩虹鍙傛暟(鐧婚檰浜轰俊鎭�)
+ try {
+ addCollectParamBasicData(stationCode,packID);
+ }catch (Exception e){
+ throw new RuntimeException(e);
+ }
logger.info("杩涘叆浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String totalResult = "0";
@@ -558,41 +622,32 @@
for (DaParamCollectionTemp daParamCollection : paramList) {
ChildVO childVO = new ChildVO();
childVO.setItemCode(daParamCollection.getParamCode());
-// BsFormulaChildInfo childOne = bsFormulaChildInfoService.getOne(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getParamCode, daParamCollection.getParamCode()));
-// DaCollectionParamConf paramConfOne = daCollectionParamConfService.getOne(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
- List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
+ List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode())
+ .eq(DaCollectionParamConf::getProcessesCode,stationCode));
DaCollectionParamConf paramConfOne = paramConfOneList.get(0);
-// if(childOne!=null){
-// String operationType = childOne.getOperationType();
-// if(operationType.equals("1")){
-// childVO.setItemType("2");
-// }else if(operationType.equals("2")){
-// childVO.setItemType("1");
-// }
-// }else {
-// childVO.setItemType("3");
-// }
- if(paramConfOne!=null){
- childVO.setItemType(paramConfOne.getItemType());
- childVO.setItemText(paramConfOne.getCollectParameterName());
- }else {
- childVO.setItemType("3");
- childVO.setItemText("");
- }
- childVO.setItemValue(daParamCollection.getParamValue());
+ if(!paramConfOneList.isEmpty()){
+ if(paramConfOne!=null){
+ childVO.setItemType(paramConfOne.getItemType());
+ childVO.setItemText(paramConfOne.getCollectParameterName());
+ }else {
+ childVO.setItemType("3");
+ childVO.setItemText("");
+ }
+ childVO.setItemValue(daParamCollection.getParamValue());
- if(daParamCollection.getParamValue().equals("1")){
- childVO.setCheckResult("1");
- }else if(daParamCollection.getParamValue().equals("2")){
- childVO.setCheckResult("0");
- parentVO.setTotalResult("0");
- totalResult = "1";
- }else {
- childVO.setCheckResult("1");
+ if(daParamCollection.getParamValue().equals("1")){
+ childVO.setCheckResult("1");
+ }else if(daParamCollection.getParamValue().equals("2")){
+ childVO.setCheckResult("0");
+ parentVO.setTotalResult("0");
+ totalResult = "1";
+ }else {
+ childVO.setCheckResult("1");
+ }
+ childVO.setCheckTime(format.format(daParamCollection.getCollectionTime()));
+ listChildVo.add(childVO);
}
- childVO.setCheckTime(format.format(daParamCollection.getCollectionTime()));
- listChildVo.add(childVO);
-
}
parentVO.setCheckList(listChildVo);
try{
@@ -758,32 +813,34 @@
@Override
public void manualWorkstationsAddBasicParameters(DaParamCollection daParamCollection) {
// 鍋囪杩欐槸浠庢暟鎹簱鎴栧叾浠栧湴鏂硅幏鍙栫殑鍙傛暟鏁版嵁
- Map<String, String> map = new HashMap<>();
- map.put("GC", "鍗楁禂宸ュ巶");
- map.put("CXBH", "Pack绾�");
- map.put("SBBH", "璁惧001");
- map.put("YGBH", SecurityUtils.getUsername());
- map.put("GDBH", daParamCollection.getWorkOrderNo());
- map.put("CPXH", daParamCollection.getProductCode());
- map.put("INT", format.format(daParamCollection.getInboundTime()));
- map.put("OUTT",format.format(new Date()));
-
- map.forEach((key, value) -> {
- DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
- daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
- daCollectionParamConf.setCollectParameterId(key);
- 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(value);
- daParamCollectionMapper.insertDaParamCollection(saveData);
- });
+// Map<String, String> map = new HashMap<>();
+// map.put("GC", "鍗楁禂宸ュ巶");
+// map.put("CXBH", "Pack绾�");
+// map.put("SBBH", "璁惧001");
+// map.put("YGBH", SecurityUtils.getUsername());
+// map.put("GDBH", daParamCollection.getWorkOrderNo());
+// map.put("CPXH", daParamCollection.getProductCode());
+// map.put("INT", format.format(daParamCollection.getInboundTime()));
+// map.put("OUTT",format.format(new Date()));
+//
+// map.forEach((key, value) -> {
+// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+// daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+// daCollectionParamConf.setCollectParameterId(key);
+// 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());
+// if(daCollectionParamConfs.isEmpty()){
+// saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
+// saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
+// }
+// saveData.setCollectionTime(new Date());
+// saveData.setParamValue(value);
+// daParamCollectionMapper.insertDaParamCollection(saveData);
+// });
}
@Override
--
Gitblit v1.9.3