Changeset 25

Timestamp:

Nov 19, 2012, 2:08:02 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Základní čtení logů z přístupového terminálu.

Location:

trunk

Files:

• ChronIS.lpr (modified) (1 diff)
• Languages/ChronIS.cs.po (modified) (2 diffs)
• Languages/ChronIS.po (modified) (2 diffs)
• Modules/Attendance/UAttendance.pas (modified) (1 diff)
• Modules/Attendance/UModuleAttendance.pas (modified) (6 diffs)
• Modules/ChiyuAccessControlers/UTerminalBF630.pas (modified) (12 diffs)

trunk/ChronIS.lpr

@@ -23 +23 @@
 
 begin
-  Application.Title:='ChronIS';
   {$IFDEF DEBUG}
   // Heap trace

trunk/Languages/ChronIS.cs.po

@@ -472 +472 @@
 msgstr "Záznam"
 
+#: umoduleattendance.slogcount
+msgid "Log count: "
+msgstr ""
+
 #: umoduleattendance.slogin
 msgctxt "umoduleattendance.slogin"
@@ -558 +562 @@
 
 #: umoduleattendance.susersread
-msgid "User read: %s"
+msgid "User read: "
 msgstr ""
 

trunk/Languages/ChronIS.po

@@ -450 +450 @@
 msgstr ""
 
+#: umoduleattendance.slogcount
+msgid "Log count: "
+msgstr ""
+
 #: umoduleattendance.slogin
 msgctxt "umoduleattendance.slogin"
@@ -536 +540 @@
 
 #: umoduleattendance.susersread
-msgid "User read: %s"
+msgid "User read: "
 msgstr ""
 

trunk/Modules/Attendance/UAttendance.pas

@@ -44 +44 @@
   TUserPassage = class
     Id: Integer;
-    Terminal: TTerminal;
-    User: TUser;
+    Terminal: Integer; //TTerminal;
+    User: Integer; //TUser;
     Time: TDateTime;
-    Operation: TOperation;
+    Operation: Integer; //TOperation;
   end;
 

trunk/Modules/Attendance/UModuleAttendance.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UModularSystem, UFormList, UFormEdit, Controls,
-  SpecializedList, Forms, ActnList, Menus, UDataModel, Dialogs, SpecializedDictionary;
+  SpecializedList, Forms, ActnList, Menus, UDataModel, Dialogs,
+  SpecializedDictionary, USqlDatabase;
 
 type
@@ -102 +103 @@
   SHoliday = 'Holiday';
   SLog = 'Log';
-  SUsersRead = 'User read: %s';
+  SUsersRead = 'User read: ';
+  SLogCount = 'Log count: ';
 
 { TDataModuleAttendance }
@@ -112 +114 @@
   UserCount: Integer;
   UserRec: TUser;
+  Passage: TUserPassage;
+  PassageCount: Integer;
   Data: TDictionaryStringString;
   I: Integer;
@@ -118 +122 @@
   UserRec := nil;
   AccessControler := nil;
+  Passage := nil;
   try
     VirtualAccessControler := TVirtualTerminalBF630.Create;
@@ -123 +128 @@
     VirtualAccessControler.Active := True;
 
+    Data := TDictionaryStringString.Create;
+
     AccessControler := TTerminalBF630.Create;
     AccessControler.Active := True;
     UserCount := AccessControler.GetUserCount;
-
-    UserRec := TUser.Create;
-    Data := TDictionaryStringString.Create;
+    //ShowMessage(SUsersRead + IntToStr(UserCount));
+
+    (*UserRec := TUser.Create;
     for I := 0 to UserCount - 1 do begin
       Data.Clear;
@@ -135 +142 @@
       Data.Add('SecondName', UserRec.SecondName);
       Core.Database.Insert('User', Data);
-    end;
-    ShowMessage(SUsersRead + IntToStr(UserCount));
+    end; *)
+
+    PassageCount := AccessControler.GetPassageCount;
+    //ShowMessage(SLogCount + IntToStr(PassageCount));
+
+    Passage := TUserPassage.Create;
+    for I := 0 to PassageCount - 1 do begin
+      Data.Clear;
+      AccessControler.GetPassage(I, Passage);
+      Data.Add('Terminal', IntToStr(Passage.Terminal));
+      Data.Add('Operation', IntToStr(Passage.Operation));
+      Data.Add('Time', DateTimeToSQL(Passage.Time));
+      Data.Add('User', IntToStr(Passage.User));
+      Core.Database.Insert('Passage', Data);
+    end;
+
   finally
     if Assigned(Data) then Data.Free;
     if Assigned(UserRec) then UserRec.Free;
