joylink/xian-ncc-da-server
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改线路时，数据加锁】

Browse Source
This commit is contained in:
weizhihong 2023-06-21 15:52:36 +08:00
parent 28d55ef8db
commit 06b5f499c4
3 changed files with 63 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/club/joylink/xiannccda/ats/message/collect/DeviceStatusData.java
View File

@ -4,6 +4,8 @@ import com.google.protobuf.GeneratedMessageV3.Builder;
import com.google.protobuf.Message;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import lombok.Getter;
/** 线路设备状态信息 */
@ -19,6 +21,9 @@ public class DeviceStatusData {
/** 增量的设备更新信息 */
private Map<String, Map<String, Message>> statusVOMap = new ConcurrentHashMap<>();
/** 同步锁 */
private Lock lock = new ReentrantLock();
public DeviceStatusData(String lineCode) {
this.lineCode = lineCode;
}

67
src/main/java/club/joylink/xiannccda/ats/message/collect/DeviceStatusDataOperate.java
View File

@ -20,28 +20,6 @@ public abstract class DeviceStatusDataOperate {
private static final Map<String, String> DEVICE_ID_NAME_MAP =
Map.of("LineNetTrainOffsetDiagram", "groupId", "Train", "groupId");
/**
* 获取设备状态类型
*
* @param builder 设备状态信息
* @return 状态类型
*/
private static String findType(Builder builder) {
return builder.getDefaultInstanceForType().getClass().getSimpleName();
}
/**
* 获取主键值
*
* @param protoBuilder 数据信息
* @return 主键
*/
private static String getIdVal(Builder protoBuilder) {
String idName = DEVICE_ID_NAME_MAP.getOrDefault(findType(protoBuilder), DEFAULT_ID_NAME);
return String.valueOf(
protoBuilder.getField(protoBuilder.getDescriptorForType().findFieldByName(idName)));
}
/**
* 批量放入设备状态
*
@ -52,6 +30,8 @@ public abstract class DeviceStatusDataOperate {
if (data == null || builders == null) {
return;
}
data.getLock().lock(); // 对该线路数据上锁
try {
// 获取全量数据
Map<String, Map<String, Builder>> allDeviceMap = data.getAllDeviceMap();
// 最后增量数据
@ -72,8 +52,51 @@ public abstract class DeviceStatusDataOperate {
statusVOMap.put(k, compareMap);
}
});
if (!CollectionUtils.isEmpty(statusVOMap)) {
data.getStatusVOMap().clear();
data.getStatusVOMap().putAll(statusVOMap);
}
} finally {
data.getLock().unlock();
}
}
/**
* 在能得到锁的情况，清除增量状态
*
* @param data 设备状态数据
*/
public static void clearStatusVOMap(DeviceStatusData data) {
if (data.getLock().tryLock()) {
try {
data.getStatusVOMap().clear();
} finally {
data.getLock().unlock();
}
}
}
/**
* 获取设备状态类型
*
* @param builder 设备状态信息
* @return 状态类型
*/
private static String findType(Builder builder) {
return builder.getDefaultInstanceForType().getClass().getSimpleName();
}
/**
* 获取主键值
*
* @param protoBuilder 数据信息
* @return 主键
*/
private static String getIdVal(Builder protoBuilder) {
String idName = DEVICE_ID_NAME_MAP.getOrDefault(findType(protoBuilder), DEFAULT_ID_NAME);
return String.valueOf(
protoBuilder.getField(protoBuilder.getDescriptorForType().findFieldByName(idName)));
}
/**
* 对比获取设备变化了的状态信息并更新状态信息

3
src/main/java/club/joylink/xiannccda/ws/LineNetMessageServer.java
View File

@ -1,6 +1,7 @@
package club.joylink.xiannccda.ws;
import club.joylink.xiannccda.ats.message.collect.DeviceStatusData;
import club.joylink.xiannccda.ats.message.collect.DeviceStatusDataOperate;
import club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage;
import com.google.protobuf.Descriptors.FieldDescriptor.Type;
import com.google.protobuf.Message;
@ -61,7 +62,7 @@ public class LineNetMessageServer implements IMessageServer {
(fieldType) -> dataSource.getStatusVOMap().getOrDefault(fieldType, Map.of()));
byte[] bytes = message.toByteArray();
// 清空增量
dataSource.getStatusVOMap().clear();
DeviceStatusDataOperate.clearStatusVOMap(dataSource);
log.info("【线网订阅】数据状态变化量：" + bytes.length);
topicMessages.add(new TopicMessage(this.getDestinationPattern(), bytes));
}