From 229db022122d8e0dfd3d9019013e1fa43f1435ab Mon Sep 17 00:00:00 2001
From: dlcios <dlcios@163.com>
Date: Wed, 22 Nov 2023 15:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=97=B6=E9=97=B4=E7=A6=BB?=
 =?UTF-8?q?=E5=BC=80=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/visitor.go                |  8 ++++----
 internal/model/visitor_record.go | 21 +++++++++++++++++++++
 internal/service/visitor.go      |  3 +--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/api/v1/visitor.go b/api/v1/visitor.go
index cbb828e..f8bdfee 100644
--- a/api/v1/visitor.go
+++ b/api/v1/visitor.go
@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/gogf/gf/v2/frame/g"
-	"vistor/internal/model/entity"
+	"vistor/internal/model"
 )
 
 type VisitorAccessReq struct {
@@ -54,7 +54,7 @@ type VisitorListReq struct {
 
 type VisitorListRes struct {
 	g.Meta  `mime:"text/html" example:"string"`
-	List    []*entity.VisitorRecord `json:"list"`
-	Current int                     `json:"current"`
-	Total   int                     `json:"total"`
+	List    []*model.VisitorRecord `json:"list"`
+	Current int                    `json:"current"`
+	Total   int                    `json:"total"`
 }
diff --git a/internal/model/visitor_record.go b/internal/model/visitor_record.go
index 1528b69..9ad42d5 100644
--- a/internal/model/visitor_record.go
+++ b/internal/model/visitor_record.go
@@ -1,6 +1,27 @@
 package model
 
+import "github.com/gogf/gf/v2/os/gtime"
+
 type ResRecord struct {
 	XAxis string `json:"x_axis,omitempty"`
 	YAxis string `json:"y_axis,omitempty"`
 }
+
+// VisitorRecord is the golang structure for table visitor_record.
+type VisitorRecord struct {
+	Id                uint        `json:"id"                ` // 自增id
+	VisitorName       string      `json:"visitorName"       ` // 访客姓名
+	VisitorIdentity   string      `json:"visitorIdentity"   ` // 访客身份证号码
+	VisitorPhone      string      `json:"visitorPhone"      ` // 访客手机号
+	VisitorDepartment string      `json:"visitorDepartment" ` // 来访单位
+	DstDepartment     string      `json:"dstDepartment"     ` // 拜访人部门
+	DstName           string      `json:"dstName"           ` // 拜访人姓名
+	DstLocation       string      `json:"dstLocation"       ` // 地址（楼宇和层数）
+	Reason            string      `json:"reason"            ` // 来访事由
+	VehicleNumber     string      `json:"vehicleNumber"     ` // 车牌号码
+	Remark            string      `json:"remark"            ` // 备注
+	LeftAt            *gtime.Time `json:"leftAt"            ` // 离场时间
+	VisitAt           *gtime.Time `json:"visitAt"           ` // 拜访时间
+	CreatedAt         *gtime.Time `json:"createdAt"         ` // 创建时间
+	UpdatedAt         *gtime.Time `json:"updatedAt"         ` // 更新时间
+}
diff --git a/internal/service/visitor.go b/internal/service/visitor.go
index a55375c..042c8fc 100644
--- a/internal/service/visitor.go
+++ b/internal/service/visitor.go
@@ -12,7 +12,6 @@ import (
 	"vistor/internal/consts"
 	"vistor/internal/dao"
 	"vistor/internal/model"
-	"vistor/internal/model/entity"
 )
 
 type visitorService struct{}
@@ -32,7 +31,7 @@ type IVisitor interface {
 
 func (s *visitorService) VisitorList(ctx context.Context, req *v1.VisitorListReq) (res *v1.VisitorListRes, err error) {
 	condition := g.Map{}
-	var records []*entity.VisitorRecord
+	var records []*model.VisitorRecord
 
 	if req.PageNum == 0 {
 		req.PageNum = 1