project-zsy
/
ModBus-rtcp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整采集逻辑

This commit is contained in:
wangshilong 2024-12-20 22:57:24 +08:00
parent 392ccee6ba
commit ee03c86167
3 changed files with 91 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/iot/modbus_rtcp/config/EquipmentIPProperties.java
View File

@ -36,6 +36,8 @@ public class EquipmentIPProperties {
if (gatewayHeartbeat.length() > 100) {
return false;
}
// 解决心跳包中可能存在的空格符和换行符
gatewayHeartbeat = HexUtil.bytesToHexString(StringUtils.trim(new String(HexUtil.hexStringToBytes(gatewayHeartbeat))).getBytes()).toUpperCase();
// 每分钟从数据库入库一次
if (this.lastSyncEquipment.getAcquire() < System.currentTimeMillis() - 60_000) {
this.jdbcTemplate.queryForList("select gateway_sn from device").forEach(map -> {

126
src/main/java/com/iot/modbus_rtcp/jobs/AutoCollectJobs.java
View File

@ -22,6 +22,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @author <a href="mailto:scwsl@foxmail.com">王仕龙</a>
@ -66,10 +67,10 @@ public class AutoCollectJobs {
private final JdbcTemplate jdbcTemplate;
private final ModbusTCPController controller;
private final EquipmentIPProperties equipmentIPProperties;
private final ThreadPoolExecutor collectThreadPool = new ThreadPoolExecutor(Math.min(10, Runtime.getRuntime().availableProcessors())
private final ThreadPoolExecutor collectThreadPool = new ThreadPoolExecutor(Math.min(50, Runtime.getRuntime().availableProcessors())
, Math.min(100, Runtime.getRuntime().availableProcessors()), 60, TimeUnit.SECONDS,
new ArrayBlockingQueue<>(5000), new ThreadFactory() {
AtomicInteger index = new AtomicInteger(1);
final AtomicInteger index = new AtomicInteger(1);
@Override
public Thread newThread(Runnable runnable) {
@ -85,53 +86,86 @@ public class AutoCollectJobs {
int pageIndex = 0;
int pageSize = 1000;
long timestamp = System.currentTimeMillis();
List<Map<String, Object>> resultList = null;
while (Objects.isNull(resultList) || resultList.size() >= pageSize) {
resultList = this.jdbcTemplate.queryForList(SQL + " LIMIT " + (pageIndex++ * pageSize) + ", " + pageSize);
while (true) {
List<Map<String, Object>> resultList = this.jdbcTemplate.queryForList(SQL + " LIMIT " + (pageIndex++ * pageSize) + ", " + pageSize);
if (ObjectUtils.isEmpty(resultList)) {
continue;
break;
}
resultList.stream()
.filter(item -> {
String gatewaySn = StringUtils.trim(MapUtil.getStr(item, "identifier"));
String gatewayIdentifier = this.equipmentIPProperties.put(gatewaySn);
if (Objects.nonNull(ModbusTCPController.nettyServer.getGroup()
.get(gatewayIdentifier))) {
item.put("identifier", gatewayIdentifier);
return true;
}
log.warn("Gateway {} is disconnected and does not collect data", gatewaySn);
return false;
})
.collect(Collectors.groupingBy(item -> StringUtils.trim(MapUtil.getStr(item, "deviceId"))))
.forEach((deviceId, commandList) -> {
Map<String, List<Map<String, Object>>> refTypeCommandListMap = commandList.stream()
.collect(Collectors.groupingBy(item -> MapUtil.getStr(item, "refType")));
List<Map<String, Object>> deviceCommandList = refTypeCommandListMap.get(COMMAND_REF_TYPE_DEVICE);
if (ObjectUtils.isEmpty(deviceCommandList)) {
deviceCommandList = refTypeCommandListMap.get(COMMAND_REF_TYPE_PRODUCT_CODE);
}
if (ObjectUtils.isNotEmpty(deviceCommandList)) {
List<ModbusCommandDto> collectCommondList = deviceCommandList.stream()
.map(item -> {
String identifier = StringUtils.trim(MapUtil.getStr(item, "identifier"));
return ModbusCommandDto.builder()
.command(StringUtils.trim(MapUtil.getStr(item, "command")))
.identifier(identifier)
.length(MapUtil.getInt(item, "messageLength"))
.type(CommandTypeComparable.CommandType.COLLECTION)
.key(StringUtils.joinWith("/", identifier,
StringUtils.trim(MapUtil.getStr(item, "deviceId")),
StringUtils.trim(MapUtil.getStr(item, "commandId")),
timestamp))
.build();
})
.collect(Collectors.toList());
if (ObjectUtils.isNotEmpty(collectCommondList)) {
this.collectThreadPool.execute(() -> this.controller.collect(collectCommondList));
this.collectThreadPool.execute(() -> {
this.controller.collect(resultList.stream()
.filter(item -> {
String gatewaySn = StringUtils.trim(MapUtil.getStr(item, "identifier"));
String gatewayIdentifier = this.equipmentIPProperties.put(gatewaySn);
if (Objects.nonNull(ModbusTCPController.nettyServer.getGroup()
.get(gatewayIdentifier))) {
item.put("identifier", gatewayIdentifier);
return true;
}
}
});
log.warn("Gateway {} is disconnected and does not collect data", gatewaySn);
return false;
})
.collect(Collectors.groupingBy(item -> StringUtils.trim(MapUtil.getStr(item, "deviceId"))))
.entrySet()
.stream()
.flatMap(entry -> {
List<Map<String, Object>> commandList = entry.getValue();
Map<String, List<Map<String, Object>>> refTypeCommandListMap = commandList.stream()
.collect(Collectors.groupingBy(item -> MapUtil.getStr(item, "refType")));
List<Map<String, Object>> deviceCommandList = refTypeCommandListMap.get(COMMAND_REF_TYPE_DEVICE);
if (ObjectUtils.isEmpty(deviceCommandList)) {
deviceCommandList = refTypeCommandListMap.get(COMMAND_REF_TYPE_PRODUCT_CODE);
}
if (ObjectUtils.isNotEmpty(deviceCommandList)) {
return deviceCommandList.stream()
.map(item -> {
String identifier = StringUtils.trim(MapUtil.getStr(item, "identifier"));
return ModbusCommandDto.builder()
.command(StringUtils.trim(MapUtil.getStr(item, "command")))
.identifier(identifier)
.length(MapUtil.getInt(item, "messageLength"))
.type(CommandTypeComparable.CommandType.COLLECTION)
.key(StringUtils.joinWith("/", identifier,
StringUtils.trim(MapUtil.getStr(item, "deviceId")),
StringUtils.trim(MapUtil.getStr(item, "commandId")),
timestamp))
.build();
});
}
return Stream.empty();
})
.collect(Collectors.toList()));
// .forEach((deviceId, commandList) -> {
// Map<String, List<Map<String, Object>>> refTypeCommandListMap = commandList.stream()
// .collect(Collectors.groupingBy(item -> MapUtil.getStr(item, "refType")));
// List<Map<String, Object>> deviceCommandList = refTypeCommandListMap.get(COMMAND_REF_TYPE_DEVICE);
// if (ObjectUtils.isEmpty(deviceCommandList)) {
// deviceCommandList = refTypeCommandListMap.get(COMMAND_REF_TYPE_PRODUCT_CODE);
// }
// if (ObjectUtils.isNotEmpty(deviceCommandList)) {
// List<ModbusCommandDto> collectCommondList = deviceCommandList.stream()
// .map(item -> {
// String identifier = StringUtils.trim(MapUtil.getStr(item, "identifier"));
// return ModbusCommandDto.builder()
// .command(StringUtils.trim(MapUtil.getStr(item, "command")))
// .identifier(identifier)
// .length(MapUtil.getInt(item, "messageLength"))
// .type(CommandTypeComparable.CommandType.COLLECTION)
// .key(StringUtils.joinWith("/", identifier,
// StringUtils.trim(MapUtil.getStr(item, "deviceId")),
// StringUtils.trim(MapUtil.getStr(item, "commandId")),
// timestamp))
// .build();
// })
// .collect(Collectors.toList());
// if (ObjectUtils.isNotEmpty(collectCommondList)) {
// this.collectThreadPool.execute(() -> this.controller.collect(collectCommondList));
// }
// }
// });
});
if (resultList.size() < pageSize) {
break;
}
}
}
}

11
src/main/java/com/iot/modbus_rtcp/netty/SyncPriorityChannel.java
View File

@ -8,6 +8,7 @@ import io.netty.channel.ChannelPromise;
import io.netty.channel.socket.SocketChannel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.amqp.core.QueueBuilder;
import org.springframework.amqp.rabbit.core.RabbitAdmin;
@ -150,8 +151,14 @@ public class SyncPriorityChannel implements Runnable {
}
public void setIdentifier(String identifier) {
this.identifier = identifier;
this.setCollectQueue();
if (StringUtils.isBlank(this.identifier)) {
this.identifier = identifier;
this.setCollectQueue();
} else if (!StringUtils.equals(this.identifier, identifier)) {
throw new RuntimeException("多个设备对应同一心跳包，当前已绑定心跳信息："
+ new String(HexUtil.hexStringToBytes(identifier)) + "[" + identifier + "] --> "
+ this.channel.remoteAddress().getHostString() + ":" + this.channel.remoteAddress().getPort());
}
}
public void setCollectQueue() {