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 | 30 +++++++++++++++++------------- 1 files changed, 17 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 a64fe47..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; @@ -206,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); + } } } @@ -360,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); } @@ -372,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>() @@ -423,6 +425,7 @@ 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){ @@ -475,4 +478,5 @@ } } + } -- Gitblit v1.9.3