From 0ce25f34a0d627a5cc0d073d24b8c3e569feac15 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 22 三月 2024 13:11:53 +0800
Subject: [PATCH] add 整合mybatisplus
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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 973d339..35c193d 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
@@ -1,6 +1,7 @@
package com.jcdm.main.da.paramCollection.service.impl;
import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper;
@@ -9,6 +10,11 @@
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.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
+import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.kangaroohy.milo.model.ReadWriteEntity;
+import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,7 +27,7 @@
* @date 2023-12-13
*/
@Service
-public class DaParamCollectionServiceImpl implements IDaParamCollectionService
+public class DaParamCollectionServiceImpl extends ServiceImpl<DaParamCollectionMapper,DaParamCollection> implements IDaParamCollectionService
{
@Autowired
private DaParamCollectionMapper daParamCollectionMapper;
@@ -31,6 +37,12 @@
@Autowired
private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
+
+ @Autowired
+ private MiloService miloService;
+
+ @Autowired
+ private DaPassingStationCollectionMapper daPassingStationCollectionMapper;
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
@@ -127,7 +139,7 @@
saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
saveData.setProductCode(daParamCollection.getProductCode());
saveData.setLocationCode(daParamCollection.getLocationCode());
- saveData.setSfcCode(daParamCollection.getSfcCode());
+ saveData.setSfcCode(daParamCollection.getProductBarcode());
saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
saveData.setCollectionTime(new Date());
@@ -151,4 +163,45 @@
daParamCollectionMapper.insertDaParamCollection(daParamCollection);
}
}
+
+ @Override
+ public void saveCampaignTimeParameters(DaParamCollection daParamCollection) {
+ BsFormulaChildInfo bsFormulaChildInfo = new BsFormulaChildInfo();
+ bsFormulaChildInfo.setProcessesCode(daParamCollection.getLocationCode());
+ bsFormulaChildInfo.setProductCode(daParamCollection.getProductCode());
+ bsFormulaChildInfo.setSpareField4("1");
+ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
+ String result = bsFormulaChildInfos.get(0).getResults();
+ if(result != null && !result.isEmpty()){
+ try {
+ //杩囩珯鍙傛暟閲囬泦璁板綍鍑虹珯鏃堕棿
+ DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+ daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+ daCollectionParamConf.setCollectParameterId("OUTT");
+ 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(DateUtil.formatDateTime(new Date()));
+ daParamCollectionMapper.insertDaParamCollection(saveData);
+
+ //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+ DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+ daPassingStationCollections.get(0).setOutboundTime(new Date());
+ int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+
+ //缁檕pc鍙�21
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
--
Gitblit v1.9.3