+    if Assigned(Passage) then Passage.Free;
     if Assigned(AccessControler) then AccessControler.Free;
     VirtualAccessControler.Free;

trunk/Modules/ChiyuAccessControlers/UTerminalBF630.pas

@@ -81 +81 @@
     function ReadDateTime: TDateTime;
     function GetUserCount: Integer; override;
-    function GetUser(Id: Integer; User: TUser): Boolean; override;
+    function GetUser(Index: Integer; User: TUser): Boolean; override;
+    function GetPassageCount: Integer; override;
+    function GetPassage(Index: Integer; Passage: TUserPassage): Boolean; override;
     constructor Create; override;
     destructor Destroy; override;
@@ -106 +108 @@
   end;
 
+  TVirtualTerminalBF630Passage = class
+    Id: Integer;
+    Time: TDateTime;
+    User: Integer;
+    Key: Integer;
+  end;
+
   { TVirtualTerminalBF630 }
 
@@ -116 +125 @@
     function CommandGetUserIDList(Request: TListByte; Response: TListByte): Byte;
     function CommandGetUserData(Request: TListByte; Response: TListByte): Byte;
+    function CommandLogGet(Request: TListByte; Response: TListByte): Byte;
+    function CommandLogGetCount(Request: TListByte; Response: TListByte): Byte;
     procedure SetActive(AValue: Boolean);
     procedure NewConnection(Sender: TCommTCPServer; Pin: TCommPin);
@@ -121 +132 @@
   public
     Users: TListObject; // TListObject<TVirtualTerminalBF630User>
+    Passages: TListObject; // TListObject<TVirtualTerminalBF630Passage>
     Sessions: TListObject; // TListObject<TVirtualTerminalBF630Session>
     AccessKey: array[0..5] of Byte;
@@ -198 +210 @@
         else if Command = Byte(toGetDate) then ResultCode := CommandReadDate(Request, Response)
         else if Command = Byte(toUserDataGet) then ResultCode := CommandGetUserData(Request, Response)
+        else if Command = Byte(toLogGet) then ResultCode := CommandLogGet(Request, Response)
+        else if Command = Byte(toLogGetCount) then ResultCode := CommandLogGetCount(Request, Response)
         else ResultCode := ResultCodeUnknownCommand;
 
@@ -314 +328 @@
 end;
 
+function TVirtualTerminalBF630.CommandLogGet(Request: TListByte;
+  Response: TListByte): Byte;
+var
+  UserId: Integer;
+  RequestSerializer: TBinarySerializer;
+  ResponseSerializer: TBinarySerializer;
+  I: Integer;
+  Day, Month, Year: Word;
+  MSec, Sec, Min, Hour: Word;
+  FunctionKey: Integer;
+begin
+  try
+    RequestSerializer := TBinarySerializer.Create;
+    RequestSerializer.List := Request;
+    //UserId := RequestSerializer.ReadInteger;
+
+    ResponseSerializer := TBinarySerializer.Create;
+    ResponseSerializer.List := Response;
+    DecodeDateTime(TVirtualTerminalBF630Passage(Passages[0]).Time,
+      Year, Month, Day, Hour, Min, Sec, MSec);
+    with ResponseSerializer do begin
+      WriteByte(Sec);
+      WriteByte(Min);
+      WriteByte(Hour);
+      WriteByte(Day);
+      WriteByte(Month);
+      WriteByte(Year mod 100);
+      WriteByte(0);
+      WriteByte(0);
+      WriteByte(0);
+      WriteByte(TVirtualTerminalBF630Passage(Passages[0]).Key);
+      WriteInteger(TVirtualTerminalBF630Passage(Passages[0]).User);
+      WriteByte(0);
+      WriteByte(0);
+    end;
+  finally
+    RequestSerializer.Free;
+    ResponseSerializer.Free;
+  end;
+end;
+
+function TVirtualTerminalBF630.CommandLogGetCount(Request: TListByte;
+  Response: TListByte): Byte;
+var
+  ResponseSerializer: TBinarySerializer;
+begin
+  try
+    ResponseSerializer := TBinarySerializer.Create;
+    ResponseSerializer.List := Response;
+    ResponseSerializer.WriteInteger(Passages.Count);
+    Result := ResultCodeSuccess;
+  finally
+    ResponseSerializer.Free;
+  end;
+end;
+
 procedure TVirtualTerminalBF630.SetActive(AValue: Boolean);
 begin
