From 8cfe20288690f2ba46c804f41f39e8aa48c2dea0 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 15 六月 2024 09:08:30 +0800
Subject: [PATCH] 上传逻辑大版本更新
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 125 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 119 insertions(+), 6 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 dc72ecb..92bc866 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
@@ -25,6 +25,8 @@
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.da.paramCollectionTemp.domain.DaParamCollectionTemp;
+import com.jcdm.main.da.paramCollectionTemp.service.IDaParamCollectionTempService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
@@ -82,6 +84,9 @@
@Autowired
private IDaCollectionParamConfService daCollectionParamConfService;
+
+ @Autowired
+ private IDaParamCollectionTempService daParamCollectionTempService;
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -224,6 +229,14 @@
daParamCollection.setCollectionTime(new Date());
daParamCollection.setSfcCode(daParamCollection.getProductBarcode());
daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+
+ DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp();
+ daParamCollectionTemp.setParamValue(tightenDataParts[i]);
+ daParamCollectionTemp.setParamCode(paramCodeParts[i]);
+ daParamCollectionTemp.setCollectionTime(new Date());
+ daParamCollectionTemp.setSfcCode(daParamCollection.getProductBarcode());
+ daParamCollectionTemp.setLocationCode(daParamCollection.getLocationCode());
+ daParamCollectionTempService.save(daParamCollectionTemp);
}
}
}
@@ -444,7 +457,72 @@
// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
String totalResult = "0";
- List<DaParamCollection> paramList = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getSfcCode, packID).eq(DaParamCollection::getLocationCode, stationCode));
+ List<DaParamCollectionTemp> paramList = daParamCollectionTempService.list(new LambdaQueryWrapper<DaParamCollectionTemp>().eq(DaParamCollectionTemp::getSfcCode, packID).eq(DaParamCollectionTemp::getLocationCode, stationCode));
+ if(paramList.size() > 0){
+ ParentVO parentVO = new ParentVO();
+ parentVO.setSiteCode("3983");
+ parentVO.setRecordId(String.valueOf(Instant.now().toEpochMilli()));
+ parentVO.setStationCode(stationCode);
+ parentVO.setProductNum(packID);
+ parentVO.setTotalResult("1");
+ List<ChildVO> listChildVo = new ArrayList<>();
+
+ 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()));
+ 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.getSpareField1());
+ 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");
+ }
+ childVO.setCheckTime(format.format(daParamCollection.getCollectionTime()));
+ listChildVo.add(childVO);
+
+ }
+ parentVO.setCheckList(listChildVo);
+ HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());
+ Long[] array = idsList.toArray(new Long[0]);
+ daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);
+ System.out.println(execute.body());
+ System.out.println("-----------------------"+totalResult);
+ }
+
+ }
+
+ @Override
+ public void automaticWorkstationPushGeelycvMesFeedback(String packID, String stationCode,List<DaParamCollection> paramList) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String totalResult = "0";
if(paramList.size() > 0){
ParentVO parentVO = new ParentVO();
parentVO.setSiteCode("3983");
@@ -457,8 +535,10 @@
for (DaParamCollection 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()));
+// 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()));
+ DaCollectionParamConf paramConfOne = paramConfOneList.get(0);
// if(childOne!=null){
// String operationType = childOne.getOperationType();
// if(operationType.equals("1")){
@@ -495,21 +575,54 @@
System.out.println(execute.body());
System.out.println("-----------------------"+totalResult);
}
-
}
@Override
public AjaxResult checkRecordDataDone(DaParamCollection daParamCollection) {
String result = "";
+
+
try {
- Object recordDataDone = miloService.readFromOpcUa("PACK" + "." + daParamCollection.getLocationCode() + ".RecordDataDone").getValue();
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getSpareField4, "1").eq(BsFormulaChildInfo::getProcessesCode, daParamCollection.getLocationCode()));
+ if(list.size()>0){
+ String results = list.get(0).getResults();
+ if(results!= null && !results.equals("") && results.equals("OK")){
+ result = "21";
+ }
+ }
+ /*Object recordDataDone = miloService.readFromOpcUa("PACK" + "." + daParamCollection.getLocationCode() + ".RecordDataDone").getValue();
if(ObjectUtil.isNotNull(recordDataDone)){
result = recordDataDone.toString();
- }
+ }*/
} catch (Exception e) {
throw new RuntimeException(e);
}
return AjaxResult.success(result);
}
+ @Override
+ public void enterWeighing(DaParamCollection daParamCollection) {
+ String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ long timestampMillis = Instant.now().toEpochMilli();
+ ParentVO parentVO = new ParentVO();
+ ChildVO childVO = new ChildVO();
+ List<ChildVO> childVOList = new ArrayList<>();
+ childVO.setItemCode("PWD_PW");
+ childVO.setItemType("3");
+ childVO.setItemText("Pack閲嶉噺鍊�");
+ childVO.setItemValue(daParamCollection.getWeightValue());
+ childVO.setCheckTime(format.format(new Date()));
+ childVO.setCheckResult("1");
+ childVOList.add(childVO);
+ parentVO.setSiteCode("3983");
+ parentVO.setRecordId(""+timestampMillis);
+ parentVO.setStationCode("OP500");
+ parentVO.setProductNum(daParamCollection.getSfcCode());
+ parentVO.setTotalResult("1");
+ parentVO.setCheckList(childVOList);
+ HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"OP500",format.format(new Date()));
+ System.out.println(execute.body());
+ }
+
}
--
Gitblit v1.9.3