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/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 109 ++++--------------------------------------------------
1 files changed, 9 insertions(+), 100 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index 9d87042..4048bb8 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -87,32 +87,25 @@
@Qualifier("s7SerializerMBTwo")
private S7Serializer s7SerializerMBTwo;
- // @Value("${mes.threshold}")
+
private int threshold;
- // @Value("${mes.cellLength}")
+
private int cellLength;
- // @Value("${mes.ratio}")
+
private int ratio;
- // @Value("${mes.min.one.firstLength}")
private int minOneFirstLength;
- //
-// @Value("${mes.min.one.secondLength}")
+
private int minOneSecondLength;
- //
-// @Value("${mes.min.two.firstLength}")
+
private int minTwoFirstLength;
- //
-// @Value("${mes.min.two.secondLength}")
+
private int minTwoSecondLength;
- //
-// @Value("${mes.max.firstLength}")
+
private int maxTwoFirstLength;
- //
-// @Value("${mes.max.secondLength}")
+
private int maxTwoSecondLength;
- //
-// @Value("${mes.maxThickness}")
+
private int maxThickness;
private String glassInIdOne = "";
@@ -126,13 +119,10 @@
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
log.info("涓�绾垮崸鐞�: {}", s7DataWLOne);
//鑾峰彇绗簩鏉＄嚎璺殑鍗у紡鐞嗙墖绗肩姸鎬�
-// ReadWriteEntity twoInkageEntity = miloService.readFromOpcUa("WL2.WL2.deviceState");
Boolean twoInkageEntity = s7DataWLTwo.getDeviceState();
-// Boolean twoInkageEntity = Boolean.FALSE;
//榛樿鍙窇涓�鍙板崸寮忕悊鐗�,涓ゆ潯绾胯矾閮藉彲浠ヨ蛋
int cellFlag = 1;
//濡傛灉涓ゆ潯绾块兘鍚姩鍒欏彧鑳借窇涓�鏉＄嚎
-// if (twoInkageEntity != null && !Boolean.parseBoolean(twoInkageEntity.getValue() + "")) {
if (twoInkageEntity != null && !twoInkageEntity) {
cellFlag = 2;
}
@@ -144,17 +134,14 @@
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
log.info("浜岀嚎鍗х悊: {}", s7DataWLTwo);
-// ReadWriteEntity oneInkageEntity = miloService.readFromOpcUa("WL1.WL1.deviceState");
Boolean oneInkageEntity = s7DataWLOne.getDeviceState();
int cellFlag = 1;
-// if (oneInkageEntity != null && !Boolean.parseBoolean(oneInkageEntity.getValue() + "")) {
if (oneInkageEntity != null && !oneInkageEntity) {
cellFlag = 2;
}
startOneOpcTaskChild(s7DataWLTwo, 2, cellFlag);
}
- // private void startOneOpcTaskChild(String tableName, int device, int cellFlag) throws Exception {
private void startOneOpcTaskChild(S7DataWL task, int device, int cellFlag) throws Exception {
threshold = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_THRESHOLD);
cellLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_CELL_LENGTH);
@@ -167,7 +154,6 @@
maxTwoSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_SECOND_LENGTH);
maxThickness = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_THICKNESS);
-// EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName);
if (task == null) {
log.info("浠诲姟琛ㄥ熀纭�鏁版嵁褰曞叆澶辫触锛岃妫�鏌ユ暟鎹槸鍚﹀綍鍏ユ垚鍔�");
@@ -200,8 +186,6 @@
} else if (request == 4) {
log.info("璁惧锛歿}鐘舵�侊細{}", device, request);
log.info("灏嗗惎鍔ㄥ瓙鏀逛负4");
-// task.setTaskRunning(Const.GLASS_CACHE_TYPE_RUNNING);
-// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
if (device == 2) {
task.setTaskRunning(Const.GLASS_CACHE_TYPE_RUNNING);
s7SerializerWLTwo.write(S7DataWL.builder().taskRunning(Const.GLASS_CACHE_TYPE_RUNNING).build());
@@ -217,22 +201,12 @@
log.info("鐜荤拑寮傚父澶勭悊");
damageTask(task, "", device);
}
-// } catch(Exception e)
-//
-// {
-// log.info("鎵ц浠诲姟杩囩▼涓彂鐢熷紓甯革紝浠诲姟瀛梴}锛寋}", task.getTaskState(), e.getMessage());
-// log.info("灏嗗惎鍔ㄥ瓧鏀逛负0");
-// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
-// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
-// }
}
@Scheduled(fixedDelay = 1000)
public void edgOneOpcTask() throws Exception {
-// EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_ONE_TASK);
-// String glassId = task.getGlassId();
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
String glassId = s7DataWLOne.getGlassId();
log.info("1鍙风嚎鐜荤拑id{},鍘嗗彶id{}", glassId, glassIdOne);
@@ -245,11 +219,7 @@
@Scheduled(fixedDelay = 1000)
public void edgTwoOpcTask() throws Exception {
-// EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_TWO_TASK);
-// String glassId = task.getGlassId();
S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
-// S7DataMB s7DataMB = s7SerializerMBOne.read(S7DataMB.class);
-// log.info("纾ㄨ竟鏁版嵁{}", s7DataMB);
String glassId = s7DataWLTwo.getGlassId();
log.info("2鍙风嚎鐜荤拑id{},鍘嗗彶id{}", glassId, glassIdTwo);
if (StringUtils.isBlank(glassId) || glassId.equals(glassIdTwo)) {
@@ -267,16 +237,6 @@
return;
}
String toEndingId = glassInfo.getTemperingLayoutId() + "" + glassInfo.getTemperingFeedSequence();
-// List<ReadWriteEntity> list = new ArrayList<>();
-//// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".mesControl", true));
-// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".glassId", Integer.parseInt(toEndingId)));
-// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".toEdingId", Integer.parseInt(toEndingId)));
-// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".width", (int) Math.max(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
-// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".height", (int) Math.min(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
-//
-// miloService.writeToOpcUa(list);
-// miloService.writeToOpcWord(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".thickness", (int) glassInfo.getThickness() * ratio));
-
S7DataMB s7DataMB = new S7DataMB();
s7DataMB.setToEdingId(Integer.parseInt(toEndingId));
s7DataMB.setGlassId(Integer.parseInt(toEndingId));
@@ -342,7 +302,6 @@
log.info("缁撴潫杩涚墖浠诲姟璁惧涓簕}锛岀粨鏉熸椂闂翠负锛歿}锛屽叡鑰楁椂锛歿}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
return Boolean.FALSE;
}
-// EdgStorageCage edgStorageCage = edgStorageCageService.selectNearestEmpty(task.getCurrentCell(), deviceId, Boolean.FALSE);
EdgStorageCage edgStorageCage = edgStorageCageService.selectNearestEmpty(Integer.parseInt(task.getCurrentCell().toString()), deviceId, Boolean.FALSE);
Assert.isTrue(null != edgStorageCage, "鏍煎瓙宸叉弧");
log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
@@ -354,9 +313,6 @@
edgStorageCageDetailsService.save(details);
//鏇存柊浠诲姟淇℃伅
-// task.setStartCell(edgStorageCage.getSlot());
-// task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN);
-// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
task.setStartCell(edgStorageCage.getSlot());
task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN);
if (deviceId == 1) {
@@ -385,9 +341,6 @@
private boolean outTask(S7DataWL task, String tableName, int deviceId, int cellFlag) throws Exception {
Date startDate = new Date();
//鑾峰彇瀵瑰簲鐨勮澶囩姸鎬佷俊鎭�
-// ReadWriteEntity oneOutStateEntity = miloService.readFromOpcUa("WL1.WL1.slotState");
-// ReadWriteEntity twoOutStateEntity = miloService.readFromOpcUa("WL2.WL2.slotState");
-// ReadWriteEntity d06OutStateEntity = miloService.readFromOpcUa("WL2.WL2.d06SlotState");
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
@@ -395,32 +348,11 @@
Integer twoOutState = s7DataWLTwo.getSlotState();
Integer d06OutState = s7DataWLExtraTwo.getD06SlotState();
//鐘舵�佹湁3涓儏鍐碉細0绌洪棽 1蹇欑 2绂佺敤
-// int oneOutState = Const.OUT_DISABLE;
-// int twoOutState = Const.OUT_DISABLE;
-// int d06OutState = Const.OUT_DISABLE;
-// if (null != oneOutStateEntity && null != oneOutStateEntity.getValue()) {
-// oneOutState = oneOutStateEntity.getValue().toString();
-// }
-// if (null != oneOutStateEntity) {
-// oneOutState = oneOutStateEntity.toString();
-// }
-// if (null != twoOutStateEntity && null != twoOutStateEntity.getValue()) {
-// twoOutState = twoOutStateEntity.getValue().toString();
-// }
-// if (null != twoOutStateEntity) {
-// twoOutState = twoOutStateEntity.toString();
-// }
//涓ゆ潯绾块兘涓虹鐢ㄥ垯涓嶅嚭鐜荤拑
if (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState)) {
log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
return Boolean.FALSE;
}
-// if (null != d06OutStateEntity && null != d06OutStateEntity.getValue()) {
-// d06OutState = d06OutStateEntity.getValue().toString();
-// }
-// if (null != d06OutStateEntity) {
-// d06OutState = d06OutStateEntity.toString();
-// }
//鑾峰彇d06鐗囧彴鐘舵��
// 1:涓�瀵逛竴鐨勬儏鍐典笅涓嶉渶瑕佸垽鏂璬06鐘舵��
// 2:涓�鍙风嚎涓�瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦簩鍙风嚎纾ㄨ竟鍓嶇墖鍙癉07鐨勭姸鎬侊紝D07闈炵鐢ㄦ椂锛屼簩鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
@@ -428,16 +360,10 @@
if (cellFlag == 2) {
if (deviceId == 1) {
-// twoOutState = Const.OUT_DISABLE.equals(twoOutState) ? Const.OUT_DISABLE : d06OutState;
twoOutState = twoOutState & d06OutState;
} else {
oneOutState = oneOutState & d06OutState;
-// oneOutState = Const.OUT_DISABLE.equals(oneOutState) ? Const.OUT_DISABLE : d06OutState;
}
-// if (Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) {
-// log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
-// return Boolean.FALSE;
-// }
}
log.info("寮�濮嬫墽琛屽嚭鐗�/鐩撮�氫换鍔★紝浠诲姟淇℃伅涓猴細{},琛ㄥ悕涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{},涓�鍙风嚎鐘舵�侊細{}锛屼簩鍙风嚎鐘舵�侊細{}",
@@ -655,10 +581,6 @@
}
Date startDate = new Date();
log.info("寮�濮嬫墽琛屽畬鎴愪换鍔″悗娓呴櫎鍔ㄤ綔锛屼换鍔′俊鎭负锛歿},琛ㄥ悕涓猴細{},寮�濮嬫椂闂达細{}", task, tableName, startDate);
-// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
-// task.setGlassIdOut("");
-// task.setStartCell(0);
-// task.setEndCell(0);
EdgStorageDeviceTaskHistory taskHistory = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
.eq(EdgStorageDeviceTaskHistory::getDeviceId, device)
@@ -676,12 +598,6 @@
);
}
//鏈�鍚庢洿鏂颁换鍔★紝淇濊瘉浠诲姟鍓嶇殑鍔ㄤ綔閮藉仛瀹�
-
-// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
-// task.setGlassIdOut("");
-// task.setStartCell(0);
-// task.setEndCell(0);
-// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
if (device == 1) {
s7SerializerWLOne.write(
S7DataWL.builder()
@@ -741,12 +657,6 @@
.set(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_FAILURE)
);
}
- //鏈�鍚庢洿鏂颁换鍔★紝淇濊瘉浠诲姟鍓嶇殑鍔ㄤ綔閮藉仛瀹�
-// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
-// task.setGlassIdOut("");
-// task.setStartCell(0);
-// task.setEndCell(0);
-// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
if (device == 1) {
s7SerializerWLOne.write(
S7DataWL.builder()
@@ -780,7 +690,6 @@
*/
public String queryAndChangeGlass(String glassId) {
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
-// .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1"));
Assert.isFalse(null == glassInfo, "鐜荤拑淇℃伅涓嶅瓨鍦�"); //鎸夌収鐜荤拑灏哄
LambdaQueryWrapper<GlassInfo> queryWrapper = new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getWidth, glassInfo.getWidth())
--
Gitblit v1.8.0