From 849442e4f63a5fd7ae154ef6bc77c967a82f40b8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 26 六月 2025 08:46:01 +0800
Subject: [PATCH] 删除改S7通讯时注释的原opc代码
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java | 28 ----------------------------
1 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
index 314c23f..96a7d3f 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
@@ -59,14 +59,9 @@
public void requestTemperingTask() throws Exception {
S7DataGHOne s7DataGHOne = s7SerializerGHOne.read(S7DataGHOne.class);
log.info("璇诲彇鍒扮殑GH1S7.GH1S7鏁版嵁锛歿}", s7DataGHOne);
-// ReadWriteEntity requestInTempering = miloService.readFromOpcUa("GH1S7.GH1S7.requestInTempering");//璇锋眰杩涚墖
-// ReadWriteEntity requestTemperingId = miloService.readFromOpcUa("GH1S7.GH1S7.requestTemperingId");//璇锋眰杩涚墖 鐐夊彿ID
-// Integer request = Integer.parseInt(requestInTempering.getValue().toString());
-// Integer id = Integer.parseInt(requestTemperingId.getValue().toString());
Integer request = (int) s7DataGHOne.getRequestInTempering();
Integer id = (int) s7DataGHOne.getRequestTemperingId();
if (request == 0) {
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1S7.GH1S7.responseInTempering", 0));//鍏佽閫佺墖娓呴浂
s7SerializerGHOne.write(
S7DataGHOne.builder().responseInTempering(0).build()
);
@@ -75,17 +70,13 @@
log.info("鐐夊彿涓嶈兘涓�0");
return;
}
-// ReadWriteEntity placedNumber = miloService.readFromOpcUa("GH1S7.GH1S7.placedNumber");//宸叉憜鐗囨暟閲�
String placedNumber = s7DataGHOne.getPlacedNumber().toString();//宸叉憜鐗囨暟閲�
List<TemperingGlassInfo> glassList = temperingAgoService.selectGlassInfoById(id);
-// if (Integer.parseInt(placedNumber.getValue().toString()) == glassList.size()) {
if (Integer.parseInt(placedNumber) == glassList.size()) {
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1S7.GH1S7.responseInTempering", 1));//鍐欏叆鍏佽閫佺墖
s7SerializerGHOne.write(
S7DataGHOne.builder().responseInTempering(1).build()
);
} else {
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1S7.GH1S7.responseInTempering", 2));//涓嶆弧瓒宠繘鐐夋潯浠�
s7SerializerGHOne.write(
S7DataGHOne.builder().responseInTempering(2).build()
);
@@ -104,9 +95,6 @@
log.info("璇诲彇鍒扮殑GH1S7.GH1S7鏁版嵁锛歿}", s7DataGHOne);
Integer loadTemperingId = s7DataGHOne.getLoadTemperingId();//杩涚墖瀹屾垚 鐐夊彿ID
getNewTemperingID(loadTemperingId);//杩涚墖瀹屾垚 涓嬪彂鍙傛暟
-// ReadWriteEntity loadTemperingId = miloService.readFromOpcUa("GH1S7.GH1S7.loadTemperingId");//杩涚墖瀹屾垚 鐐夊彿ID
-// getNewTemperingID(Integer.parseInt(loadTemperingId.getValue().toString()));//杩涚墖瀹屾垚 涓嬪彂鍙傛暟
-// getNewTemperingID(19);
}
/**
@@ -119,9 +107,6 @@
int furanchiIdEntity = tempModbusTcp.readUInt16(40461 - offset);
if (StringUtils.isNotBlank(furanchiIdEntity + "")) {
int temperingid = furanchiIdEntity;
-// ReadWriteEntity furanchiIdEntity = miloService.readFromOpcUa("GH1.GH1.Furanch1Id");//杩涚墖瀹屾垚 鐐夊彿ID
-// if (StringUtils.isNotBlank(furanchiIdEntity.getValue()+"")){
-// int temperingid = Integer.parseInt(furanchiIdEntity.getValue().toString());
temperingAgoService.update(new LambdaUpdateWrapper<TemperingGlassInfo>().set(TemperingGlassInfo::getState, Const.TEMPERING_START)
.in(TemperingGlassInfo::getState, Const.TEMPERING_OUT, Const.TEMPERING_DROP).eq(TemperingGlassInfo::getTemperingLayoutId, temperingid));
}
@@ -133,17 +118,12 @@
private void getNewTemperingID(Integer temperingid) throws Exception {
int autoStatus = tempModbusTcp.readUInt16(40451 - offset);
if (1 != autoStatus) {
-// ReadWriteEntity autoStatus = miloService.readFromOpcUa("GH1.GH1.AutoStatus");
-// if (1 != Integer.parseInt(autoStatus.getValue().toString())) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫閽㈠寲涓嬪彂鍙傛暟浠诲姟");
return;
}
int QandA = tempModbusTcp.readUInt16(40422 - offset);
int RecipeStatus = tempModbusTcp.readUInt16(40456 - offset);
if (1 == QandA && 2 == RecipeStatus) {
-// ReadWriteEntity QandA = miloService.readFromOpcUa("GH1.GH1.QandA");
-// ReadWriteEntity RecipeStatus = miloService.readFromOpcUa("GH1.GH1.RecipeStatus");
-// if (1 == Integer.parseInt(QandA.getValue().toString()) && 2 == Integer.parseInt(RecipeStatus.getValue().toString())) {
log.info("鐗堥潰淇℃伅宸茬粡涓嬪彂锛屽苟涓斿凡缁忓尮閰嶅弬鏁帮紝缁撴潫閽㈠寲涓嬪彂鍙傛暟浠诲姟");
return;
}
@@ -180,14 +160,6 @@
tempModbusTcp.writeUInt16(40415 - offset, workmode);
tempModbusTcp.writeUInt16(40416 - offset, furmode);
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.TemperingId", temperingid));//鍐欏叆鐐夊彿
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.GlassType", glasstype));//鍐欏叆鐜荤拑绫诲瀷
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.Process", process));//鍐欏叆閽㈠寲绫诲瀷 鍏ㄩ挗 鍗婇挗 闃茬伀
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.Thickness", thiness));//鍐欏叆鍘氬害
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.LoadingRate", loadingRate));//鍐欏叆瑁呰浇鐜�
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.Shape", shape));//鍐欏叆澶х墖姣斾緥
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.WorkMode", workmode));//鍐欏叆宸ヤ綅鏁�
-// miloService.writeToOpcUa(generateReadWriteEntity("GH1.GH1.FurnaceMode", furmode));//鍐欏叆鐐変綋宸ヤ綔鏂瑰紡
log.info("鐐夊彿" + temperingid + "鐗堥潰淇℃伅灏濊瘯涓嬪彂");
}
}
--
Gitblit v1.8.0