admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: admin:96a38d8ec9cf7a4deec1759cb3fb1bbdb2b5f166
Branches Tags
admin:master
admin:dev
admin:feature_定时抄读_23_CY
admin:zhy_feat_dev_v11
admin:feature_定时抄读_20_CY
admin:zhy_feat_cev_v8
admin:zhy_feat_cev_v7
admin:feature_定时抄读_19_CY
admin:zhy_feat_cev_v5
admin:feature_定时抄读_16_CY
admin:feature_定时抄读_14_CY
admin:feature_定时抄读_11_CY
admin:feature_定时抄读_10_CY
admin:zhy_feat_cev_v3
admin:log
admin:V1.2.0
admin:v1.0.0
..
compare: admin:d0e2a35f2265efa794b8c2fedd30a8b2fbc3709d
Branches Tags
admin:dev
admin:feature_定时抄读_23_CY
admin:zhy_feat_dev_v11
admin:master
admin:feature_定时抄读_20_CY
admin:zhy_feat_cev_v8
admin:zhy_feat_cev_v7
admin:feature_定时抄读_19_CY
admin:zhy_feat_cev_v5
admin:feature_定时抄读_16_CY
admin:feature_定时抄读_14_CY
admin:feature_定时抄读_11_CY
admin:feature_定时抄读_10_CY
admin:zhy_feat_cev_v3
admin:log
admin:V1.2.0
admin:v1.0.0

No commits in common. "96a38d8ec9cf7a4deec1759cb3fb1bbdb2b5f166" and "d0e2a35f2265efa794b8c2fedd30a8b2fbc3709d" have entirely different histories.
96a38d8ec9 ... d0e2a35f22

2 changed files with 45 additions and 45 deletions
Show Stats Expand all files Collapse all files

4
src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
View File

@ -91,7 +91,7 @@ namespace JiShe.CollectBus.Subscribers
} }
else else
{ {
var device = await _deviceRepository.FirstOrDefaultAsync(a => a.Number == receivedMessage.FocusAddress); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.FocusAddress);
if (device != null) if (device != null)
{ {
await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString)); await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
@ -118,7 +118,7 @@ namespace JiShe.CollectBus.Subscribers
} }
else else
{ {
var device = await _deviceRepository.FirstOrDefaultAsync(a => a.Number == receivedMessage.FocusAddress); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.FocusAddress);
if (device != null) if (device != null)
{ {
await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString)); await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));

86
src/JiShe.CollectBus.MongoDB/MongoDB/CollectBusMongoDbContext.cs
View File

@ -31,57 +31,57 @@ public class CollectBusMongoDbContext : AbpMongoDbContext, ICollectBusMongoDbCon
protected override void CreateModel(IMongoModelBuilder modelBuilder) protected override void CreateModel(IMongoModelBuilder modelBuilder)
{ {
//modelBuilder.Entity<MeterReadingRecords>(builder => modelBuilder.Entity<MeterReadingRecords>(builder =>
//{ {
// builder.CreateCollectionOptions.Collation = new Collation(locale: "en_US", strength: CollationStrength.Secondary); builder.CreateCollectionOptions.Collation = new Collation(locale: "en_US", strength: CollationStrength.Secondary);
// builder.ConfigureIndexes(indexes => builder.ConfigureIndexes(indexes =>
// { {
// indexes.CreateOne( indexes.CreateOne(
// new CreateIndexModel<BsonDocument>( new CreateIndexModel<BsonDocument>(
// Builders<BsonDocument>.IndexKeys.Ascending("MyProperty"), Builders<BsonDocument>.IndexKeys.Ascending("MyProperty"),
// new CreateIndexOptions { Unique = true } new CreateIndexOptions { Unique = true }
// ) )
// ); );
// } }
// ); );
// //// 创建索引 //// 创建索引
// //builder.ConfigureIndexes(index => //builder.ConfigureIndexes(index =>
// //{ //{
// // //List<CreateIndexModel<BsonDocument>> createIndexModels = new List<CreateIndexModel<BsonDocument>>(); // //List<CreateIndexModel<BsonDocument>> createIndexModels = new List<CreateIndexModel<BsonDocument>>();
// // //createIndexModels.Add(new CreateIndexModel<BsonDocument>( // //createIndexModels.Add(new CreateIndexModel<BsonDocument>(
// // // Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)), // // Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)),
// // // new CreateIndexOptions // // new CreateIndexOptions
// // // { // // {
// // // Unique = true // // Unique = true
// // // } // // }
// // // )); // // ));
// // //var indexKeys = Builders<BsonDocument>.IndexKeys // //var indexKeys = Builders<BsonDocument>.IndexKeys
// // //.Ascending("CreationTime") // //.Ascending("CreationTime")
// // //.Ascending("OrderNumber"); // //.Ascending("OrderNumber");
// // //var indexOptions = new CreateIndexOptions // //var indexOptions = new CreateIndexOptions
// // //{ // //{
// // // Background = true, // // Background = true,
// // // Name = "IX_CreationTime_OrderNumber" // // Name = "IX_CreationTime_OrderNumber"
// // //}; // //};
// // //index.CreateOne( // //index.CreateOne(
// // //new CreateIndexModel<BsonDocument>(indexKeys, indexOptions)); // //new CreateIndexModel<BsonDocument>(indexKeys, indexOptions));
// // //index.CreateOne(new CreateIndexModel<BsonDocument>( // //index.CreateOne(new CreateIndexModel<BsonDocument>(
// // // Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)), // // Builders<BsonDocument>.IndexKeys.Ascending(nameof(MeterReadingRecords)),
// // // new CreateIndexOptions // // new CreateIndexOptions
// // // { // // {
// // // Unique = true // // Unique = true
// // // } // // }
// // // )); // // ));
// //}); //});
//}); });
base.CreateModel(modelBuilder); base.CreateModel(modelBuilder);
modelBuilder.ConfigureCollectBus(); modelBuilder.ConfigureCollectBus();