TRX 1 ano atrás
pai
commit
3374655d73

+ 18 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/VisitorMainModel.java

@@ -1,7 +1,6 @@
 package com.zhongshu.card.client.model.visitor;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.devices.DeviceInfoModel;
 import com.zhongshu.card.client.model.devices.DeviceInfoSimpleModel;
 import com.zhongshu.card.client.model.org.OrganizationUserSimpleModel;
 import com.zhongshu.card.client.model.org.UserCountSimpleModel;
@@ -12,7 +11,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author TRX
@@ -103,4 +104,20 @@ public class VisitorMainModel extends SuperModel {
     @Schema(description = "设备列表")
     private List<DeviceInfoSimpleModel> deviceInfos = new ArrayList<>();
 
+    @Schema(description = "第一次访问时间")
+    private Long firstVisitTime;
+
+    @Schema(description = "到访部门")
+    private String departments = "";
+
+    @Schema(description = "到访单位")
+    private String unit;
+
+    @Schema(description = "说明")
+    private String visitorRemark;
+
+    @Schema(description = "到访地址")
+    private String visitAddress;
+
+    private Map<String, Object> meatInfo = new HashMap<>();
 }

+ 15 - 2
FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/VisitorMainParam.java

@@ -3,8 +3,8 @@ package com.zhongshu.card.client.model.visitor;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author TRX
@@ -48,4 +48,17 @@ public class VisitorMainParam {
     @Schema(description = "访问时间长")
     private Long minutes;
 
+    @Schema(description = "到访部门")
+    private String departments = "";
+
+    @Schema(description = "到访单位")
+    private String unit;
+
+    @Schema(description = "说明")
+    private String visitorRemark;
+
+    @Schema(description = "到访地址")
+    private String visitAddress;
+
+    private Map<String, Object> meatInfo = new HashMap<>();
 }

+ 15 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/VisitorMain.java

@@ -15,7 +15,9 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 访客主信息
@@ -133,4 +135,17 @@ public class VisitorMain extends SuperMain {
     @Schema(description = "第一次访问时间")
     private Long firstVisitTime;
 
+    @Schema(description = "到访部门")
+    private String departments = "";
+
+    @Schema(description = "到访单位")
+    private String unit;
+
+    @Schema(description = "说明")
+    private String visitorRemark;
+
+    @Schema(description = "到访地址")
+    private String visitAddress;
+
+    private Map<String, Object> meatInfo = new HashMap<>();
 }