diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache index 7a0ef77..3eaa253 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1cfcb806f89361656c74d66920f22ff2f78dbbb2 +e4e7e67a6d824fe268c49d53bb15a3e3cbfa1ef2 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache index 7a0ef77..3eaa253 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1cfcb806f89361656c74d66920f22ff2f78dbbb2 +e4e7e67a6d824fe268c49d53bb15a3e3cbfa1ef2 diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache index deae94f..56f454c 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache index 7a0ef77..3eaa253 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1cfcb806f89361656c74d66920f22ff2f78dbbb2 +e4e7e67a6d824fe268c49d53bb15a3e3cbfa1ef2 diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache index deae94f..56f454c 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index 76ee92e..a5e7100 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache index 7a0ef77..3eaa253 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1cfcb806f89361656c74d66920f22ff2f78dbbb2 +e4e7e67a6d824fe268c49d53bb15a3e3cbfa1ef2 diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache index deae94f..56f454c 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index 76ee92e..a5e7100 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index c908d54..a93061a 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache index 7a0ef77..3eaa253 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1cfcb806f89361656c74d66920f22ff2f78dbbb2 +e4e7e67a6d824fe268c49d53bb15a3e3cbfa1ef2 diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache index deae94f..56f454c 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index 76ee92e..a5e7100 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index c908d54..a93061a 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.exe b/irisRefactor/obj/x86/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.exe +++ b/irisRefactor/obj/x86/Debug/irisRefactor.exe Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index c7bc255..01eb7c9 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 366acec..6dff7de 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index b456cb0..b6a68d7 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index ba9da73..940158c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index c3b99a0..77ab0bb 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -504a23e40bc53042018eb7733975d1afd3f5761a +4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache index c35f518..6b5f016 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 3ca10b3..9b7729b 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisDoor.dll b/bin/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/bin/Debug/irisDoor.dll +++ b/bin/Debug/irisDoor.dll Binary files differ diff --git a/bin/Debug/irisDoor.pdb b/bin/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/bin/Debug/irisDoor.pdb +++ b/bin/Debug/irisDoor.pdb Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisIoControll.dll b/bin/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/bin/Debug/irisIoControll.dll +++ b/bin/Debug/irisIoControll.dll Binary files differ diff --git a/bin/Debug/irisIoControll.pdb b/bin/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/bin/Debug/irisIoControll.pdb +++ b/bin/Debug/irisIoControll.pdb Binary files differ diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/bin/Debug/irisMemory.dll +++ b/bin/Debug/irisMemory.dll Binary files differ diff --git a/bin/Debug/irisMemory.pdb b/bin/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/bin/Debug/irisMemory.pdb +++ b/bin/Debug/irisMemory.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" index 0dba854..df78f0d 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" Binary files differ diff --git "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" index 8dd5f76..4852bbe 100644 --- "a/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ "b/bin/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" Binary files differ diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index ebe67e4..a137d79 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -570,6 +570,7 @@ try { + tx = DatabaseLocal.mySqlConnect.BeginTransaction(); //绑定事务 cmd.Transaction = tx; diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index 7fe16f7..2427e8d 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ce3bfd87d45b1cd556130f8dca20916349674b7 +0a8b2c15e7d6b95a1091664a4a1272388f39c309 diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 1559d99..eee2bea 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index fd1cf15..5d16fa8 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index a4fc0af..a8abf1f 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index f7e5a8b..f9e96da 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d177117fc697a1faa083b543bdaee3ce08f37606 +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 97f7bcc..b67da53 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.dll b/irisDoor/obj/Debug/irisDoor.dll index b7ea900..842fbcb 100644 --- a/irisDoor/obj/Debug/irisDoor.dll +++ b/irisDoor/obj/Debug/irisDoor.dll Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.pdb b/irisDoor/obj/Debug/irisDoor.pdb index ac66c61..83f36a3 100644 --- a/irisDoor/obj/Debug/irisDoor.pdb +++ b/irisDoor/obj/Debug/irisDoor.pdb Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index c7876a5..5c7212e 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8faf9f09b3f327a06fba92b1fcb4ab0994f7bc21 +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 9a35dec..0422bb8 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ce4226d..09d428c 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index 34263a9..ad94e51 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index fcaf666..38b3d42 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eeb5b01a2142ad2f0651e7f5e45c8b8972e97069 +269030d871c630a6f213fad35c3afefd8df83761 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index ffa5359..242ad8f 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.dll b/irisIoControll/obj/Debug/irisIoControll.dll index b1d17d0..91d7c94 100644 --- a/irisIoControll/obj/Debug/irisIoControll.dll +++ b/irisIoControll/obj/Debug/irisIoControll.dll Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.pdb b/irisIoControll/obj/Debug/irisIoControll.pdb index beeaf37..6cf5582 100644 --- a/irisIoControll/obj/Debug/irisIoControll.pdb +++ b/irisIoControll/obj/Debug/irisIoControll.pdb Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index dd4f85f..15af92e 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99bf3b62d5c0fc1f47bb5ca56bfadf09757fb895 +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index e572799..372e973 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.dll b/irisMemory/obj/Debug/irisMemory.dll index e2215b6..fdd4afd 100644 --- a/irisMemory/obj/Debug/irisMemory.dll +++ b/irisMemory/obj/Debug/irisMemory.dll Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.pdb b/irisMemory/obj/Debug/irisMemory.pdb index 036236a..ab4e4f5 100644 --- a/irisMemory/obj/Debug/irisMemory.pdb +++ b/irisMemory/obj/Debug/irisMemory.pdb Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index a7863ab..df4f40c 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -34f16d14152a330782e9012ebe9eca25d686361f +50190877eac238823d94832845512a39c6ac1900 diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 0a2ca19..ab77b2d 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 68da03f..90c86f4 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index ecfe858..7068b94 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -210,23 +243,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中,请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 18d9be3..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - //if (ProMemory.tempRegion == 2) - //{ - if (hasPermisson) - successPass(); - else - successsNoPower(); - //} - //else - //successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..351cdd3 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 77cac48..49a902e 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..bdc25ad 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6dd345..8e94d79 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index b2bc5c3..c6baace 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache index 7a0ef77..3eaa253 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1cfcb806f89361656c74d66920f22ff2f78dbbb2 +e4e7e67a6d824fe268c49d53bb15a3e3cbfa1ef2 diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache index deae94f..56f454c 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index 76ee92e..a5e7100 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index c908d54..a93061a 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.exe b/irisRefactor/obj/x86/Debug/irisRefactor.exe index c4da8e5..1c82ee9 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.exe +++ b/irisRefactor/obj/x86/Debug/irisRefactor.exe Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.pdb b/irisRefactor/obj/x86/Debug/irisRefactor.pdb index 6832735..d5d057d 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.pdb +++ b/irisRefactor/obj/x86/Debug/irisRefactor.pdb Binary files differ