diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d6dd345..2920dd1 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d6dd345..2920dd1 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 46e8c63..09dddfd 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d6dd345..2920dd1 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 46e8c63..09dddfd 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 4593497..e064912 100644
--- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
+++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cf55bcdbf185293aa556b20484cf90d92ee0d176
+0f9829905c7764f5eafb77c9188e5314390a031d
diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo
index 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d6dd345..2920dd1 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 46e8c63..09dddfd 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 4593497..e064912 100644
--- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
+++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cf55bcdbf185293aa556b20484cf90d92ee0d176
+0f9829905c7764f5eafb77c9188e5314390a031d
diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache
index 8ee7e97..84e3482 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d6dd345..2920dd1 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 46e8c63..09dddfd 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 4593497..e064912 100644
--- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
+++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cf55bcdbf185293aa556b20484cf90d92ee0d176
+0f9829905c7764f5eafb77c9188e5314390a031d
diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache
index 8ee7e97..84e3482 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 3ef961d..764380a 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d6dd345..2920dd1 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 46e8c63..09dddfd 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 4593497..e064912 100644
--- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
+++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cf55bcdbf185293aa556b20484cf90d92ee0d176
+0f9829905c7764f5eafb77c9188e5314390a031d
diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache
index 8ee7e97..84e3482 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 3ef961d..764380a 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 82d2439..18b75c1 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 84b062e..2feeaec 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 e1c94ec..72436e5 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 64b0b01..00c745c 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 1ebc635..16c60b0 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 5699c20..92d723e 100644
--- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
index cd7bded..e584193 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-740d5ce5d937307640c6795538b52b13b0fab487
+d20411b1d56d2d4b2fca144bbc57eac64c682ad1
diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
index f3db05c..e41facf 100644
--- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
+++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
Binary files differ
diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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 46e8c63..09dddfd 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/bin/Debug/irisDataBase.pdb
+++ b/bin/Debug/irisDataBase.pdb
Binary files differ
diff --git a/bin/Debug/irisMemory.dll b/bin/Debug/irisMemory.dll
index 699ce70..6af0e08 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 1938434..2452549 100644
--- a/bin/Debug/irisMemory.pdb
+++ b/bin/Debug/irisMemory.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe
index 82d2439..18b75c1 100644
--- a/bin/Debug/irisRefactor.exe
+++ b/bin/Debug/irisRefactor.exe
Binary files differ
diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb
index e419fdb..998129d 100644
--- a/bin/Debug/irisRefactor.pdb
+++ b/bin/Debug/irisRefactor.pdb
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe b/bin/Debug/irisRefactor.vshost.exe
deleted file mode 100644
index bb84a51..0000000
--- a/bin/Debug/irisRefactor.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/Debug/irisRefactor.vshost.exe.config b/bin/Debug/irisRefactor.vshost.exe.config
deleted file mode 100644
index 4921d0f..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.config
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/Debug/irisRefactor.vshost.exe.manifest b/bin/Debug/irisRefactor.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/Debug/irisRefactor.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
index b565531..95e86dc 100644
--- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
+++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
@@ -1,4 +1,4 @@
-using irisHelper;
+
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@
using Newtonsoft.Json;
using irisDataBase.Model;
using System.Windows.Forms;
+using irisHelper;
namespace irisDataBase.Service.mysqlImpl
{
@@ -273,9 +274,7 @@
int re = -1;
MySqlTransaction tx = null;
MySqlCommand cmd = new MySqlCommand();
-
- LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data);
-
+
try
{
tx = DatabaseLocal.mySqlConnect.BeginTransaction();
@@ -287,7 +286,7 @@
{
data = data.Replace("addPerson:", "");
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
-
+
//sys_person表
List personList = JsonConvert.DeserializeObject>(json["sys_person"].ToString());
foreach (Person person in personList)
@@ -321,6 +320,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_person_photo表
List irisPersonPhotoList = JsonConvert.DeserializeObject>(json["iris_person_photo"].ToString());
foreach (IrisPersonPhoto irisPersonPhoto in irisPersonPhotoList)
@@ -339,6 +339,7 @@
cmd.ExecuteNonQuery();
}
+
//iris_data表
List irisDataList = JsonConvert.DeserializeObject>(json["iris_data"].ToString());
foreach (IrisData irisData in irisDataList)
@@ -403,6 +404,32 @@
}
}
+ // 删除人员
+ else if (data.Contains("deletePerson:"))
+ {
+ data = data.Replace("deletePerson:", "");
+ data = data.Insert(7, "\"");
+ data = data.Insert(data.Length - 1, "\"");
+ JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
+ string[] ids = json["ids"].ToString().Replace("[", "").Replace("]", "").Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from sys_person where ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ for (int i = 0; i < ids.Length; i++)
+ {
+ string sql = "delete from acs_permission where PERSON_ID=@ID";
+ cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect);
+ cmd.Parameters.AddWithValue("@ID", ids[i]);
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+
// 新增授权
else if (data.Contains("addPermission:"))
{
@@ -410,6 +437,7 @@
JObject json = (JObject)JsonConvert.DeserializeObject(data);//或者JObject jo = JObject.Parse(jsonText);
+
//acs_strategy表
List strategyList = JsonConvert.DeserializeObject>(json["acs_strategy"].ToString());
@@ -464,6 +492,7 @@
}
+
//acs_permission表
List permissionList = JsonConvert.DeserializeObject>(json["acs_permission"].ToString());
foreach (Permission permission in permissionList)
@@ -486,6 +515,7 @@
cmd.ExecuteNonQuery();
}
+
//bus_device表
List deviceList = JsonConvert.DeserializeObject>(json["bus_device"].ToString());
foreach (Device device in deviceList)
@@ -516,6 +546,7 @@
// 取消授权
else if (data.Contains("deletePermission:"))
{
+
data = data.Replace("deletePermission:", "");
data = data.Insert(7, "\"");
data = data.Insert(data.Length - 1, "\"");
@@ -573,6 +604,8 @@
//清空表
cmd = new MySqlCommand("truncate table sys_person", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
+ cmd = new MySqlCommand("truncate table sys_person_ext", DatabaseLocal.mySqlConnect);
+ cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_person_photo", DatabaseLocal.mySqlConnect);
cmd.ExecuteNonQuery();
cmd = new MySqlCommand("truncate table iris_data", DatabaseLocal.mySqlConnect);
@@ -590,7 +623,6 @@
re = -1;
tx.Rollback();
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "clearTableFromOffline " + tableName + " EXCEPTION: " + ex.Message);
-
}
finally
{
diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj
index 24460b4..10dd00b 100644
--- a/irisDataBase/irisDataBase.csproj
+++ b/irisDataBase/irisDataBase.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97d1cca..e2d7977 100644
--- a/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDataBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
index 223ec4a..ed4e616 100644
--- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
+++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f13cb6aea646022c9c3738234a00bf79c3b4de51
+5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be
diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
index d2ddd4f..34b2e48 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 78010d4..275990b 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 3e21681..59aec98 100644
--- a/irisDataBase/obj/Debug/irisDataBase.pdb
+++ b/irisDataBase/obj/Debug/irisDataBase.pdb
Binary files differ
diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj
index 6277bfd..e7ca3ba 100644
--- a/irisDoor/irisDoor.csproj
+++ b/irisDoor/irisDoor.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8b6ce45..09dc7b5 100644
--- a/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisDoor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
index d1b50a1..c6ecb0a 100644
--- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
+++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2a502bebe34dcec93670c8707e0a7853b01f05c5
+5cdbc8112efacba5e9958e274fbe99a53b351207
diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
index c9f9ad6..6414c59 100644
--- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
+++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/ConfigHelper.cs b/irisHelper---/ConfigHelper.cs
new file mode 100644
index 0000000..9fa8f31
--- /dev/null
+++ b/irisHelper---/ConfigHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class ConfigHelper
+ {
+ public static string GetAppConfig(string strKey)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == strKey)
+ {
+ return config.AppSettings.Settings[strKey].Value.ToString();
+ }
+ }
+ return null;
+ }
+
+ public static void UpdateAppConfig(string newKey, string newValue)
+ {
+ string file = System.Windows.Forms.Application.ExecutablePath;
+ Configuration config = ConfigurationManager.OpenExeConfiguration(file);
+ bool exist = false;
+ foreach (string key in config.AppSettings.Settings.AllKeys)
+ {
+ if (key == newKey)
+ {
+ exist = true;
+ }
+ }
+
+ if (exist)
+ {
+ config.AppSettings.Settings.Remove(newKey);
+ }
+ config.AppSettings.Settings.Add(newKey, newValue);
+ config.Save(ConfigurationSaveMode.Modified);
+ ConfigurationManager.RefreshSection("appSettings");
+ }
+
+ }
+}
diff --git a/irisHelper---/EnumHelper.cs b/irisHelper---/EnumHelper.cs
new file mode 100644
index 0000000..ffb9201
--- /dev/null
+++ b/irisHelper---/EnumHelper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace irisHelper
+{
+ public class EnumHelper
+ {
+ public enum StrategyType
+ {
+ 日期 = 1,
+ 星期 = 2,
+ 当天 = 3
+ }
+
+ public enum Week {
+
+ 星期一 = 1,
+ 星期二 = 2,
+ 星期三 = 3,
+ 星期四 = 4,
+ 星期五 = 5,
+ 星期六 = 6,
+ 星期日 = 7
+
+ }
+
+ public enum StrategyPeriod{
+ 永久 = 1,
+ 当次 = 2
+ }
+
+ public enum OpenStatus
+ {
+ 常开 = 1,
+ 常闭 = 0,
+ 正常 = 2
+ }
+
+ public enum Sex
+ {
+ 男 = 1,
+ 女 = 2
+ }
+ }
+}
\ No newline at end of file
diff --git a/irisHelper---/LogHelper.cs b/irisHelper---/LogHelper.cs
new file mode 100644
index 0000000..1f5508e
--- /dev/null
+++ b/irisHelper---/LogHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using log4net;
+
+[assembly: log4net.Config.XmlConfigurator(Watch = true)]
+
+namespace irisHelper
+{
+ public class LogHelper
+ {
+ ///
+ /// 输出日志到Log4Net
+ ///
+ ///
+ ///
+ public static void WriteLog(Type t, string msg)
+ {
+ //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ log4net.ILog log = log4net.LogManager.GetLogger(t);
+ log.Info(System.DateTime.Now.ToString() + " " + msg);
+ }
+
+
+ }
+}
diff --git a/irisHelper---/Properties/AssemblyInfo.cs b/irisHelper---/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7460c4c
--- /dev/null
+++ b/irisHelper---/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("irisHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("irisHelper")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("57f9a80f-c3a3-421d-a3a4-93cbd15f6beb")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*",如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/irisHelper---/irisHelper.cs b/irisHelper---/irisHelper.cs
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.cs
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/irisHelper.csproj b/irisHelper---/irisHelper.csproj
new file mode 100644
index 0000000..1491881
--- /dev/null
+++ b/irisHelper---/irisHelper.csproj
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {57F9A80F-C3A3-421D-A3A4-93CBD15F6BEB}
+ Library
+ Properties
+ irisHelper
+ irisHelper
+ v4.0
+ 512
+ true
+
+
+ true
+ full
+ false
+ ..\bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\bin\Debug\log4net.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..8c8e326
--- /dev/null
+++ b/irisHelper---/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CopyComplete
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..e8aee93
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..1212152
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,56 @@
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\bin\Debug\log4net.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\bin\Debug\irisHelper.dll
+D:\yxw\irisRefactor\bin\Debug\irisHelper.pdb
+D:\yxw\irisRefactor\irisHelper\obj\Debug\ResolveAssemblyReference.cache
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\yxw\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\bin\Debug\irisHelper.dll
+D:\git\irisRefactor\bin\Debug\irisHelper.pdb
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.dll
+D:\git\irisRefactor\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
diff --git a/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..1d8f01e
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.dll b/irisHelper---/obj/Debug/irisHelper.dll
new file mode 100644
index 0000000..f00d374
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.dll
Binary files differ
diff --git a/irisHelper---/obj/Debug/irisHelper.pdb b/irisHelper---/obj/Debug/irisHelper.pdb
new file mode 100644
index 0000000..4eab249
--- /dev/null
+++ b/irisHelper---/obj/Debug/irisHelper.pdb
Binary files differ
diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj
index 1491881..d35fa7f 100644
--- a/irisHelper/irisHelper.csproj
+++ b/irisHelper/irisHelper.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f674122..50c5510 100644
--- a/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
index 5b318d9..e8aee93 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
+++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-039e7881cffa5e2c191b6b802737a95444722d04
+b84f2c01d10a56b095d034c2b44d856266d8e662
diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
index 1212152..7a46541 100644
--- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
+++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
@@ -42,11 +42,11 @@
D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
-D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll
D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb
+D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb
E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache
diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
new file mode 100644
index 0000000..c23605a
--- /dev/null
+++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisIoControll/irisIoControll.csproj b/irisIoControll/irisIoControll.csproj
index f9fe264..26a4505 100644
--- a/irisIoControll/irisIoControll.csproj
+++ b/irisIoControll/irisIoControll.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bfc9d35..20a8c45 100644
--- a/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisIoControll/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
index fd5e76c..b1e6c1c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8848caab34f65041f0f992dc20dfcf350c3656ee
+bbebfab681a2b160f3f0e40e9c1b63de854a9a7e
diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
index 9d99bcc..b9a5f5c 100644
--- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
+++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
Binary files differ
diff --git a/irisMemory/HmConfig/IrisCodeListMgr.cs b/irisMemory/HmConfig/IrisCodeListMgr.cs
index e7ccba8..e4ded7e 100644
--- a/irisMemory/HmConfig/IrisCodeListMgr.cs
+++ b/irisMemory/HmConfig/IrisCodeListMgr.cs
@@ -45,6 +45,7 @@
//创建哈希表,用于存储用户Id信息
m_htblUsers = new Hashtable();
+
//创建匹配用的全部用户虹膜编码codeList
m_byLeft = new byte[1024 * m_IrisCodeCount * 3];
m_byRight = new byte[1024 * m_IrisCodeCount * 3];
diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj
index e6b85ff..d013d49 100644
--- a/irisMemory/irisMemory.csproj
+++ b/irisMemory/irisMemory.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 79985f1..11ed6c5 100644
--- a/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisMemory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
index 9f81e2d..e45b028 100644
--- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
+++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9af4a1ac2cfb3d7fefcec52926dcbb43fe707b10
+500c43d39556ddc74f06ecc30920364033e2d6f4
diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
index 6730513..6358a64 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 699ce70..6af0e08 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 1938434..2452549 100644
--- a/irisMemory/obj/Debug/irisMemory.pdb
+++ b/irisMemory/obj/Debug/irisMemory.pdb
Binary files differ
diff --git a/irisPrint/irisPrint.csproj b/irisPrint/irisPrint.csproj
index 9a320cc..213eb65 100644
--- a/irisPrint/irisPrint.csproj
+++ b/irisPrint/irisPrint.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
diff --git a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 16ca788..7060f70 100644
--- a/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/irisPrint/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
index 33f9fd4..b9f173e 100644
--- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
+++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4c24cb79f1c90603ae7b04fc6adcd2c20f34eb52
+c3386d76ffb09acdbab83cae17e792740f9e162d
diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs
index eb850ef..b45f659 100644
--- a/irisRefactor/IrisScoket/SocketHelper.cs
+++ b/irisRefactor/IrisScoket/SocketHelper.cs
@@ -200,7 +200,7 @@
updateThread.IsBackground = true;
updateThread.Start();
}
- else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:"))
+ else if (msg.Contains("addPermission:") || msg.Contains("deletePermission:") || msg.Contains("deletePerson:"))
{
LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据...");
@@ -462,6 +462,7 @@
re = DatabaseLocal.OpenDB(ProMemory.appConfig.DbLocalConfig);
if (re == 0)
{
+ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据:" + dataFromServer);
re = ProMemory.irisSynchDataService.updateTableFromServer(dataFromServer);
dataFromServer = "";
}
diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj
index 38405d4..55e7f89 100644
--- a/irisRefactor/irisRefactor.csproj
+++ b/irisRefactor/irisRefactor.csproj
@@ -38,7 +38,7 @@
..\bin\Debug\
DEBUG;TRACE
full
- x86
+ AnyCPU
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
index f05a162..067bb81 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/DesignTimeResolveAssemblyReferencesInput.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d6dd345..2920dd1 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 46e8c63..09dddfd 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 4593497..e064912 100644
--- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
+++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cf55bcdbf185293aa556b20484cf90d92ee0d176
+0f9829905c7764f5eafb77c9188e5314390a031d
diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache
index 8ee7e97..84e3482 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 3ef961d..764380a 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 82d2439..18b75c1 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 e419fdb..998129d 100644
--- a/irisRefactor/obj/x86/Debug/irisRefactor.pdb
+++ b/irisRefactor/obj/x86/Debug/irisRefactor.pdb
Binary files differ