diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 0dff098..c7bc255 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..18d9be3 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -93,15 +93,15 @@ else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { - if (ProMemory.tempRegion == 2) - { + //if (ProMemory.tempRegion == 2) + //{ if (hasPermisson) successPass(); else successsNoPower(); - } - else - successsNoPower(); + //} + //else + //successsNoPower(); } else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..18d9be3 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -93,15 +93,15 @@ else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { - if (ProMemory.tempRegion == 2) - { + //if (ProMemory.tempRegion == 2) + //{ if (hasPermisson) successPass(); else successsNoPower(); - } - else - successsNoPower(); + //} + //else + //successsNoPower(); } else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) diff --git a/irisRefactor/IrisThread/FindEyesTh.cs b/irisRefactor/IrisThread/FindEyesTh.cs index 633707a..db862ab 100644 --- a/irisRefactor/IrisThread/FindEyesTh.cs +++ b/irisRefactor/IrisThread/FindEyesTh.cs @@ -73,7 +73,7 @@ { ProMemory.irisConfig.Q3.Push(irisPos); } - if (ProMemory.irisConfig.Key_Assess == 0) + if (ProMemory.irisConfig.Key_Assess == 0 && !ProMemory.isSyning) { ProMemory.irisConfig.Key_Assess = 1; diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..18d9be3 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -93,15 +93,15 @@ else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { - if (ProMemory.tempRegion == 2) - { + //if (ProMemory.tempRegion == 2) + //{ if (hasPermisson) successPass(); else successsNoPower(); - } - else - successsNoPower(); + //} + //else + //successsNoPower(); } else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) diff --git a/irisRefactor/IrisThread/FindEyesTh.cs b/irisRefactor/IrisThread/FindEyesTh.cs index 633707a..db862ab 100644 --- a/irisRefactor/IrisThread/FindEyesTh.cs +++ b/irisRefactor/IrisThread/FindEyesTh.cs @@ -73,7 +73,7 @@ { ProMemory.irisConfig.Q3.Push(irisPos); } - if (ProMemory.irisConfig.Key_Assess == 0) + if (ProMemory.irisConfig.Key_Assess == 0 && !ProMemory.isSyning) { ProMemory.irisConfig.Key_Assess = 1; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index ebeff1a..77cac48 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..18d9be3 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -93,15 +93,15 @@ else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { - if (ProMemory.tempRegion == 2) - { + //if (ProMemory.tempRegion == 2) + //{ if (hasPermisson) successPass(); else successsNoPower(); - } - else - successsNoPower(); + //} + //else + //successsNoPower(); } else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) diff --git a/irisRefactor/IrisThread/FindEyesTh.cs b/irisRefactor/IrisThread/FindEyesTh.cs index 633707a..db862ab 100644 --- a/irisRefactor/IrisThread/FindEyesTh.cs +++ b/irisRefactor/IrisThread/FindEyesTh.cs @@ -73,7 +73,7 @@ { ProMemory.irisConfig.Q3.Push(irisPos); } - if (ProMemory.irisConfig.Key_Assess == 0) + if (ProMemory.irisConfig.Key_Assess == 0 && !ProMemory.isSyning) { ProMemory.irisConfig.Key_Assess = 1; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index ebeff1a..77cac48 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 3986e68..b2bc5c3 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..18d9be3 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -93,15 +93,15 @@ else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { - if (ProMemory.tempRegion == 2) - { + //if (ProMemory.tempRegion == 2) + //{ if (hasPermisson) successPass(); else successsNoPower(); - } - else - successsNoPower(); + //} + //else + //successsNoPower(); } else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) diff --git a/irisRefactor/IrisThread/FindEyesTh.cs b/irisRefactor/IrisThread/FindEyesTh.cs index 633707a..db862ab 100644 --- a/irisRefactor/IrisThread/FindEyesTh.cs +++ b/irisRefactor/IrisThread/FindEyesTh.cs @@ -73,7 +73,7 @@ { ProMemory.irisConfig.Q3.Push(irisPos); } - if (ProMemory.irisConfig.Key_Assess == 0) + if (ProMemory.irisConfig.Key_Assess == 0 && !ProMemory.isSyning) { ProMemory.irisConfig.Key_Assess = 1; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index ebeff1a..77cac48 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 3986e68..b2bc5c3 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.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index 0f66a7d..c908d54 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..18d9be3 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -93,15 +93,15 @@ else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { - if (ProMemory.tempRegion == 2) - { + //if (ProMemory.tempRegion == 2) + //{ if (hasPermisson) successPass(); else successsNoPower(); - } - else - successsNoPower(); + //} + //else + //successsNoPower(); } else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) diff --git a/irisRefactor/IrisThread/FindEyesTh.cs b/irisRefactor/IrisThread/FindEyesTh.cs index 633707a..db862ab 100644 --- a/irisRefactor/IrisThread/FindEyesTh.cs +++ b/irisRefactor/IrisThread/FindEyesTh.cs @@ -73,7 +73,7 @@ { ProMemory.irisConfig.Q3.Push(irisPos); } - if (ProMemory.irisConfig.Key_Assess == 0) + if (ProMemory.irisConfig.Key_Assess == 0 && !ProMemory.isSyning) { ProMemory.irisConfig.Key_Assess = 1; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index ebeff1a..77cac48 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 3986e68..b2bc5c3 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.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index 0f66a7d..c908d54 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 92bb869..c4da8e5 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 0dff098..c7bc255 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 4db3402..b456cb0 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 ccd37e1..ba9da73 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/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index 7212112..3ca10b3 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 ebeff1a..77cac48 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 3986e68..b2bc5c3 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 8aaef0b..ebe67e4 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -272,7 +272,7 @@ MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); try { @@ -471,6 +471,12 @@ cmd.Parameters.AddWithValue("@ID", permission.Id); cmd.ExecuteNonQuery(); + sql = "delete from acs_permission where DOOR_CODE=@DOOR_CODE AND PERSON_ID = @PERSON_ID"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.AddWithValue("@DOOR_CODE", permission.DoorCode); + cmd.Parameters.AddWithValue("@PERSON_ID", permission.PersonId); + cmd.ExecuteNonQuery(); + sql = "insert into acs_permission (ID,DOOR_CODE,PERSON_ID,STRATEGY_ID,CREATE_TIME,CREATE_USER) values" + "(@var0,@var1,@var2,@var3,@var4,@var5)"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 9e72dc2..1559d99 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 8c73388..fd1cf15 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 80d90fd..a4fc0af 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index afca324..97f7bcc 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 75059fb..b61c520 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -42,8 +42,8 @@ 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 diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 40952c2..ffa5359 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index b4c4d3e..e572799 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 03d234b..2aab2fa 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,7 +36,7 @@ D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\bin\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9a66faf..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -275,12 +275,12 @@ } } - + private void stopGrabbing() { int nRet = m_pOperator.StopGrabbing(); - if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; - else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image = null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive.Image = null; ProMemory.m_bGrabbing = false; } diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..18d9be3 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -93,15 +93,15 @@ else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { - if (ProMemory.tempRegion == 2) - { + //if (ProMemory.tempRegion == 2) + //{ if (hasPermisson) successPass(); else successsNoPower(); - } - else - successsNoPower(); + //} + //else + //successsNoPower(); } else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) diff --git a/irisRefactor/IrisThread/FindEyesTh.cs b/irisRefactor/IrisThread/FindEyesTh.cs index 633707a..db862ab 100644 --- a/irisRefactor/IrisThread/FindEyesTh.cs +++ b/irisRefactor/IrisThread/FindEyesTh.cs @@ -73,7 +73,7 @@ { ProMemory.irisConfig.Q3.Push(irisPos); } - if (ProMemory.irisConfig.Key_Assess == 0) + if (ProMemory.irisConfig.Key_Assess == 0 && !ProMemory.isSyning) { ProMemory.irisConfig.Key_Assess = 1; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index ebeff1a..77cac48 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 3986e68..b2bc5c3 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.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index 0f66a7d..c908d54 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 92bb869..c4da8e5 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 a1aea34..6832735 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.pdb +++ b/irisRefactor/obj/x86/Debug/irisRefactor.pdb Binary files differ