From a6720987358933753d9b90acda9103003cfb37ee Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 13 六月 2025 17:09:57 +0800
Subject: [PATCH] 更新通讯依赖版本为1.5.4，中空大理片，钢化大理片S7，modbus测试完成代码提交
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 67 insertions(+), 26 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
index f684f6c..58519fe 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
@@ -1,5 +1,6 @@
package com.mes.job;
+import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.hollow.entity.vo.HollowGlassFormulaVO;
@@ -7,6 +8,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -28,6 +30,16 @@
@Autowired(required = false)
MiloService miloService;
+ @Autowired
+ @Qualifier("CMJ1ModbusTcp")
+ ModbusTcp CMJ1ModbusTcp;
+
+ @Autowired
+ @Qualifier("CMJ2ModbusTcp")
+ ModbusTcp CMJ2ModbusTcp;
+
+ private Integer offset = 40001;
+
/**
* 鏀跺埌闄よ啘鏈鸿姹傚強鐜荤拑id
*
@@ -44,25 +56,36 @@
}
private void hollowRemoveChildTask(String cell) throws Exception {
- ReadWriteEntity requestEntity = miloService.readFromOpcUa(cell + "mesControl");
- if ("0".equals(requestEntity.getValue() + "")) {
+ ModbusTcp modbusTcp = null;
+ if ("CMJ1.CMJ1.".equals(cell)) {
+ modbusTcp = CMJ1ModbusTcp;
+ } else {
+ modbusTcp = CMJ2ModbusTcp;
+ }
+ Integer requestEntity = modbusTcp.readUInt16(42001 - offset);
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa(cell + "mesControl");
+// if ("0".equals(requestEntity.getValue() + "")) {
+ if (0 == requestEntity) {
log.info("褰撳墠闄よ啘鏈轰负鍗曟満鐘舵��");
return;
}
- int request = Integer.parseInt(requestEntity.getValue() + "");
+// int request = Integer.parseInt(requestEntity.getValue() + "");
+ int request = requestEntity;
int flagRequest = request & 3;
if (flagRequest != 3) {
log.info("褰撳墠鏈敹鍒拌姹傜幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
}
- ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId");
- if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) {
+ String glassIdEntity = modbusTcp.readString(42003 - offset, 20);
+ if (null == glassIdEntity || StringUtils.isBlank(glassIdEntity)) {
+// ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId");
+// if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) {
log.info("褰撳墠鏈敹鍒扮幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
}
- log.info("褰撳墠闇�瑕侀櫎鑶滅殑鐜荤拑id涓猴細{}", glassIdEntity.getValue() + "");
+ log.info("褰撳墠闇�瑕侀櫎鑶滅殑鐜荤拑id涓猴細{}", glassIdEntity);
//鎸夌収鐜荤拑id鑾峰彇瀵瑰簲鐨勪换鍔d
- HollowGlassFormulaVO detailsVO = hollowFormulaDetailsService.queryFormulaDetailsByGlassId(glassIdEntity.getValue() + "", null, null);
+ HollowGlassFormulaVO detailsVO = hollowFormulaDetailsService.queryFormulaDetailsByGlassId(glassIdEntity, null, null);
if (null == detailsVO) {
log.info("鐜荤拑id涓嶅瓨鍦紝璇锋鏌ユ暟鎹�");
return;
@@ -71,27 +94,37 @@
List<ReadWriteEntity> ualist = new ArrayList<>();
List<ReadWriteEntity> wordlist = new ArrayList<>();
-
+ int Id = 0;
if (detailsVO.getFilmRemove() == 0) {
// 10111011
int sendId = request & 63;
- sendId = sendId + 4;
- wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+ Id = sendId + 4;
+// wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+ modbusTcp.writeUInt16(42001 - offset, sendId);
} else {
// 鍏堝皢瀵瑰簲鐨勪綅缃负0锛岃幏寰楄姹傜殑鐜荤拑鏁版嵁锛� 鐒跺悗灏嗗搴斾綅鍊� 110111011
int sendId = request & 63;
- sendId = sendId + 4 + 64;
- wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
- ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove()));
- ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove()));
- ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove()));
- ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove()));
+ Id = sendId + 4 + 64;
+
+ modbusTcp.writeUInt32(42019 - offset, detailsVO.getTopRemove());
+ modbusTcp.writeUInt32(42021 - offset, detailsVO.getTopRemove());
+ modbusTcp.writeUInt32(42023 - offset, detailsVO.getTopRemove());
+ modbusTcp.writeUInt32(42025 - offset, detailsVO.getTopRemove());
+// wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove()));
+// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove()));
+// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove()));
+// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove()));
}
- ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", (int) (detailsVO.getThickness() * 10)));
- ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
- ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
- miloService.writeToOpcWord(wordlist);
- miloService.writeToOpcUa(ualist);
+ modbusTcp.writeUInt32(42013 - offset, (int) (detailsVO.getThickness() * 10));
+ modbusTcp.writeUInt32(42015 - offset, (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10);
+ modbusTcp.writeUInt32(42017 - offset, (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10);
+ modbusTcp.writeUInt16(42001 - offset, Id);
+// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", (int) (detailsVO.getThickness() * 10)));
+// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
+// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
+// miloService.writeToOpcWord(wordlist);
+// miloService.writeToOpcUa(ualist);
return;
}
@@ -111,8 +144,15 @@
}
public void finishHollowRemoveChildTask(String cell) throws Exception {
- ReadWriteEntity requestEntity = miloService.readFromOpcUa(cell + "mesControl");
- int request = Integer.parseInt(requestEntity.getValue() + "");
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa(cell + "mesControl");
+ ModbusTcp modbusTcp = null;
+ if ("CMJ1.CMJ1.".equals(cell)) {
+ modbusTcp = CMJ1ModbusTcp;
+ } else {
+ modbusTcp = CMJ2ModbusTcp;
+ }
+ int requestEntity = modbusTcp.readUInt16(42001 - offset);
+ int request = requestEntity;
int flagRequest = request & 9;
if (flagRequest != 9) {
log.info("褰撳墠鏈敹鍒伴櫎鑶滄満ID鎺ユ敹瀹屾垚淇″彿锛岀粨鏉熶换鍔�");
@@ -120,9 +160,10 @@
}
//鍚戠數姘斿彂閫佹竻妤氫俊鍙�
int sendId = request & 251;
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
- miloService.writeToOpcWord(list);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+// miloService.writeToOpcWord(list);
+ modbusTcp.writeUInt16(42001 - offset, sendId);
}
}
\ No newline at end of file
--
Gitblit v1.8.0