diff --git a/.vs/DevicePolling/v16/.suo b/.vs/DevicePolling/v16/.suo index 591ef0d..d16a51e 100644 Binary files a/.vs/DevicePolling/v16/.suo and b/.vs/DevicePolling/v16/.suo differ diff --git a/DevicePolling/Attendance/AttendanceDAO.cs b/DevicePolling/Attendance/AttendanceDAO.cs index 5708fba..aed3331 100644 --- a/DevicePolling/Attendance/AttendanceDAO.cs +++ b/DevicePolling/Attendance/AttendanceDAO.cs @@ -54,7 +54,7 @@ namespace ZktecoAttendenceService // Start building the INSERT statement - StringBuilder queryBuilder = new StringBuilder("INSERT INTO attendance_log (ac_no, checktime, processed, machine_id, in_out_type_id, machine_ip, date) VALUES "); + StringBuilder queryBuilder = new StringBuilder("INSERT IGNORE INTO attendance_log (ac_no, checktime, processed, machine_id, in_out_type_id, machine_ip, date) VALUES "); // Add each record as a value List rows = new List(); diff --git a/DevicePolling/MachineUsers/AttendanceMachineUserDAO.cs b/DevicePolling/MachineUsers/AttendanceMachineUserDAO.cs index 7563709..f7ff8bf 100644 --- a/DevicePolling/MachineUsers/AttendanceMachineUserDAO.cs +++ b/DevicePolling/MachineUsers/AttendanceMachineUserDAO.cs @@ -112,7 +112,7 @@ namespace ZktecoAttendenceService return responses; } - bool Bconnect = false; + // bool Bconnect = false; public void DeleteFaceTemplate(zkemkeeper.CZKEMClass axCZKEM1, AttendanceMachine machine, int Emp_ID, List responses) { //Bconnect = axCZKEM1.Connect_Net(machine.MachineIp, machine.PortNumber); @@ -120,8 +120,7 @@ namespace ZktecoAttendenceService try { - if (Bconnect == true) - { + axCZKEM1.SSR_DeleteEnrollData(Convert.ToInt32(machine.MachineId), Emp_ID.ToString(), 12); Console.WriteLine(Emp_ID + " removed from " + machine.MachineId); @@ -131,11 +130,7 @@ namespace ZktecoAttendenceService //axCZKEM1.EnableDevice(Convert.ToInt32(machine.MachineId), true); //axCZKEM1.Disconnect(); - } - else - { - - } + } diff --git a/DevicePolling/Polling.cs b/DevicePolling/Polling.cs index 81c36a1..90d82ae 100644 --- a/DevicePolling/Polling.cs +++ b/DevicePolling/Polling.cs @@ -65,8 +65,7 @@ namespace ZktecoAttendenceService { try { - - + List responses = new List(); AttendanceMachineDAO attendanceMachineDAO = new AttendanceMachineDAO(); AttendanceMachineUserDAO attendanceMachineUserDAO = new AttendanceMachineUserDAO(); @@ -78,9 +77,11 @@ namespace ZktecoAttendenceService var machines = attendanceMachineDAO.getAttendanceMachines(connection, "0"); foreach (var machine in machines) - { + { + + // if ((machine.MachineIp == "172.16.53.4") || (machine.MachineIp == "172.16.53.9")) // For lahore warehouse - if (machine.MachineIp == "192.168.50.8") + // if (machine.MachineIp == "192.168.90.191") // For lahore warehouse { bool isConnected = axCZKEM1.Connect_Net(machine.MachineIp, Convert.ToInt32(machine.PortNumber)); if (isConnected) @@ -139,7 +140,7 @@ namespace ZktecoAttendenceService } else { - responses.Add("MACHINE : " + machine.MachineIp + " : NOT CONNECTED"); + responses.Add("MACHINE : " + machine.MachineIp + " : NOT CONNECTED"); machine.Status = "NOT CONNECTED"; attendanceMachineDAO.update(machine, connection); } @@ -273,9 +274,9 @@ namespace ZktecoAttendenceService - //if(axCZKEM1.ReadGeneralLogData(machineId)) + if(axCZKEM1.ReadGeneralLogData(machineId)) - if (axCZKEM1.ReadAllGLogData(machineId)) + // if (axCZKEM1.ReadAllGLogData(machineId)) // Connect and read attendance records //if (axCZKEM1.ReadTimeGLogData(machineId, startTimeFormatted, endTimeFormatted)) // read all the attendance records into memory diff --git a/DevicePolling/bin/Debug/DevicePolling.exe b/DevicePolling/bin/Debug/DevicePolling.exe index fa7c0c8..891d727 100644 Binary files a/DevicePolling/bin/Debug/DevicePolling.exe and b/DevicePolling/bin/Debug/DevicePolling.exe differ diff --git a/DevicePolling/bin/Debug/DevicePolling.pdb b/DevicePolling/bin/Debug/DevicePolling.pdb index 6f727dd..e0df392 100644 Binary files a/DevicePolling/bin/Debug/DevicePolling.pdb and b/DevicePolling/bin/Debug/DevicePolling.pdb differ diff --git a/DevicePolling/obj/Debug/DevicePolling.exe b/DevicePolling/obj/Debug/DevicePolling.exe index fa7c0c8..891d727 100644 Binary files a/DevicePolling/obj/Debug/DevicePolling.exe and b/DevicePolling/obj/Debug/DevicePolling.exe differ diff --git a/DevicePolling/obj/Debug/DevicePolling.pdb b/DevicePolling/obj/Debug/DevicePolling.pdb index 6f727dd..e0df392 100644 Binary files a/DevicePolling/obj/Debug/DevicePolling.pdb and b/DevicePolling/obj/Debug/DevicePolling.pdb differ diff --git a/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.AssemblyReference.cache b/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.AssemblyReference.cache index 5bc59b2..25d2111 100644 Binary files a/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.AssemblyReference.cache and b/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.AssemblyReference.cache differ diff --git a/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.FileListAbsolute.txt b/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.FileListAbsolute.txt index da140ca..7fb8f14 100644 --- a/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.FileListAbsolute.txt +++ b/DevicePolling/obj/Debug/ZktecoAttendenceService.csproj.FileListAbsolute.txt @@ -1,17 +1,13 @@ -D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.DevicePolling.resources -D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\DevicePolling.Properties.Resources.resources -D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.csproj.GenerateResource.cache -D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.csproj.CoreCompileInputs.cache -D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\DevicePolling.exe.config D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\DevicePolling.exe D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\DevicePolling.pdb +D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\MySql.Data.dll +D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\DevicePolling.exe.config D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\BouncyCastle.Cryptography.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\Google.Protobuf.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\K4os.Compression.LZ4.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\K4os.Compression.LZ4.Streams.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\K4os.Hash.xxHash.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll -D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\MySql.Data.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\System.Buffers.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\System.Configuration.ConfigurationManager.dll D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\System.Diagnostics.DiagnosticSource.dll @@ -36,7 +32,11 @@ D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\System.Memory.xml D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\System.Numerics.Vectors.xml D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml D:\Projects\ZktecoAttendenceService\DevicePolling\bin\Debug\System.Threading.Tasks.Extensions.xml +D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.csproj.AssemblyReference.cache +D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.DevicePolling.resources +D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\DevicePolling.Properties.Resources.resources +D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.csproj.GenerateResource.cache +D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.csproj.CoreCompileInputs.cache D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.csproj.CopyComplete D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\DevicePolling.exe D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\DevicePolling.pdb -D:\Projects\ZktecoAttendenceService\DevicePolling\obj\Debug\ZktecoAttendenceService.csproj.AssemblyReference.cache