From cf6bff3922bbd0624b98834f6ea85c8e619e564f Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 16 一月 2024 12:45:46 +0800
Subject: [PATCH] 修改数据采集
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java | 153 +++++---------------------------------------------
1 files changed, 16 insertions(+), 137 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java
index 2a2f230..bdf0b17 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java
@@ -10,6 +10,8 @@
import cn.stylefeng.guns.modular.em.equipmentStatus.service.EquipmentStatusService;
import cn.stylefeng.guns.modular.gm.greaseManage.service.GreaseManageService;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.service.ProductionOrdeInfoService;
+import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.service.ProductionOrderBatchInfoService;
+import cn.stylefeng.guns.modular.om.productionOrderRecords.service.ProductionOrderRecordsService;
import cn.stylefeng.guns.modular.sc.repairManageInfo.service.RepairManageInfoService;
import cn.stylefeng.guns.modular.sc.serialNumbersConf.service.SerialNumbersConfService;
import cn.stylefeng.guns.plcserver.server.BOP010.callback.*;
@@ -106,6 +108,12 @@
public LocationInfoService locationInfoService;
@Autowired
public GreaseManageService greaseManageService;
+
+ @Autowired
+ public ProductionOrderRecordsService productionOrderRecordsService;
+
+ @Autowired
+ public ProductionOrderBatchInfoService productionOrderBatchInfoService;
//OP010
private Item OP010_F_HEART_BEAT;//蹇冭烦
@@ -727,7 +735,9 @@
EquipmentInfoService equipmentInfoService,
RepairManageInfoService repairManageInfoService,
LocationInfoService locationInfoService,
- GreaseManageService greaseManageService
+ GreaseManageService greaseManageService,
+ ProductionOrderRecordsService productionOrderRecordsService,
+ ProductionOrderBatchInfoService productionOrderBatchInfoService
) throws Exception {
this.productionOrdeInfoService = productionOrdeInfoService;
this.passingStationCollectionService = passingStationCollectionService;
@@ -741,6 +751,8 @@
this.repairManageInfoService = repairManageInfoService;
this.locationInfoService = locationInfoService;
this.greaseManageService = greaseManageService;
+ this.productionOrderRecordsService = productionOrderRecordsService;
+ this.productionOrderBatchInfoService = productionOrderBatchInfoService;
// 鍔犺浇閰嶇疆鏂囦欢
final ConnectionInformation ci = getCLSIDConnectionInfomation();
@@ -753,140 +765,7 @@
logger.info("This is {} message.", "OPCserver connect success");
this.server = server;
// 鍚屾璇诲彇锛�500ms涓�娆�
- final AccessBase access = new SyncAccess(server, 1000);
-
- //final AccessBase access = new Async20Access(server, 1000,false);
-
- //OP010鍥炶皟
- access.addItem(OPCElement.OP010_F_HEART_BEAT, new DataCallBack_OP010_F_HEART_BEAT());//蹇冭烦
- /* access.addItem(OPCElement.OP010_E_STATE, new DataCallBack_OP010_E_STATE());//璁惧鐘舵��*/
-
- //OP020鍥炶皟
- access.addItem(OPCElement.OP020_F_HEART_BEAT, new DataCallBack_OP020_F_HEART_BEAT());//蹇冭烦
-
-
- //OP030鍥炶皟
- access.addItem(OPCElement.OP030_F_HEART_BEAT, new DataCallBack_OP030_F_HEART_BEAT());//蹇冭烦
-
- //OP040鍥炶皟
- access.addItem(OPCElement.OP040_F_HEART_BEAT, new DataCallBack_OP040_F_HEART_BEAT());//蹇冭烦
-
- //OP050鍥炶皟
- access.addItem(OPCElement.OP050_F_HEART_BEAT, new DataCallBack_OP050_F_HEART_BEAT());//蹇冭烦
-
-
- //OP070鍥炶皟
- access.addItem(OPCElement.OP070_F_HEART_BEAT, new DataCallBack_OP070_F_HEART_BEAT());//蹇冭烦
-
- //OP080鍥炶皟
- access.addItem(OPCElement.OP080_F_HEART_BEAT, new DataCallBack_OP080_F_HEART_BEAT());//蹇冭烦
-
- //OP090鍥炶皟
- access.addItem(OPCElement.OP090_F_HEART_BEAT, new DataCallBack_OP090_F_HEART_BEAT());//蹇冭烦
-
- //OP100鍥炶皟
- access.addItem(OPCElement.OP100_F_HEART_BEAT, new DataCallBack_OP100_F_HEART_BEAT());//蹇冭烦
-
- //OP110鍥炶皟
- access.addItem(OPCElement.OP110_F_HEART_BEAT, new DataCallBack_OP110_F_HEART_BEAT());//蹇冭烦
-
-
-/*
- //OP120鍥炶皟
- access.addItem(OPCElement.OP120_F_HEART_BEAT, new DataCallBack_OP120_F_HEART_BEAT());//蹇冭烦
-
- //OP120B鍥炶皟
- access.addItem(OPCElement.OP120B_F_HEART_BEAT, new DataCallBack_OP120B_F_HEART_BEAT());//蹇冭烦
- */
-
-
- //OP130鍥炶皟
- access.addItem(OPCElement.OP130_F_HEART_BEAT, new DataCallBack_OP130_F_HEART_BEAT());//蹇冭烦
-
- //OP130B鍥炶皟
- access.addItem(OPCElement.OP130B_F_HEART_BEAT, new DataCallBack_OP130B_F_HEART_BEAT());//蹇冭烦
-
- //OP140鍥炶皟
- access.addItem(OPCElement.OP140_F_HEART_BEAT, new DataCallBack_OP140_F_HEART_BEAT());//蹇冭烦
-
- //OP150鍥炶皟
-/*
- access.addItem(OPCElement.OP150_F_HEART_BEAT, new DataCallBack_OP150_F_HEART_BEAT());//蹇冭烦
-*/
-
- //OP160鍥炶皟
- access.addItem(OPCElement.OP160_F_HEART_BEAT, new DataCallBack_OP160_F_HEART_BEAT());//蹇冭烦
-
-
- //OP170鍥炶皟
- access.addItem(OPCElement.OP170_F_HEART_BEAT, new DataCallBack_OP170_F_HEART_BEAT());//蹇冭烦
-
- //COP010鍥炶皟
- access.addItem(OPCElement.COP010_F_HEART_BEAT, new DataCallBack_COP010_F_HEART_BEAT());//蹇冭烦
-
- //COP020鍥炶皟
- access.addItem(OPCElement.COP020_F_HEART_BEAT, new DataCallBack_COP020_F_HEART_BEAT());//蹇冭烦
-
- //COP030鍥炶皟
- access.addItem(OPCElement.COP030_F_HEART_BEAT, new DataCallBack_COP030_F_HEART_BEAT());//蹇冭烦
-
- //BOP010鍥炶皟
- access.addItem(OPCElement.BOP010_F_HEART_BEAT, new DataCallBack_BOP010_F_HEART_BEAT());//蹇冭烦
-
- //BOP020鍥炶皟
- access.addItem(OPCElement.BOP020_F_HEART_BEAT, new DataCallBack_BOP020_F_HEART_BEAT());//蹇冭烦
-
- //BOP030鍥炶皟
- access.addItem(OPCElement.BOP030_F_HEART_BEAT, new DataCallBack_BOP030_F_HEART_BEAT());//蹇冭烦
-
- //BOP030B鍥炶皟
- access.addItem(OPCElement.BOP030B_F_HEART_BEAT, new DataCallBack_BOP030B_F_HEART_BEAT());//蹇冭烦
-
- //BOP040鍥炶皟
- access.addItem(OPCElement.BOP040_F_HEART_BEAT, new DataCallBack_BOP040_F_HEART_BEAT());//蹇冭烦
-
- //BOP040B鍥炶皟
- access.addItem(OPCElement.BOP040B_F_HEART_BEAT, new DataCallBack_BOP040B_F_HEART_BEAT());//蹇冭烦
-
- //DOP010鍥炶皟
- access.addItem(OPCElement.DOP010_F_HEART_BEAT, new DataCallBack_DOP010_F_HEART_BEAT());//蹇冭烦
-
- //DOP020鍥炶皟
- /* access.addItem(OPCElement.DOP020_F_HEART_BEAT, new DataCallBack_DOP020_F_HEART_BEAT());//蹇冭烦*/
-
- //EOP010鍥炶皟
- access.addItem(OPCElement.EOP010_F_HEART_BEAT, new DataCallBack_EOP010_F_HEART_BEAT());//蹇冭烦
-
- //EOP020鍥炶皟
- access.addItem(OPCElement.EOP020_F_HEART_BEAT, new DataCallBack_EOP020_F_HEART_BEAT());//蹇冭烦
-
- //EOP030鍥炶皟
- access.addItem(OPCElement.EOP030_F_HEART_BEAT, new DataCallBack_EOP030_F_HEART_BEAT());//蹇冭烦
-
- //EOP040鍥炶皟
- access.addItem(OPCElement.EOP040_F_HEART_BEAT, new DataCallBack_EOP040_F_HEART_BEAT());//蹇冭烦
-
- //EOP050鍥炶皟
- access.addItem(OPCElement.EOP050_F_HEART_BEAT, new DataCallBack_EOP050_F_HEART_BEAT());//蹇冭烦
-
- //EOP060鍥炶皟
- access.addItem(OPCElement.EOP060_F_HEART_BEAT, new DataCallBack_EOP060_F_HEART_BEAT());//蹇冭烦
-
- //EOP070鍥炶皟
- access.addItem(OPCElement.EOP070_F_HEART_BEAT, new DataCallBack_EOP070_F_HEART_BEAT());//蹇冭烦
-
- //EOP070B鍥炶皟
- /*access.addItem(OPCElement.EOP070B_F_HEART_BEAT, new DataCallBack_EOP070B_F_HEART_BEAT());//蹇冭烦*/
-
- //EOP080鍥炶皟
- access.addItem(OPCElement.EOP080_F_HEART_BEAT, new DataCallBack_EOP080_F_HEART_BEAT());//蹇冭烦
-
- //EOP090鍥炶皟
- access.addItem(OPCElement.EOP090_F_HEART_BEAT, new DataCallBack_EOP090_F_HEART_BEAT());//蹇冭烦
-
-
- //EOP090B鍥炶皟
- access.addItem(OPCElement.EOP090B_F_HEART_BEAT, new DataCallBack_EOP090B_F_HEART_BEAT());//蹇冭烦
+ final AccessBase access = new SyncAccess(server, 500);
//OP010缁�
final Group OP010_GROUP = server.addGroup("OP010");
@@ -1047,7 +926,7 @@
OP110_S_PRODUCT_STATE_CODE = OP110_GROUP.addItem((OPCElement.OP110_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�
//OP120缁�
- /* final Group OP120_GROUP = server.addGroup("OP120");
+ final Group OP120_GROUP = server.addGroup("OP120");
OP120_F_HEART_BEAT = OP120_GROUP.addItem((OPCElement.OP120_F_HEART_BEAT));//蹇冭烦
OP120_J_PLC_START = OP120_GROUP.addItem((OPCElement.OP120_J_PLC_START));//PLC寮�濮�
OP120_J_PC_WRITE_ORDER = OP120_GROUP.addItem((OPCElement.OP120_J_PC_WRITE_ORDER));//PC璇绘暟鎹畬鎴�
@@ -1072,7 +951,7 @@
OP120B_S_PRODUCT_CODE = OP120B_GROUP.addItem((OPCElement.OP120B_S_PRODUCT_CODE));//浜у搧缂栧彿
OP120B_S_SFC_CODE = OP120B_GROUP.addItem((OPCElement.OP120B_S_SFC_CODE));//鎬绘垚缂栫爜
- OP120B_S_PRODUCT_STATE_CODE = OP120B_GROUP.addItem((OPCElement.OP120B_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�*/
+ OP120B_S_PRODUCT_STATE_CODE = OP120B_GROUP.addItem((OPCElement.OP120B_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�
//OP130缁�
final Group OP130_GROUP = server.addGroup("OP130");
--
Gitblit v1.9.3