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

Compare commits

base: admin:40b62caa83837b0dedf1375f2552565c7b69d0ea
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:f5f9434a973ceaced8a39890a3063c94e14fdb05
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

3 Commits
40b62caa83 ... f5f9434a97

Author SHA1 Message Date
zenghongyao
f5f9434a97 代码提交 2025-04-19 14:00:13 +08:00
zenghongyao
b3a2fd506e 提交代码 2025-04-19 13:57:19 +08:00
zenghongyao
40924e921f 提交代码 2025-04-19 13:57:08 +08:00
2 changed files with 1 additions and 8 deletions
Show Stats Expand all files Collapse all files

3
services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
View File

@ -26,11 +26,8 @@ using System.Diagnostics;
using JiShe.CollectBus.IoTDB.Context; using JiShe.CollectBus.IoTDB.Context;
using JiShe.CollectBus.IoTDB.Interface; using JiShe.CollectBus.IoTDB.Interface;
using JiShe.CollectBus.IoTDB.Options; using JiShe.CollectBus.IoTDB.Options;
<<<<<<< HEAD
using JiShe.CollectBus.Kafka.Internal; using JiShe.CollectBus.Kafka.Internal;
=======
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
>>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
namespace JiShe.CollectBus.Samples; namespace JiShe.CollectBus.Samples;

6
services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
View File

@ -13,6 +13,7 @@ using JiShe.CollectBus.IoTDB.Interface;
using JiShe.CollectBus.IotSystems.MessageIssueds; using JiShe.CollectBus.IotSystems.MessageIssueds;
using JiShe.CollectBus.IotSystems.MeterReadingRecords; using JiShe.CollectBus.IotSystems.MeterReadingRecords;
using JiShe.CollectBus.IotSystems.Watermeter; using JiShe.CollectBus.IotSystems.Watermeter;
using JiShe.CollectBus.Kafka.Internal;
using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Kafka.Producer;
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.RedisDataCache; using JiShe.CollectBus.RedisDataCache;
@ -27,11 +28,6 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using static FreeSql.Internal.GlobalFilter; using static FreeSql.Internal.GlobalFilter;
<<<<<<< HEAD
using JiShe.CollectBus.Kafka.Internal;
=======
using static System.Runtime.InteropServices.JavaScript.JSType;
>>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
namespace JiShe.CollectBus.ScheduledMeterReading namespace JiShe.CollectBus.ScheduledMeterReading
{ {