@@ -356 +426 @@
     SecondName := 'Second ' + IntToStr(Id);
   end;
+  with TVirtualTerminalBF630Passage(Passages.AddNew(TVirtualTerminalBF630Passage.Create)) do begin
+    Id := Passages.Count;
+    Time := Now;
+    User := 1;
+    Key := 2;
+  end;
 end;
 
@@ -362 +438 @@
   Sessions := TListObject.Create;
   Users := TListObject.Create;
+  Passages := TListObject.Create;
   CommSocket := TCommTCPServer.Create(nil);
   CommSocket.Address := 'localhost';
@@ -374 +451 @@
   FreeAndNil(CommSocket);
   FreeAndNil(Users);
+  FreeAndNil(Passages);
   FreeAndNil(Sessions);
   inherited Destroy;
@@ -550 +628 @@
 end;
 
-function TTerminalBF630.GetUser(Id: Integer; User: TUser): Boolean;
+function TTerminalBF630.GetUser(Index: Integer; User: TUser): Boolean;
 var
   Request: TListByte;
@@ -564 +642 @@
     RequestSerializer := TBinarySerializer.Create;
     RequestSerializer.List := Request;
-    RequestSerializer.WriteInteger(Id);
+    RequestSerializer.WriteInteger(Index);
     SendPacket(toUserDataGet, Request, Response);
     if Response[0] <> Id then raise Exception.Create(SWrongId);
@@ -581 +659 @@
 
   finally
+    Request.Free;
+    RequestSerializer.Free;
+    Response.Free;
+  end;
+end;
+
+function TTerminalBF630.GetPassageCount: Integer;
+var
+  Response: TListByte;
+  ResponseSerializer: TBinarySerializer;
+begin
+  try
+    Response := TListByte.Create;
+    ResponseSerializer := TBinarySerializer.Create;
+    ResponseSerializer.List := Response;
+    SendPacket(toLogGetCount, nil, Response);
+    Result := ResponseSerializer.ReadInteger;
+  finally
+    Response.Free;
+  end;
+end;
+
+function TTerminalBF630.GetPassage(Index: Integer; Passage: TUserPassage): Boolean;
+var
+  Request: TListByte;
+  RequestSerializer: TBinarySerializer;
+  Response: TListByte;
+  ResponseSerializer: TBinarySerializer;
+  I: Integer;
+  Title: Integer;
+  Department: Integer;
+  Sec, Min, Hour: Byte;
+  Day, Month, Year: Byte;
+  FunctionKey: BYte;
+  Verify: Byte;
+  UserId: Integer;
+  InOutIndication: Byte;
+  VerificationSource: Byte;
+begin
+  try
+    Response := TListByte.Create;
+    ResponseSerializer := TBinarySerializer.Create;
+    ResponseSerializer.List := Response;
+    Request := TListByte.Create;
+    RequestSerializer := TBinarySerializer.Create;
+    RequestSerializer.List := Request;
+    //RequestSerializer.WriteInteger(Id);
+    SendPacket(toLogGet, Request, Response);
+    with ResponseSerializer do begin
+      Sec := ReadByte;
+      Min := ReadByte;
+      Hour := ReadByte;
+      Day := ReadByte;
+      Month := ReadByte;
+      Year := ReadByte;
+      InOutIndication := ReadByte;
+      VerificationSource := ReadByte;
+      Verify := ReadByte;
+      FunctionKey := ReadByte;
+      UserId := ReadInteger;
+    end;
+
+    Passage.Terminal := Id;
+    Passage.Time := EncodeDateTime(2000 + Year, Month, Day, Hour, Min, Sec, 0);
+    Passage.Operation := FunctionKey;
+    Passage.User := UserId;
+  finally
+    ResponseSerializer.Free;
     Request.Free;
     RequestSerializer.Free;