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 | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 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 27bfb2b..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涓氬姟灞傚鐞�
*
@@ -405,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{
@@ -545,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";
--
Gitblit v1.9.3