From 054a699a156ca607e95f220b364136d42a19ab0f Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 27 三月 2024 14:40:18 +0800
Subject: [PATCH] -
---
jcdm-main/pom.xml | 6 +++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 3 +
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 2 +
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java | 6 +-
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 31 +++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 26 +++++--------
6 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/jcdm-main/pom.xml b/jcdm-main/pom.xml
index e2a3278..ed541ac 100644
--- a/jcdm-main/pom.xml
+++ b/jcdm-main/pom.xml
@@ -77,6 +77,12 @@
<groupId>com.jcdm</groupId>
<artifactId>jcdm-quartz</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ <version>3.5.13</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
index 45e4bba..9e53aba 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
@@ -66,4 +66,7 @@
void addTighteningParameters(DaParamCollection daParamCollection);
void saveCampaignTimeParameters(DaParamCollection daParamCollection);
+
+ void saveBeachDaParamCollection(List<DaParamCollection> list);
+
}
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 35c193d..7d6755d 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
@@ -13,11 +13,16 @@
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.jcdm.main.plcserver.sub.OPCUaSubscription;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -44,6 +49,9 @@
@Autowired
private DaPassingStationCollectionMapper daPassingStationCollectionMapper;
+ @Resource
+ private SqlSessionFactory sqlSessionFactory;
+
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
*
@@ -66,6 +74,27 @@
public List<DaParamCollection> selectDaParamCollectionList(DaParamCollection daParamCollection)
{
return daParamCollectionMapper.selectDaParamCollectionList(daParamCollection);
+ }
+
+ @Override
+ public void saveBeachDaParamCollection(List<DaParamCollection> list) {
+ // ExecutorType.SIMPLE: 杩欎釜鎵ц鍣ㄧ被鍨嬩笉鍋氱壒娈婄殑浜嬫儏銆傚畠涓烘瘡涓鍙ョ殑鎵ц鍒涘缓涓�涓柊鐨勯澶勭悊璇彞銆�
+ // ExecutorType.REUSE: 杩欎釜鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ャ��
+ // ExecutorType.BATCH: 杩欎釜鎵ц鍣ㄤ細鎵归噺鎵ц鎵�鏈夋洿鏂拌鍙�,濡傛灉 SELECT 鍦ㄥ畠浠腑闂存墽琛岃繕浼氭爣瀹氬畠浠槸 蹇呴』鐨�,鏉ヤ繚璇佷竴涓畝鍗曞苟鏄撲簬鐞嗚В鐨勮涓恒��
+
+ // 鍏抽棴session鐨勮嚜鍔ㄦ彁浜�
+ SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
+ try {
+ DaParamCollectionMapper userMapper = sqlSession.getMapper(DaParamCollectionMapper.class);
+ list.stream().forEach(DaParamCollection -> userMapper.insertDaParamCollection(DaParamCollection));
+ // 鎻愪氦鏁版嵁
+ sqlSession.commit();
+ sqlSession.rollback();
+ } catch (Exception e) {
+ sqlSession.rollback();
+ } finally {
+ sqlSession.close();
+ }
}
/**
@@ -197,6 +226,8 @@
daPassingStationCollections.get(0).setOutboundTime(new Date());
int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+ OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode());
+
//缁檕pc鍙�21
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
} catch (Exception e) {
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java
index 4a643a1..cbf9b0a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java
@@ -52,7 +52,7 @@
/** 浠诲姟ID */
- private String planTaskId;
+ private Long planTaskId;
public void setId(Long id)
{
@@ -135,12 +135,12 @@
{
return results;
}
- public void setPlanTaskId(String planTaskId)
+ public void setPlanTaskId(Long planTaskId)
{
this.planTaskId = planTaskId;
}
- public String getPlanTaskId()
+ public Long getPlanTaskId()
{
return planTaskId;
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index f178415..c4683f6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -24,7 +24,7 @@
public class OPCUaSubscription implements SubscriptionCallback {
//鑷姩宸ヤ綅
- public List<String> automaticList = Arrays.asList("OP230","OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
+ public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
public static MiloService miloService;
@@ -32,9 +32,9 @@
public IDaPassingStationCollectionService daPassingStationCollectionService;
- public IDaCollectionParamConfService collectionParamConfService;
+ public static IDaCollectionParamConfService collectionParamConfService;
- public IDaParamCollectionService daParamCollectionService;
+ public static IDaParamCollectionService daParamCollectionService;
public OPCUaSubscription(MiloService miloService,
IDaPassingStationCollectionService daPassingStationCollectionService,
@@ -110,15 +110,6 @@
//淇濆瓨鎷х揣鏁版嵁
else if (("AngleResult").equals(tab)) {
if("1".equals(tabVlaue)||"2".equals(tabVlaue)){
-// String Torque = thoroughfare + "." + device + ".Torque";
-// String Angle = thoroughfare + "." + device + ".Angle";
-// String Result = thoroughfare + "." + device + ".Result";
-// String Result1 = thoroughfare + "." + device + ".Result1";
-// List<String> list = new ArrayList();
-// list.add(Torque);
-// list.add(Angle);
-// list.add(Result);
-// list.add(Result1);
List<String> list = new ArrayList<>();
String[] suffixes = {"Torque", "Angle", "Result", "Result1"};
@@ -167,7 +158,7 @@
//2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
saveStationInfo(PACKCodeParam,thoroughfare,device);
//3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
- SaveParamData(PACKCodeParam,thoroughfare,device);
+ SaveParamData(PACKCodeParam,thoroughfare,device,"","");
result = "21";
@@ -198,7 +189,7 @@
daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
}
- public void SaveParamData(String packCode,String thoroughfare,String device) throws Exception {
+ public static void SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception {
List<DaCollectionParamConf> list;
DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
daCollectionParamConf.setGatherAddress(thoroughfare+ "." + device);
@@ -227,10 +218,13 @@
//ParamCollection.setState("鍚堟牸");
ParamCollection.setType(list.get(i).getCollectParameterType());
ParamCollection.setCollectionTime(new Date());
- daParamCollectionService.insertDaParamCollection(ParamCollection);
+ ParamCollection.setWorkOrderNo(workOrderNo);
+ ParamCollection.setProductCode(productType);
+ daParamCollectionlist.add(ParamCollection);
+// daParamCollectionService.insertDaParamCollection(ParamCollection);
}
}
- // daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
+ daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
}
}
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 94e4f63..baaef08 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -494,6 +494,7 @@
// this.formulaChildList = []
this.formulaChildParams.productCode = this.workpieceInformation.productCode
this.formulaChildParams.processesCode = this.headContent.processesCode
+ console.log(this.formulaChildParams)
listFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
});
@@ -601,6 +602,7 @@
productBarcode: self.headContent.sfcCode,
}
saveCampaignTimeParameters(param).then(response => {});
+ self.cakeLamp.release = 1;
} else if (event.data.includes("[")) {
let formulaChilds = "";
--
Gitblit v1.9.3