From a60fef88880990c61fa45072b092150c1ffec437 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 25 五月 2024 10:12:58 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 94 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 81 insertions(+), 13 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 e2162b1..52557f1 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
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.common.utils.StringUtils;
import com.jcdm.main.bs.formula.service.IBsFormulaInfoService;
import com.jcdm.main.bs.formula.service.impl.BsFormulaInfoServiceImpl;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
@@ -18,6 +19,7 @@
import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.mapper.DaCollectionParamConfMapper;
+import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
@@ -33,9 +35,12 @@
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
@@ -71,6 +76,9 @@
@Autowired
private IDaParamCollectionService daParamCollectionService;
+
+ @Autowired
+ private IDaCollectionParamConfService daCollectionParamConfService;
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
@@ -199,17 +207,19 @@
@Override
public void addTighteningParameters(DaParamCollection daParamCollection) {
- String tightenData = daParamCollection.getTightenTheArray();
- tightenData = tightenData.replace("[", "").replace("]", "").replace(" ", "");
- String[] tightenDataParts = tightenData.split(",");
String paramCode = daParamCollection.getParamCode();
- String[] paramCodeParts = paramCode.split(",");
- for (int i = 0; i < paramCodeParts.length; i++) {
- daParamCollection.setParamValue(tightenDataParts[i]);
- daParamCollection.setParamCode(paramCodeParts[i]);
- daParamCollection.setCollectionTime(new Date());
- daParamCollection.setSfcCode(daParamCollection.getProductBarcode());
- daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ String tightenData = daParamCollection.getTightenTheArray();
+ if(StringUtils.isNotBlank(paramCode)&&StringUtils.isNotBlank(tightenData)){
+ tightenData = tightenData.replace("[", "").replace("]", "").replace(" ", "");
+ String[] tightenDataParts = tightenData.split(",");
+ String[] paramCodeParts = paramCode.split(",");
+ for (int i = 0; i < paramCodeParts.length; i++) {
+ daParamCollection.setParamValue(tightenDataParts[i]);
+ daParamCollection.setParamCode(paramCodeParts[i]);
+ daParamCollection.setCollectionTime(new Date());
+ daParamCollection.setSfcCode(daParamCollection.getProductBarcode());
+ daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ }
}
}
@@ -353,10 +363,8 @@
//缁檕pc鍙�21
try {
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
- String strA = daParamCollection.getLocationCode() + "A";
- String strB = daParamCollection.getLocationCode() + "B";
+ String strA = daParamCollection.getLocationCode();
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build());
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -365,6 +373,7 @@
public void sendToFactoryMes(String stationCode,String productNum ){
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";
ParentVO vo =new ParentVO();
List<ChildVO> checkList = new ArrayList<>();
List<DaParamCollection> list = this.list(new LambdaQueryWrapper<DaParamCollection>()
@@ -411,4 +420,63 @@
HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(vo)).execute();
}
+
+ @Override
+ public void pushGeelycvMesFeedback(String packID, String stationCode) {
+ 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";
+ List<DaParamCollection> paramList = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getSfcCode, packID).eq(DaParamCollection::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 (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()));
+ 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.setItemText(paramConfOne.getCollectParameterName());
+ }else {
+ 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();
+ System.out.println(execute.body());
+ System.out.println("-----------------------"+totalResult);
+ }
+
+ }
+
}
--
Gitblit v1.9.3