diff --git a/GpsCardGatewayPosition.Model/Config/ServiceAccessConfig.cs b/GpsCardGatewayPosition.Model/Config/ServiceAccessConfig.cs
index 1d83daa..002e034 100644
--- a/GpsCardGatewayPosition.Model/Config/ServiceAccessConfig.cs
+++ b/GpsCardGatewayPosition.Model/Config/ServiceAccessConfig.cs
@@ -32,6 +32,11 @@ namespace GpsCardGatewayPosition.Model.Config
///
public bool EnablePushThird { get; set; }
+ ///
+ /// 第三方定位推送
+ ///
+ public bool EnablePushPosition { get; set; }
+
public bool EnablePushHealthy { get; set; }
///
/// 快速通道
diff --git a/GpsCardGatewayPosition.Postion/appsettings.debug.json b/GpsCardGatewayPosition.Postion/appsettings.debug.json
index 4b8df43..c545cf9 100644
--- a/GpsCardGatewayPosition.Postion/appsettings.debug.json
+++ b/GpsCardGatewayPosition.Postion/appsettings.debug.json
@@ -16,6 +16,7 @@
"EnableServiceGuard": true,
"EnablePushWx": true,
"EnablePushThird": true,
+ "EnablePushPosition": true,
"EnablePushHealthy": true,
"EnablePushFast": true, // 快速通道
"EnablePushFence": true,
diff --git a/GpsCardGatewayPosition.Postion/appsettings.test.json b/GpsCardGatewayPosition.Postion/appsettings.test.json
index 8befba6..598c24f 100644
--- a/GpsCardGatewayPosition.Postion/appsettings.test.json
+++ b/GpsCardGatewayPosition.Postion/appsettings.test.json
@@ -16,6 +16,7 @@
"EnableServiceGuard": true,
"EnablePushWx": true,
"EnablePushThird": true,
+ "EnablePushPosition": true,
"EnablePushHealthy": true,
"EnablePushFast": true, // 快速通道
"EnablePushFence": true,
diff --git a/GpsCardGatewayPosition.Service/MqProducer/Model/MqTopic.cs b/GpsCardGatewayPosition.Service/MqProducer/Model/MqTopic.cs
index af73e28..93b306e 100644
--- a/GpsCardGatewayPosition.Service/MqProducer/Model/MqTopic.cs
+++ b/GpsCardGatewayPosition.Service/MqProducer/Model/MqTopic.cs
@@ -43,5 +43,7 @@ namespace GpsCardGatewayPosition.Service.MqProducer.Model
/// 定位gps监测(非法区域检测)
///
public const string LocationMonitor = "topic.location.monitor";
+
+ public const string PushPosition = "topic.push.position";
}
}
diff --git a/GpsCardGatewayPosition.Service/MqProducer/MqProcessLogic.cs b/GpsCardGatewayPosition.Service/MqProducer/MqProcessLogic.cs
index 9b5ed34..08b15d1 100644
--- a/GpsCardGatewayPosition.Service/MqProducer/MqProcessLogic.cs
+++ b/GpsCardGatewayPosition.Service/MqProducer/MqProcessLogic.cs
@@ -301,44 +301,44 @@ namespace GpsCardGatewayPosition.Service.MqProducer
_logger.LogInformation($"设备{model.imei},推送到" + string.Join(", ", ls.Select(e => e.Topic)));
}
- public async Task ProcessPositionAsync(string messageId, LocationDatas model, string date)
- {
- List ls = new List();
- if (_configServiceAccess.EnablePushThird)
- {
- ls.Add(new TopicModel()
- {
- Topic = MqTopic.Third,
- Headers = _producer.CreateHeader(new Dictionary
- {
- {MqHeader.DataType,(int)MqDataType.PositionInfo },
- })
- });
- }
-
- if (_configServiceAccess.EnableLocationMonitor)
- {
- ls.Add(new TopicModel()
- {
- Topic = MqTopic.LocationMonitor,
- Headers = _producer.CreateHeader(new Dictionary
- {
- { MqHeader.DataType,(int)MqDataType.PositionInfo},
- })
- });
- }
-
- if (ls.Count == 0) return;
- await _producer.ProduceAsync(ls, new
- {
- messageId = messageId, //string.Format("{0:yyyyMMddHHmmssffff}", DateTime.Now),
- topic = string.Join(",", ls.Select(e => e.Topic)), //MqTopic.Storage + "," + MqTopic.Third,
- time = date,
- data = model
- });
-
- _logger.LogInformation($"设备{model.imei},推送到" + string.Join(", ", ls.Select(e => e.Topic)));
- }
+ //public async Task ProcessPositionAsync(string messageId, LocationDatas model, string date)
+ //{
+ // List ls = new List();
+ // if (_configServiceAccess.EnablePushThird)
+ // {
+ // ls.Add(new TopicModel()
+ // {
+ // Topic = MqTopic.Third,
+ // Headers = _producer.CreateHeader(new Dictionary
+ // {
+ // {MqHeader.DataType,(int)MqDataType.PositionInfo },
+ // })
+ // });
+ // }
+
+ // if (_configServiceAccess.EnableLocationMonitor)
+ // {
+ // ls.Add(new TopicModel()
+ // {
+ // Topic = MqTopic.LocationMonitor,
+ // Headers = _producer.CreateHeader(new Dictionary
+ // {
+ // { MqHeader.DataType,(int)MqDataType.PositionInfo},
+ // })
+ // });
+ // }
+
+ // if (ls.Count == 0) return;
+ // await _producer.ProduceAsync(ls, new
+ // {
+ // messageId = messageId, //string.Format("{0:yyyyMMddHHmmssffff}", DateTime.Now),
+ // topic = string.Join(",", ls.Select(e => e.Topic)), //MqTopic.Storage + "," + MqTopic.Third,
+ // time = date,
+ // data = model
+ // });
+
+ // _logger.LogInformation($"设备{model.imei},推送到" + string.Join(", ", ls.Select(e => e.Topic)));
+ //}
///
/// 含有wifi列表
///
@@ -347,14 +347,26 @@ namespace GpsCardGatewayPosition.Service.MqProducer
///
///
///
- public async Task ProcessPositionAsync(string messageId, LocationDatas model, string date, string wifiMacs)
+ public async Task ProcessPositionAsync(string messageId, LocationDatas model, string date, string wifiMacs = "")
{
List ls = new();
- if (_configServiceAccess.EnablePushThird)
+ //if (_configServiceAccess.EnablePushThird)
+ //{
+ // ls.Add(new TopicModel()
+ // {
+ // Topic = MqTopic.Third,
+ // Headers = _producer.CreateHeader(new Dictionary
+ // {
+ // {MqHeader.DataType,(int)MqDataType.PositionInfo },
+ // })
+ // });
+ //}
+
+ if (_configServiceAccess.EnablePushPosition)
{
ls.Add(new TopicModel()
{
- Topic = MqTopic.Third,
+ Topic = MqTopic.PushPosition,
Headers = _producer.CreateHeader(new Dictionary
{
{MqHeader.DataType,(int)MqDataType.PositionInfo },