From 58afa8cfd2a73d02c73bd17558bc659d58127a6a Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Thu, 12 Jun 2025 17:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/JiShe.IoT.Application/IoTApplicationModule.cs             | 3 ++-
 src/JiShe.IoT.Application/JiShe.IoT.Application.csproj        | 4 ----
 .../Jobs/{ => ToMysql}/BathSyncAmmeterDataToMysqlJob.cs       | 2 +-
 .../Jobs/{ => ToMysql}/BathSyncFocusDataToMysqlJob.cs         | 2 +-
 .../Jobs/{ => ToMysql}/BathSyncWatermeterDataToMysqlJob.cs    | 2 +-
 .../Jobs/{ => ToRedis}/CacheDeviceDataToRedisJob.cs           | 2 +-
 .../Jobs/{ => ToRedis}/CacheFocusDataToRedisJob.cs            | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)
 rename src/JiShe.IoT.Application/Jobs/{ => ToMysql}/BathSyncAmmeterDataToMysqlJob.cs (97%)
 rename src/JiShe.IoT.Application/Jobs/{ => ToMysql}/BathSyncFocusDataToMysqlJob.cs (97%)
 rename src/JiShe.IoT.Application/Jobs/{ => ToMysql}/BathSyncWatermeterDataToMysqlJob.cs (97%)
 rename src/JiShe.IoT.Application/Jobs/{ => ToRedis}/CacheDeviceDataToRedisJob.cs (97%)
 rename src/JiShe.IoT.Application/Jobs/{ => ToRedis}/CacheFocusDataToRedisJob.cs (97%)

diff --git a/src/JiShe.IoT.Application/IoTApplicationModule.cs b/src/JiShe.IoT.Application/IoTApplicationModule.cs
index 2675e00..d86608b 100644
--- a/src/JiShe.IoT.Application/IoTApplicationModule.cs
+++ b/src/JiShe.IoT.Application/IoTApplicationModule.cs
@@ -1,4 +1,5 @@
-using JiShe.IoT.Jobs;
+using JiShe.IoT.Jobs.ToMysql;
+using JiShe.IoT.Jobs.ToRedis;
 using JiShe.ServicePro.DeviceManagement;
 using JiShe.ServicePro.DynamicMenuManagement;
 using JiShe.ServicePro.FileManagement;
diff --git a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
index 8182174..9412cc5 100644
--- a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
+++ b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
@@ -28,9 +28,5 @@
     <ItemGroup>
         <PackageReference Include="Volo.Abp.BackgroundJobs.HangFire" />
     </ItemGroup>
-    
-    <ItemGroup>
-      <Folder Include="Jobs\新文件夹\" />
-    </ItemGroup>
 
 </Project>
diff --git a/src/JiShe.IoT.Application/Jobs/BathSyncAmmeterDataToMysqlJob.cs b/src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncAmmeterDataToMysqlJob.cs
similarity index 97%
rename from src/JiShe.IoT.Application/Jobs/BathSyncAmmeterDataToMysqlJob.cs
rename to src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncAmmeterDataToMysqlJob.cs
index 43ae9ce..3c5d7ff 100644
--- a/src/JiShe.IoT.Application/Jobs/BathSyncAmmeterDataToMysqlJob.cs
+++ b/src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncAmmeterDataToMysqlJob.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace JiShe.IoT.Jobs
+namespace JiShe.IoT.Jobs.ToMysql
 {
     /// <summary>
     /// 批量同步电表 ammeter 数据到mysql
diff --git a/src/JiShe.IoT.Application/Jobs/BathSyncFocusDataToMysqlJob.cs b/src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncFocusDataToMysqlJob.cs
similarity index 97%
rename from src/JiShe.IoT.Application/Jobs/BathSyncFocusDataToMysqlJob.cs
rename to src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncFocusDataToMysqlJob.cs
index de3dd2b..cf93e50 100644
--- a/src/JiShe.IoT.Application/Jobs/BathSyncFocusDataToMysqlJob.cs
+++ b/src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncFocusDataToMysqlJob.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace JiShe.IoT.Jobs
+namespace JiShe.IoT.Jobs.ToMysql
 {
     /// <summary>
     /// 批量同步集中器 Focus数据到Mysql
diff --git a/src/JiShe.IoT.Application/Jobs/BathSyncWatermeterDataToMysqlJob.cs b/src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncWatermeterDataToMysqlJob.cs
similarity index 97%
rename from src/JiShe.IoT.Application/Jobs/BathSyncWatermeterDataToMysqlJob.cs
rename to src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncWatermeterDataToMysqlJob.cs
index ea2985e..3d67893 100644
--- a/src/JiShe.IoT.Application/Jobs/BathSyncWatermeterDataToMysqlJob.cs
+++ b/src/JiShe.IoT.Application/Jobs/ToMysql/BathSyncWatermeterDataToMysqlJob.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace JiShe.IoT.Jobs
+namespace JiShe.IoT.Jobs.ToMysql
 {
     /// <summary>
     /// 批量同步 水表 watermeter 数据到mysql
diff --git a/src/JiShe.IoT.Application/Jobs/CacheDeviceDataToRedisJob.cs b/src/JiShe.IoT.Application/Jobs/ToRedis/CacheDeviceDataToRedisJob.cs
similarity index 97%
rename from src/JiShe.IoT.Application/Jobs/CacheDeviceDataToRedisJob.cs
rename to src/JiShe.IoT.Application/Jobs/ToRedis/CacheDeviceDataToRedisJob.cs
index 5b63a3d..b7cf1e2 100644
--- a/src/JiShe.IoT.Application/Jobs/CacheDeviceDataToRedisJob.cs
+++ b/src/JiShe.IoT.Application/Jobs/ToRedis/CacheDeviceDataToRedisJob.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace JiShe.IoT.Jobs
+namespace JiShe.IoT.Jobs.ToRedis
 {
     /// <summary>
     /// 缓存设备数据到redis
diff --git a/src/JiShe.IoT.Application/Jobs/CacheFocusDataToRedisJob.cs b/src/JiShe.IoT.Application/Jobs/ToRedis/CacheFocusDataToRedisJob.cs
similarity index 97%
rename from src/JiShe.IoT.Application/Jobs/CacheFocusDataToRedisJob.cs
rename to src/JiShe.IoT.Application/Jobs/ToRedis/CacheFocusDataToRedisJob.cs
index 51d461e..4372aa5 100644
--- a/src/JiShe.IoT.Application/Jobs/CacheFocusDataToRedisJob.cs
+++ b/src/JiShe.IoT.Application/Jobs/ToRedis/CacheFocusDataToRedisJob.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace JiShe.IoT.Jobs
+namespace JiShe.IoT.Jobs.ToRedis
 {
     /// <summary>
     /// 缓存集中器数据到Redis