diff --git a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs index ad52576..12af1cf 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs @@ -79,7 +79,7 @@ if (!aReader.IsDBNull(8)) { string base64 = aReader.GetString(8); - base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 + base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/bmp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 byte[] bytes = Convert.FromBase64String(base64); MemoryStream ms = new MemoryStream(bytes); Image mImage = Image.FromStream(ms); diff --git a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs index ad52576..12af1cf 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs @@ -79,7 +79,7 @@ if (!aReader.IsDBNull(8)) { string base64 = aReader.GetString(8); - base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 + base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/bmp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 byte[] bytes = Convert.FromBase64String(base64); MemoryStream ms = new MemoryStream(bytes); Image mImage = Image.FromStream(ms); diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 62e660b..cc9461e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -383,22 +383,26 @@ //finger_data表 List fingerDataList = JsonConvert.DeserializeObject>(json["finger_data"].ToString()); - foreach (FingerData fingerData in fingerDataList) + if (fingerDataList.Count > 0 ) { - string sql = "delete from finger_data where ID=@FINGER_ID"; + // 删除旧的指纹数据 + string sql = "delete from finger_data where PERSON_ID=@PERSON_ID"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); - cmd.Parameters.AddWithValue("@FINGER_ID", fingerData.Id); + cmd.Parameters.AddWithValue("@PERSON_ID", fingerDataList[0].PersonId); cmd.ExecuteNonQuery(); - sql = "insert into finger_data (ID, PERSON_ID, FINGER_TEMPLATE, FINGER_LENGTH) values" - + "(@var0,@var1,@var2,@var3)"; - cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); - cmd.Parameters.Clear(); - cmd.Parameters.AddWithValue("@var0", fingerData.Id); - cmd.Parameters.AddWithValue("@var1", fingerData.PersonId); - cmd.Parameters.AddWithValue("@var2", fingerData.FingerTemplate); - cmd.Parameters.AddWithValue("@var3", fingerData.FingerLength); - cmd.ExecuteNonQuery(); + foreach (FingerData fingerData in fingerDataList) + { + sql = "insert into finger_data (ID, PERSON_ID, FINGER_TEMPLATE, FINGER_LENGTH) values" + + "(@var0,@var1,@var2,@var3)"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.Clear(); + cmd.Parameters.AddWithValue("@var0", fingerData.Id); + cmd.Parameters.AddWithValue("@var1", fingerData.PersonId); + cmd.Parameters.AddWithValue("@var2", fingerData.FingerTemplate); + cmd.Parameters.AddWithValue("@var3", fingerData.FingerLength); + cmd.ExecuteNonQuery(); + } } //sys_dept表 diff --git a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs index ad52576..12af1cf 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs @@ -79,7 +79,7 @@ if (!aReader.IsDBNull(8)) { string base64 = aReader.GetString(8); - base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 + base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/bmp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 byte[] bytes = Convert.FromBase64String(base64); MemoryStream ms = new MemoryStream(bytes); Image mImage = Image.FromStream(ms); diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 62e660b..cc9461e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -383,22 +383,26 @@ //finger_data表 List fingerDataList = JsonConvert.DeserializeObject>(json["finger_data"].ToString()); - foreach (FingerData fingerData in fingerDataList) + if (fingerDataList.Count > 0 ) { - string sql = "delete from finger_data where ID=@FINGER_ID"; + // 删除旧的指纹数据 + string sql = "delete from finger_data where PERSON_ID=@PERSON_ID"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); - cmd.Parameters.AddWithValue("@FINGER_ID", fingerData.Id); + cmd.Parameters.AddWithValue("@PERSON_ID", fingerDataList[0].PersonId); cmd.ExecuteNonQuery(); - sql = "insert into finger_data (ID, PERSON_ID, FINGER_TEMPLATE, FINGER_LENGTH) values" - + "(@var0,@var1,@var2,@var3)"; - cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); - cmd.Parameters.Clear(); - cmd.Parameters.AddWithValue("@var0", fingerData.Id); - cmd.Parameters.AddWithValue("@var1", fingerData.PersonId); - cmd.Parameters.AddWithValue("@var2", fingerData.FingerTemplate); - cmd.Parameters.AddWithValue("@var3", fingerData.FingerLength); - cmd.ExecuteNonQuery(); + foreach (FingerData fingerData in fingerDataList) + { + sql = "insert into finger_data (ID, PERSON_ID, FINGER_TEMPLATE, FINGER_LENGTH) values" + + "(@var0,@var1,@var2,@var3)"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.Clear(); + cmd.Parameters.AddWithValue("@var0", fingerData.Id); + cmd.Parameters.AddWithValue("@var1", fingerData.PersonId); + cmd.Parameters.AddWithValue("@var2", fingerData.FingerTemplate); + cmd.Parameters.AddWithValue("@var3", fingerData.FingerLength); + cmd.ExecuteNonQuery(); + } } //sys_dept表 diff --git a/irisRefactor/FrmService/Form1.Designer.cs b/irisRefactor/FrmService/Form1.Designer.cs index dc76efe..3ec32c3 100644 --- a/irisRefactor/FrmService/Form1.Designer.cs +++ b/irisRefactor/FrmService/Form1.Designer.cs @@ -499,7 +499,6 @@ public System.Windows.Forms.Label temp_text_label; public System.Windows.Forms.Label temp_hl_label; public System.Windows.Forms.Label label2; - //private AxMC_DISPLib.AxMC_DISP axMC_DISP1; public System.Windows.Forms.Panel panel1; public System.Windows.Forms.Label label6; private System.Windows.Forms.PictureBox pic_retry; diff --git a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs index ad52576..12af1cf 100644 --- a/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisPersonViewServiceImpl.cs @@ -79,7 +79,7 @@ if (!aReader.IsDBNull(8)) { string base64 = aReader.GetString(8); - base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 + base64 = base64.Replace("data:image/png;base64,", "").Replace("data:image/bmp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 byte[] bytes = Convert.FromBase64String(base64); MemoryStream ms = new MemoryStream(bytes); Image mImage = Image.FromStream(ms); diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index 62e660b..cc9461e 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -383,22 +383,26 @@ //finger_data表 List fingerDataList = JsonConvert.DeserializeObject>(json["finger_data"].ToString()); - foreach (FingerData fingerData in fingerDataList) + if (fingerDataList.Count > 0 ) { - string sql = "delete from finger_data where ID=@FINGER_ID"; + // 删除旧的指纹数据 + string sql = "delete from finger_data where PERSON_ID=@PERSON_ID"; cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); - cmd.Parameters.AddWithValue("@FINGER_ID", fingerData.Id); + cmd.Parameters.AddWithValue("@PERSON_ID", fingerDataList[0].PersonId); cmd.ExecuteNonQuery(); - sql = "insert into finger_data (ID, PERSON_ID, FINGER_TEMPLATE, FINGER_LENGTH) values" - + "(@var0,@var1,@var2,@var3)"; - cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); - cmd.Parameters.Clear(); - cmd.Parameters.AddWithValue("@var0", fingerData.Id); - cmd.Parameters.AddWithValue("@var1", fingerData.PersonId); - cmd.Parameters.AddWithValue("@var2", fingerData.FingerTemplate); - cmd.Parameters.AddWithValue("@var3", fingerData.FingerLength); - cmd.ExecuteNonQuery(); + foreach (FingerData fingerData in fingerDataList) + { + sql = "insert into finger_data (ID, PERSON_ID, FINGER_TEMPLATE, FINGER_LENGTH) values" + + "(@var0,@var1,@var2,@var3)"; + cmd = new MySqlCommand(sql, DatabaseLocal.mySqlConnect); + cmd.Parameters.Clear(); + cmd.Parameters.AddWithValue("@var0", fingerData.Id); + cmd.Parameters.AddWithValue("@var1", fingerData.PersonId); + cmd.Parameters.AddWithValue("@var2", fingerData.FingerTemplate); + cmd.Parameters.AddWithValue("@var3", fingerData.FingerLength); + cmd.ExecuteNonQuery(); + } } //sys_dept表 diff --git a/irisRefactor/FrmService/Form1.Designer.cs b/irisRefactor/FrmService/Form1.Designer.cs index dc76efe..3ec32c3 100644 --- a/irisRefactor/FrmService/Form1.Designer.cs +++ b/irisRefactor/FrmService/Form1.Designer.cs @@ -499,7 +499,6 @@ public System.Windows.Forms.Label temp_text_label; public System.Windows.Forms.Label temp_hl_label; public System.Windows.Forms.Label label2; - //private AxMC_DISPLib.AxMC_DISP axMC_DISP1; public System.Windows.Forms.Panel panel1; public System.Windows.Forms.Label label6; private System.Windows.Forms.PictureBox pic_retry; diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj index 8a4b695..3d466bd 100644 --- a/irisRefactor/irisRefactor.csproj +++ b/irisRefactor/irisRefactor.csproj @@ -59,6 +59,13 @@ true + + ..\commonDll\AxInterop.MC_DISPLib.dll + + + ..\commonDll\Interop.MC_DISPLib.dll + True + False bin\x86\Debug\BaslerGigECamera.dll @@ -271,6 +278,7 @@ aximp False +