diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 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/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -276,7 +275,15 @@ } } - + + 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.Image = null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -276,7 +275,15 @@ } } - + + 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.Image = null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index b45f659..ed4fb39 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -94,6 +127,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -148,6 +182,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -178,6 +213,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -205,23 +241,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) @@ -480,65 +500,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -276,7 +275,15 @@ } } - + + 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.Image = null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index b45f659..ed4fb39 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -94,6 +127,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -148,6 +182,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -178,6 +213,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -205,23 +241,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) @@ -480,65 +500,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successPass(); - else - successsNoPower(); - } - else - successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -276,7 +275,15 @@ } } - + + 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.Image = null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index b45f659..ed4fb39 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -94,6 +127,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -148,6 +182,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -178,6 +213,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -205,23 +241,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) @@ -480,65 +500,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successPass(); - else - successsNoPower(); - } - else - successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/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/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -276,7 +275,15 @@ } } - + + 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.Image = null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index b45f659..ed4fb39 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -94,6 +127,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -148,6 +182,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -178,6 +213,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -205,23 +241,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) @@ -480,65 +500,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successPass(); - else - successsNoPower(); - } - else - successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/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/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..aa78495 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } @@ -164,4 +169,4 @@ } -} +} \ No newline at end of file diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -276,7 +275,15 @@ } } - + + 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.Image = null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index b45f659..ed4fb39 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -94,6 +127,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -148,6 +182,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -178,6 +213,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -205,23 +241,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) @@ -480,65 +500,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successPass(); - else - successsNoPower(); - } - else - successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/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/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..aa78495 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } @@ -164,4 +169,4 @@ } -} +} \ No newline at end of file diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..8e1913f 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 00c745c..91e58af 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 16c60b0..61955ae 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/SettingConfig/ConfigMethod.cs b/IrisSetting/SettingConfig/ConfigMethod.cs index b978178..ea4a0b3 100644 --- a/IrisSetting/SettingConfig/ConfigMethod.cs +++ b/IrisSetting/SettingConfig/ConfigMethod.cs @@ -29,7 +29,7 @@ config.Save(); } - #region nomerol + #region nomerol常规设置 public static ConfigModel GetConfigModel() { ConfigModel configModel = new ConfigModel(); configModel.FormType = GetAppConfig("formType"); @@ -119,7 +119,7 @@ } #endregion - #region db + #region db数据库设置 public static DbConfig GetDbConfig() { DbConfig dbConfig = new DbConfig(); @@ -180,7 +180,7 @@ } #endregion - #region temp + #region temp参数设置 public static TempConfig GetTempConfig() { TempConfig tempConfig = new TempConfig(); tempConfig.Correction = GetAppConfig("correction"); diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache index e584193..fb99a24 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD d20411b1d56d2d4b2fca144bbc57eac64c682ad1 +======= +4eb94c05385d528aee9b8041e6a07aa8cb20e767 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/bin/Debug/irisRefactor.exe.config b/bin/Debug/irisRefactor.exe.config index 4921d0f..14771a1 100644 --- a/bin/Debug/irisRefactor.exe.config +++ b/bin/Debug/irisRefactor.exe.config @@ -88,6 +88,7 @@ + diff --git a/irisDataBase/IrisDataBaseObject.cs b/irisDataBase/IrisDataBaseObject.cs index eff9183..8dce2d5 100644 --- a/irisDataBase/IrisDataBaseObject.cs +++ b/irisDataBase/IrisDataBaseObject.cs @@ -15,20 +15,20 @@ { case "IrisDataService": /*obj = sqlType == "1" - ? (Object)new UserService_MysqlImpl() - : (Object)new UserService_SqliteImpl();*/ + ? (Object)new IrisDataService_MysqlImpl() + : (Object)new IrisDataService_SqliteImpl();*/ obj = (Object)new IrisDataServiceImpl(); break; case "IrisPersonView": /*obj = sqlType == "1" - ? (Object)new UserIrisService_MysqlImpl() - : (Object)new UserIrisService_SqliteImpl();*/ + ? (Object)new IrisPersonViewService_MysqlImpl() + : (Object)new IrisPersonViewService_SqliteImpl();*/ obj = (Object)new IrisPersonViewServiceImpl(); break; case "IrisRecords": /*obj = sqlType == "1" - ? (Object)new IrisDataCollService_MysqlImpl() - : (Object)new IrisDataCollService_SqliteImpl();*/ + ? (Object)new IrisRecordsServiceImpl_MysqlImpl() + : (Object)new IrisRecordsServiceImpl_SqliteImpl();*/ obj = (Object)new IrisRecordsServiceImpl(); break; case "IrisSynchData": diff --git a/irisDataBase/Model/Permission.cs b/irisDataBase/Model/Permission.cs index 8b905a0..1f87b97 100644 --- a/irisDataBase/Model/Permission.cs +++ b/irisDataBase/Model/Permission.cs @@ -14,11 +14,82 @@ DateTime createTime; long createUser; - public int Id { get => id; set => id = value; } - public string DoorCode { get => doorCode; set => doorCode = value; } - public long PersonId { get => personId; set => personId = value; } - public int StrategyId { get => strategyId; set => strategyId = value; } - public DateTime CreateTime { get => createTime; set => createTime = value; } - public long CreateUser { get => createUser; set => createUser = value; } + public int Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string DoorCode + { + get + { + return doorCode; + } + + set + { + doorCode = value; + } + } + + public long PersonId + { + get + { + return personId; + } + + set + { + personId = value; + } + } + + public int StrategyId + { + get + { + return strategyId; + } + + set + { + strategyId = value; + } + } + + public DateTime CreateTime + { + get + { + return createTime; + } + + set + { + createTime = value; + } + } + + public long CreateUser + { + get + { + return createUser; + } + + set + { + createUser = value; + } + } } } diff --git a/irisDataBase/Model/Person.cs b/irisDataBase/Model/Person.cs index 2b7664f..2876768 100644 --- a/irisDataBase/Model/Person.cs +++ b/irisDataBase/Model/Person.cs @@ -25,22 +25,225 @@ DateTime birthday; string cardType; - public long Id { get => id; set => id = value; } - public string Delflag { get => delflag; set => delflag = value; } - public DateTime Createtime { get => createtime; set => createtime = value; } - public DateTime Updatetime { get => updatetime; set => updatetime = value; } - public string Name { get => name; set => name = value; } - public string Sex { get => sex; set => sex = value; } - public long Deptid { get => deptid; set => deptid = value; } - public string IdCardNo { get => idCardNo; set => idCardNo = value; } - public string Remarks { get => remarks; set => remarks = value; } - public string PersonType { get => personType; set => personType = value; } - public string PersonCode { get => personCode; set => personCode = value; } - public string Photo { get => photo; set => photo = value; } - public string OprationId { get => oprationId; set => oprationId = value; } - public string Duty { get => duty; set => duty = value; } - public string Nation { get => nation; set => nation = value; } - public DateTime Birthday { get => birthday; set => birthday = value; } - public string CardType { get => cardType; set => cardType = value; } + public long Id + { + get + { + return id; + } + + set + { + id = value; + } + } + + public string Delflag + { + get + { + return delflag; + } + + set + { + delflag = value; + } + } + + public DateTime Createtime + { + get + { + return createtime; + } + + set + { + createtime = value; + } + } + + public DateTime Updatetime + { + get + { + return updatetime; + } + + set + { + updatetime = value; + } + } + + public string Name + { + get + { + return name; + } + + set + { + name = value; + } + } + + public string Sex + { + get + { + return sex; + } + + set + { + sex = value; + } + } + + public long Deptid + { + get + { + return deptid; + } + + set + { + deptid = value; + } + } + + public string IdCardNo + { + get + { + return idCardNo; + } + + set + { + idCardNo = value; + } + } + + public string Remarks + { + get + { + return remarks; + } + + set + { + remarks = value; + } + } + + public string PersonType + { + get + { + return personType; + } + + set + { + personType = value; + } + } + + public string PersonCode + { + get + { + return personCode; + } + + set + { + personCode = value; + } + } + + public string Photo + { + get + { + return photo; + } + + set + { + photo = value; + } + } + + public string OprationId + { + get + { + return oprationId; + } + + set + { + oprationId = value; + } + } + + public string Duty + { + get + { + return duty; + } + + set + { + duty = value; + } + } + + public string Nation + { + get + { + return nation; + } + + set + { + nation = value; + } + } + + public DateTime Birthday + { + get + { + return birthday; + } + + set + { + birthday = value; + } + } + + public string CardType + { + get + { + return cardType; + } + + set + { + cardType = value; + } + } } } diff --git a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs index fd3c7b1..8714b70 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPermisionServiceImpl.cs @@ -23,12 +23,13 @@ if (!authConfig.HasOpenDoorAuthority) return false; else { - if (!authConfig.DoorDt.NeedPermisson) return true; - int open = isAlwaysOpen(devCode,out doorCode,out inoutType); + int open = isAlwaysOpen(devCode, out doorCode, out inoutType); + if (open == 0) return false; else if (open == 1) return true; else { + if (!authConfig.DoorDt.NeedPermisson) return true; blDoor = isPermissionLocal(personId, devCode, out doorCode, out inoutType); return blDoor; } @@ -350,4 +351,4 @@ } } -} +} \ No newline at end of file diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 95e86dc..5583e5e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -152,9 +152,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { @@ -274,7 +272,13 @@ int re = -1; MySqlTransaction tx = null; MySqlCommand cmd = new MySqlCommand(); +<<<<<<< HEAD +======= + + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "data= " + data); + +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd try { tx = DatabaseLocal.mySqlConnect.BeginTransaction(); @@ -502,6 +506,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.csproj.CoreCompileInputs.cache b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache index ed4e616..79df8a5 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5494ce1ee1e066d9a97ea6f23ce6793fb8f9d0be +======= +0a8b2c15e7d6b95a1091664a4a1272388f39c309 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache index c6ecb0a..6225bc6 100644 --- a/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache +++ b/irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 5cdbc8112efacba5e9958e274fbe99a53b351207 +======= +8c1d0fbd46575b7b68ef85c1b0d0534dd2c23ddd +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index e8aee93..c488971 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD b84f2c01d10a56b095d034c2b44d856266d8e662 +======= +cf6d1f949bcc2cb90b9b11e55c1fb252914d8e30 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index 7a46541..3f34ced 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CoreCompileInputs.cache @@ -54,3 +55,5 @@ E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache +======= +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache index b1e6c1c..e0b5cb7 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD bbebfab681a2b160f3f0e40e9c1b63de854a9a7e +======= +269030d871c630a6f213fad35c3afefd8df83761 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache index e45b028..9ebba9a 100644 --- a/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache +++ b/irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 500c43d39556ddc74f06ecc30920364033e2d6f4 +======= +dddd180e6f6e0c03cc3aa5a8f61e988d2912f726 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache index b9f173e..66e7ab8 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache +++ b/irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD c3386d76ffb09acdbab83cae17e792740f9e162d +======= +50190877eac238823d94832845512a39c6ac1900 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 0b32424..a2386bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -36,13 +36,16 @@ 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 +<<<<<<< HEAD E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\bin\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb E:\Develop\IRIS_REFACTOR\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +======= +D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 4921d0f..14771a1 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -88,6 +88,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..5f00fce 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -276,7 +275,15 @@ } } - + + 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.Image = null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index b45f659..ed4fb39 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -62,6 +62,36 @@ } } + private string GetHostIPv4() + { + String ip = ""; + + IPHostEntry hostEntry = Dns.GetHostEntry(Dns.GetHostName()); + + if (hostEntry.AddressList.Length > 0) + { + foreach (IPAddress ipAddr in hostEntry.AddressList) + { + if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + ip= ipAddr.ToString(); + } + + } + } + + return ip; + } + + private void writeIpConfig() + { + String ip = GetHostIPv4(); + + ConfigHelper.UpdateAppConfig("hostIp", ip); + + ProMemory.hostIp = ConfigHelper.GetAppConfig("hostIp"); + } + private void ReceiveMessage(object clientSocket) { Socket myClientSocket = (Socket)clientSocket; @@ -70,6 +100,9 @@ byte[] buffer = new byte[1024]; MemoryStream ms = new MemoryStream(); + + writeIpConfig(); + try { while ((length = myClientSocket.Receive(buffer)) > 0) @@ -79,7 +112,7 @@ ms.Flush(); byte[] result = ms.ToArray(); string msg = Encoding.UTF8.GetString(result, 0, result.Length); - + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令..."); @@ -94,6 +127,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -148,6 +182,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -178,6 +213,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -205,23 +241,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的更新授权数据..."); dataFromServer = msg; - //ProMemory.isSyning = true; - - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form1.GetInstance().ReInitializeToSleep(); - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "更新数据库中，请稍候..."; - // Form2.GetInstance().ReInitializeToSleep(); - //} - + //同步数据库 updateDatabaseFromServer(); if (updatePermissionResult != 0) @@ -480,65 +500,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/IrisSound/PlaySound.cs b/irisRefactor/IrisSound/PlaySound.cs index 46a02b1..9a67278 100644 --- a/irisRefactor/IrisSound/PlaySound.cs +++ b/irisRefactor/IrisSound/PlaySound.cs @@ -81,41 +81,34 @@ break; } } - else { - if (ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp - && !ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson) - { - if (ProMemory.tempRegion == 2) - successTempNormalPass(); - else - successTempAbnormalNoPass(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson - && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) - { - if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successPass(); - else - successsNoPower(); - } - else - successsNoPower(); - } - else if (ProMemory.appConfig.AuthConfig.DoorDt.NeedPermisson + else + { + if (!hasPermisson && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) { if (ProMemory.tempRegion == 2) - { - if (hasPermisson) - successTempNormalPass(); - else - successTempNormalNoPower(); - } + successTempNormalNoPower(); else successTempAbnormalNoPass(); } + else if (hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successPass(); + } + else if (hasPermisson + && ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + if (ProMemory.tempRegion == 2) + successTempNormalPass(); + else + successTempAbnormalNoPass(); + } + else if (!hasPermisson + && !ProMemory.appConfig.AuthConfig.DoorDt.CheckTemp) + { + successsNoPower(); + } } } @@ -182,9 +175,7 @@ : new SoundPlayer(wavTempPath + "successTempNormalNoPowerEng.wav"); player1.Play(); } - - public static void failedTempNormalPayCard() { SoundPlayer player1 = ProMemory.appConfig.Language == 1 diff --git a/irisRefactor/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/ProMemory.cs b/irisRefactor/ProMemory.cs index 615f249..aa78495 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -77,9 +77,11 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); + cameraController = CameraController.GetInstance(); - GetHostIPv4(); + //GetHostIPv4(); + hostIp = ConfigHelper.GetAppConfig("hostIp"); //嵌入式电脑I/O口初始化 IoControllService.initIO(); @@ -153,7 +155,10 @@ { if (ipAddr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) { - hostIp = ipAddr.ToString(); + //hostIp = ipAddr.ToString(); + String ip = ipAddr.ToString(); + if (ip != null && ip != "") + ConfigHelper.UpdateAppConfig("hostIp", ip); break; } @@ -164,4 +169,4 @@ } -} +} \ No newline at end of file diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b0b3da1..8e1913f 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache index e064912..2d29972 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 0f9829905c7764f5eafb77c9188e5314390a031d +======= +e4e7e67a6d824fe268c49d53bb15a3e3cbfa1ef2 +>>>>>>> e33a728d9113b5b2df861d2241e7961171ec80fd