From 2cef83c808955a2ebbd0a047f73c81261a40ec51 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 15 三月 2025 16:59:14 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 3 +--
billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java | 10 +++-------
billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java | 2 +-
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 4 +---
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java
index f78762a..be64195 100644
--- a/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java
@@ -1,11 +1,7 @@
package com.billion.main.da.service.impl;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.billion.common.utils.http.HttpUtils;
import com.billion.main.da.domain.DaStationCollection;
-import com.billion.main.da.domain.EngineData;
import com.billion.main.da.mapper.DaStationCollectionMapper;
import com.billion.main.da.service.IDaStationCollectionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,9 +54,9 @@
@Override
public int insertDaStationCollection(DaStationCollection daStationCollection)
{
- EngineData engineData = new EngineData();
- engineData.setEngineType("1");
- String s = HttpUtils.sendPost("http://172.40.161.71:8080/prod-api/CollectTrack", JSONUtil.toJsonStr(engineData));
+// EngineData engineData = new EngineData();
+// engineData.setEngineType("1");
+// String s = HttpUtils.sendPost("http://172.40.161.71:8080/prod-api/CollectTrack", JSONUtil.toJsonStr(engineData));
return daStationCollectionMapper.insertDaStationCollection(daStationCollection);
}
diff --git a/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java b/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
index 3f2beea..7e772ed 100644
--- a/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
@@ -56,7 +56,7 @@
public int insertOmOrderScheduling(OmOrderScheduling omOrderScheduling)
{
omOrderScheduling.setUpdateTime(DateUtils.getNowDate());
- return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
+ return omOrderSchedulingMapper.insertOmOrderScheduling(omOrderScheduling);
// List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>().eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode()));
// if (CollUtil.isNotEmpty(list)){
// throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
index 42a8e86..2482d7f 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
@@ -99,7 +99,6 @@
Constants.PLC3.add(Constants.OP290_2);
Constants.PLC3.add(Constants.OP295);
Constants.PLC3.add(Constants.OP300);
- Constants.PLC3.add(Constants.OP310);
//PLC4//鎺掓煡涓婁笅绾�
Constants.PLC4.add(Constants.C040);
Constants.PLC4.add(Constants.OP030);
@@ -112,7 +111,7 @@
Constants.ONLINE.add(Constants.OP005);
//涓嬬嚎宸ヤ綅
Constants.OFFLINE.add(Constants.C060);
- Constants.OFFLINE.add(Constants.OP310);
+ Constants.OFFLINE.add(Constants.OP300);
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
index 20c97d0..e5d9d17 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
@@ -186,7 +186,7 @@
updateWrapper.set("head_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
- } else if (Constants.OP310.equals(device)) {
+ } else if (Constants.OP300.equals(device)) {
omOrderScheduling.setRemarks("Body");
omOrderScheduling.setSfcCode(SFCCode.toString());
List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
@@ -221,7 +221,6 @@
updateWrapper.set("pre_status", "2");
omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper);
}
-
sysCountService.updatePreNumber();
omProductionOrderInfoService.updatePreStatus1();
OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder();
@@ -236,7 +235,6 @@
List<DaCollectionParamConf> daCollectionParamConfList1 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf1);
for (DaCollectionParamConf conf : daCollectionParamConfList1) {
String gatherAddress = conf.getGatherAddress();
-
String valueObj = null;
ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress);
if (entity != null) {
--
Gitblit v1.9.3