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

02功能码解析问题

This commit is contained in:
wangshilong 2024-12-10 15:24:38 +08:00
parent db67195702
commit 97aa125468
3 changed files with 59 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java
View File

@ -48,58 +48,58 @@ public class BusinessMessageHandlerListener implements BatchMessageListener {
public void onMessageBatch(List<Message> messages) { public void onMessageBatch(List<Message> messages) {
//读取全部提醒字段的配置 //读取全部提醒字段的配置
List<RemindSetting> settingList = remindService.getAllRemindSetting(); List<RemindSetting> settingList = this.remindService.getAllRemindSetting();
List<RemindRecord> recordList = new ArrayList<>(); List<RemindRecord> recordList = new ArrayList<>();
//将settingList转换为map，key为deviceId，value为List<RemindSetting> //将settingList转换为map，key为deviceId，value为List<RemindSetting>
Map<Long,List<RemindSetting>> deviceRemindSettingMap = new HashMap<>(); Map<Long, List<RemindSetting>> deviceRemindSettingMap = new HashMap<>();
for (RemindSetting setting : settingList) { for (RemindSetting setting : settingList) {
if(deviceRemindSettingMap.containsKey(setting.getDeviceId())){ if (deviceRemindSettingMap.containsKey(setting.getDeviceId())) {
deviceRemindSettingMap.get(setting.getDeviceId()).add(setting); deviceRemindSettingMap.get(setting.getDeviceId()).add(setting);
}else{ } else {
deviceRemindSettingMap.put(setting.getDeviceId(),List.of(setting)); deviceRemindSettingMap.put(setting.getDeviceId(), List.of(setting));
} }
} }
Map<Long,Integer> deviceWellStatusMap = new HashMap<>(); Map<Long, Integer> deviceWellStatusMap = new HashMap<>();
for (Message message : messages) { for (Message message : messages) {
String messageString = new String(message.getBody()); String messageString = new String(message.getBody());
JSONObject messageObject= JSON.parseObject(messageString); JSONObject messageObject = JSON.parseObject(messageString);
if(messageObject.containsKey("old")){ if (messageObject.containsKey("old")) {
JSONObject oldObject = messageObject.getJSONObject("old"); JSONObject oldObject = messageObject.getJSONObject("old");
JSONObject newObject = messageObject.getJSONObject("new"); JSONObject newObject = messageObject.getJSONObject("new");
String deviceId = oldObject.getString("deviceId"); String deviceId = oldObject.getString("deviceId");
if(StringUtils.isEmpty(deviceId)){ if (StringUtils.isEmpty(deviceId)) {
continue; continue;
} }
//根据设备ID获取设备的产品类型 //根据设备ID获取设备的产品类型
DeviceVO device = deviceService.getDevice(Long.valueOf(deviceId)); DeviceVO device = this.deviceService.getDevice(Long.valueOf(deviceId));
//根据对应的产品类型，用对应的气井开关字段获取开关状态(wellStatus,solenoidValveStatus,firstSolenoidStatus) //根据对应的产品类型，用对应的气井开关字段获取开关状态(wellStatus,solenoidValveStatus,firstSolenoidStatus)
String wellStatusKey = getWellStatusKey(device); String wellStatusKey = getWellStatusKey(device);
//比对新旧数据，看开关状态是否一致 //比对新旧数据，看开关状态是否一致
if(!oldObject.getString(wellStatusKey).equals(newObject.getString(wellStatusKey))){ if (oldObject.getString(wellStatusKey) != null && (!oldObject.getString(wellStatusKey).equals(newObject.getString(wellStatusKey)))) {
deviceWellStatusMap.put(Long.valueOf(deviceId),newObject.getInteger(wellStatusKey)); deviceWellStatusMap.put(Long.valueOf(deviceId), newObject.getInteger(wellStatusKey));
} }
//根据ID找到对应的提醒字段配置 //根据ID找到对应的提醒字段配置
if(deviceRemindSettingMap.containsKey(Long.valueOf(deviceId))){ if (deviceRemindSettingMap.containsKey(Long.valueOf(deviceId))) {
List<RemindSetting> remindSettings = deviceRemindSettingMap.get(Long.valueOf(deviceId)); List<RemindSetting> remindSettings = deviceRemindSettingMap.get(Long.valueOf(deviceId));
for (RemindSetting remindSetting : remindSettings) { for (RemindSetting remindSetting : remindSettings) {
//遍历该id下的所有字段的配置，检查新消息中字段的值是否符合提醒条件 //遍历该id下的所有字段的配置，检查新消息中字段的值是否符合提醒条件
//暂时只处理number类型的字段 //暂时只处理number类型的字段
if("number".equals(remindSetting.getFieldType())){ if ("number".equals(remindSetting.getFieldType())) {
BigDecimal newValue = newObject.getBigDecimal(remindSetting.getField()); BigDecimal newValue = newObject.getBigDecimal(remindSetting.getField());
if(newValue != null){ if (newValue != null) {
if(!StringUtils.isEmpty(remindSetting.getMaxValue())){ if (!StringUtils.isEmpty(remindSetting.getMaxValue())) {
if(newValue.compareTo(new BigDecimal(remindSetting.getMaxValue())) > 0){ if (newValue.compareTo(new BigDecimal(remindSetting.getMaxValue())) > 0) {
//如果大于最大值，则保存提醒记录 //如果大于最大值，则保存提醒记录
addRemindRecordToList(remindSetting, deviceId, device, newValue, recordList); this.addRemindRecordToList(remindSetting, deviceId, device, newValue, recordList);
}else if(!StringUtils.isEmpty(remindSetting.getMinValue())){ } else if (!StringUtils.isEmpty(remindSetting.getMinValue())) {
if(newValue.compareTo(new BigDecimal(remindSetting.getMinValue())) < 0){ if (newValue.compareTo(new BigDecimal(remindSetting.getMinValue())) < 0) {
//如果小于最小值，则保存提醒记录 //如果小于最小值，则保存提醒记录
addRemindRecordToList(remindSetting, deviceId, device, newValue, recordList); this.addRemindRecordToList(remindSetting, deviceId, device, newValue, recordList);
} }
} }
} }
@ -111,40 +111,39 @@ public class BusinessMessageHandlerListener implements BatchMessageListener {
} }
} }
} }
//若不一致则记录设备操作日志 //若不一致则记录设备操作日志
if(!deviceWellStatusMap.isEmpty()){ if (!deviceWellStatusMap.isEmpty()) {
for (Map.Entry<Long, Integer> entry : deviceWellStatusMap.entrySet()) { for (Map.Entry<Long, Integer> entry : deviceWellStatusMap.entrySet()) {
this.deviceOptLogService.saveGasWellOptLog(entry.getValue(), entry.getKey(),"device"); this.deviceOptLogService.saveGasWellOptLog(entry.getValue(), entry.getKey(), "device");
} }
} }
//如果提醒数据不为空，批量保存提醒记录 //如果提醒数据不为空，批量保存提醒记录
if(!recordList.isEmpty()){ if (!recordList.isEmpty()) {
this.remindService.saveBatch(recordList); this.remindService.saveBatch(recordList);
} }
} }
private void addRemindRecordToList(RemindSetting remindSetting, String deviceId, DeviceVO device, BigDecimal newValue, List<RemindRecord> recordList) { private void addRemindRecordToList(RemindSetting remindSetting, String deviceId, DeviceVO device, BigDecimal newValue, List<RemindRecord> recordList) {
RemindRecord remindRecord = new RemindRecord(); RemindRecord remindRecord = new RemindRecord();
remindRecord.setId(snowflakeConfig.snowflakeId()); remindRecord.setId(this.snowflakeConfig.snowflakeId());
remindRecord.setDeviceId(Long.valueOf(deviceId)); remindRecord.setDeviceId(Long.valueOf(deviceId));
remindRecord.setGasWell(device.getGasWell().getId()); remindRecord.setGasWell(device.getGasWell().getId());
remindRecord.setContent("【"+ remindSetting.getFieldName()+"】的值达到"+ newValue +"，请及时处理"); remindRecord.setContent("【" + remindSetting.getFieldName() + "】的值达到" + newValue + "，请及时处理");
recordList.add(remindRecord); recordList.add(remindRecord);
} }
private static String getWellStatusKey(DeviceVO device) { private static String getWellStatusKey(DeviceVO device) {
String wellStatusKey = ""; String wellStatusKey = "";
if(PersistenceHandler.KNPCV1_MODBUS_TYPE.equals(device.getDeviceType().getCode())){ if (PersistenceHandler.KNPCV1_MODBUS_TYPE.equals(device.getProduct().getCode())) {
wellStatusKey = "wellStatus"; wellStatusKey = "wellStatus";
} else if(PersistenceHandler.ETC_MODBUS_TYPE.equals(device.getDeviceType().getCode())){ } else if (PersistenceHandler.ETC_MODBUS_TYPE.equals(device.getProduct().getCode())) {
wellStatusKey = "solenoidValveStatus"; wellStatusKey = "solenoidValveStatus";
} else if(PersistenceHandler.SCSS_MODBUS_TYPE.equals(device.getDeviceType().getCode())){ } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equals(device.getProduct().getCode())) {
wellStatusKey = "firstSolenoidStatus"; wellStatusKey = "firstSolenoidStatus";
} }
return wellStatusKey; return wellStatusKey;

2
src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java
View File

@ -41,7 +41,7 @@ public class DynamicRabbitListener implements ApplicationRunner {
this.businessMessageListenerContainer = new SimpleMessageListenerContainer(); this.businessMessageListenerContainer = new SimpleMessageListenerContainer();
this.businessMessageListenerContainer.setConnectionFactory(connectionFactory); this.businessMessageListenerContainer.setConnectionFactory(connectionFactory);
this.businessMessageListenerContainer.setMessageListener(this.businessMessageListener); this.businessMessageListenerContainer.setMessageListener(this.businessMessageListener);
this.businessMessageListenerContainer.start(); // this.businessMessageListenerContainer.start();
} }
@Override @Override

44
src/main/java/com/isu/gaswellwatch/modbus/data/listener/ModbusMessagePersistListener.java
View File

@ -96,36 +96,50 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
RtuMessageResponse response = (RtuMessageResponse) masterParser.parseMessage(byteQueue); RtuMessageResponse response = (RtuMessageResponse) masterParser.parseMessage(byteQueue);
ModbusResponse modbusResponse = response.getModbusResponse(); ModbusResponse modbusResponse = response.getModbusResponse();
short[] values = null; byte[] byteValues = null;
short[] shortValues = null;
switch (modbusResponse.getFunctionCode()) { switch (modbusResponse.getFunctionCode()) {
case FunctionCode.READ_COILS -> { case FunctionCode.READ_COILS -> {
values = ((ReadCoilsResponse) modbusResponse).getShortData(); byteValues = ((ReadCoilsResponse) modbusResponse).getData();
} }
case FunctionCode.READ_DISCRETE_INPUTS -> { case FunctionCode.READ_DISCRETE_INPUTS -> {
values = ((ReadDiscreteInputsResponse) modbusResponse).getShortData(); byteValues = ((ReadDiscreteInputsResponse) modbusResponse).getData();
} }
case FunctionCode.READ_INPUT_REGISTERS -> { case FunctionCode.READ_INPUT_REGISTERS -> {
values = ((ReadInputRegistersResponse) modbusResponse).getShortData(); shortValues = ((ReadInputRegistersResponse) modbusResponse).getShortData();
} }
case FunctionCode.READ_HOLDING_REGISTERS -> { case FunctionCode.READ_HOLDING_REGISTERS -> {
values = ((ReadHoldingRegistersResponse) modbusResponse).getShortData(); shortValues = ((ReadHoldingRegistersResponse) modbusResponse).getShortData();
} }
case FunctionCode.READ_EXCEPTION_STATUS -> { case FunctionCode.READ_EXCEPTION_STATUS -> {
values = new short[]{((ReadExceptionStatusResponse) modbusResponse).getExceptionStatus()}; shortValues = new short[]{((ReadExceptionStatusResponse) modbusResponse).getExceptionStatus()};
} }
default -> { default -> {
throw new RuntimeException("Funcetion code not supported: " + modbusResponse.getFunctionCode()); throw new RuntimeException("Funcetion code not supported: " + modbusResponse.getFunctionCode());
} }
} }
for (short value : values) { if (Objects.nonNull(shortValues)) {
stepSize = index * 4; for (short value : shortValues) {
messagePointMap.put(StringUtils.leftPad(String.valueOf(startAddress), 4, '0'), stepSize = index * 4;
ModbusMessage.MessagePoint.builder() messagePointMap.put(StringUtils.leftPad(String.valueOf(startAddress), 4, '0'),
.parseValue(String.valueOf(value)) ModbusMessage.MessagePoint.builder()
.originalValue(StringUtils.substring(collectionMessage, 6 + stepSize, 10 + stepSize)) .parseValue(String.valueOf(value))
.build()); .originalValue(StringUtils.substring(collectionMessage, 6 + stepSize, 10 + stepSize))
index++; .build());
startAddress++; index++;
startAddress++;
}
} else if (Objects.nonNull(byteValues)) {
for (byte value : byteValues) {
stepSize = index * 2;
messagePointMap.put(StringUtils.leftPad(String.valueOf(startAddress), 4, '0'),
ModbusMessage.MessagePoint.builder()
.parseValue(String.valueOf(value))
.originalValue(StringUtils.substring(collectionMessage, 6 + stepSize, 8 + stepSize))
.build());
index++;
startAddress++;
}
} }
} catch (Exception e) { } catch (Exception e) {
log.error("初始数据解析异常: {}", messageString, e); log.error("初始数据解析异常: {}", messageString, e);