Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev

update
2025-05-20 16:53:48 +08:00 · 2025-05-20 16:53:36 +08:00
3 changed files with 2 additions and 5 deletions
--- a/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
+++ b/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
@ -94,6 +94,6 @@ public class CollectBusApplicationModule : AbpModule

        //默认初始化表计信息
        var dbContext = context.ServiceProvider.GetRequiredService<EnergySystemScheduledMeterReadingService>();
-        await dbContext.InitAmmeterCacheData();
+        await dbContext.InitAmmeterCacheData("V4-Gather-8890");
    }
 }
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
@ -257,7 +257,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading

            #if DEBUG
                            //// sql = $@"{sql} and c.Address in('542410000504','442405000040','442405000039','402410040506')";
-                sql = $@"{sql} and c.Address in('402410040506')";
+                //sql = $@"{sql} and c.Address in('402410040506')";
 #endif

                if (!string.IsNullOrWhiteSpace(gatherCode))
--- a/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
+++ b/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
@ -83,9 +83,6 @@
    <None Update="Plugins\JiShe.CollectBus.Protocol.T6452007.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
-    <None Update="Plugins\JiShe.CollectBus.Protocol.Test.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
  </ItemGroup>

 </Project>
Author	SHA1	Message	Date
Dai Mr	6ff97c1c0f	Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev	2025-05-20 16:53:48 +08:00
Dai Mr	77eabfec5d	update	2025-05-20 16:53:36 +08:00