Merge remote-tracking branch 'origin/master'

src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java

@@ -0,0 +1,59 @@
+package com.ycwl.basic.model.pc.device.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("device_config")
+public class DeviceConfigEntity {
+    private Long id;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+    /**
+     * 启用时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    /**
+     * 存储类型
+     */
+    private Integer storeType;
+    /**
+     * 存储配置
+     */
+    private String storeConfigJson;
+    /**
+     * 存储过期天数
+     */
+    private Integer storeExpireDay;
+    /**
+     * 检测设备是否在线
+     */
+    private Integer onlineCheck;
+    /**
+     * 检测设备是否在线最大间隔
+     */
+    private Integer onlineMaxInterval;
+    /**
+     * 切割时，取人脸前多少秒的视频
+     */
+    private BigDecimal cutPre;
+    /**
+     * 切割时，取人脸后多少秒的视频
+     */
+    private BigDecimal cutPost;
+}

src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -27,6 +28,14 @@ public class DeviceEntity {
      * 设备编号
      */
     private String no;
+    /**
+     * 经度
+     */
+    private BigDecimal longitude;
+    /***
+     * 纬度
+     */
+    private BigDecimal latitude;
     /**
      * 是否启用，0不启用，1启用
      */
@@ -35,6 +44,8 @@ public class DeviceEntity {
      * 是否在线，0不在线，1在线
      */
     private Integer online;
+    private String ipAddr;
+    private Date keepaliveAt;
     private Date createAt;
     private Date updateAt;
 }

src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -22,6 +23,10 @@ public class DeviceRespVO {
     private String name;
     @ApiModelProperty("设备编号")
     private String no;
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
     @ApiModelProperty("是否启用，0不启用，1启用")
     private Integer status;
     @ApiModelProperty("是否在线，0不在线，1在线")

src/main/java/com/ycwl/basic/model/pc/face/entity/FaceEntity.java

@@ -16,6 +16,7 @@ import java.util.Date;
 public class FaceEntity {
     @TableId
     private Long id;
+    private Long scenicId;
     /**
      * 人脸得分
      */

src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java

@@ -16,6 +16,8 @@ import java.util.Date;
 @Data
 @ApiModel("人脸查询参数")
 public class FaceReqQuery extends BaseQueryParameterReq {
+    @ApiModelProperty("景区id")
+    private Long scenicId;
     @ApiModelProperty("会员id")
     private Long memberId;
     @ApiModelProperty("用户上传的人脸照片")

src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java

@@ -18,6 +18,7 @@ import java.util.Date;
 @ApiModel(value = "订单查询对象")
 public class OrderReqQuery extends BaseQueryParameterReq {
     private Long id;
+    private Long scenicId;
     private Long memberId;
     @ApiModelProperty("用户昵称")
     private String memberNickname;

src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java

@@ -102,4 +102,6 @@ public class OrderRespVO {
     private Date refundAt;
     @ApiModelProperty("订单明细")
     private List<OrderItemVO> orderItemList;
+    private Long scenicId;
+    private String scenicName;
 }

src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java

@@ -38,4 +38,21 @@ public class ScenicConfigEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
+
+    /**
+     * 预约流程，1-预约，2-在线，3-全部
+     */
+    private Integer bookRoutine;
+    /**
+     * 样本保存时间
+     */
+    private Integer sampleStoreDay;
+    /**
+     * 视频保存时间
+     */
+    private Integer videoStoreDay;
+    /**
+     * 最大行程时长
+     */
+    private Integer maxJourneyHour;
 }

src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAddOrUpdateReq.java

@@ -1,7 +1,6 @@
 package com.ycwl.basic.model.pc.scenic.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -78,8 +77,6 @@ public class ScenicAddOrUpdateReq {
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
-    @ApiModelProperty("景区配置")
-    private ScenicConfigEntity scenicConfig;
     @ApiModelProperty("景区源素材价格，元")
     private BigDecimal price;
 

src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java

@@ -79,13 +79,11 @@ public class ScenicRespVO {
      * 状态 1启用0关闭
      */
     @ApiModelProperty("状态 1启用0关闭")
-    private String status;
+    private Integer status;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
-    @ApiModelProperty("景区配置")
-    private ScenicConfigEntity scenicConfig;
     @ApiModelProperty("景区源素材价格，元")
     private BigDecimal price;
     @ApiModelProperty("镜头数")

src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java

@@ -30,6 +30,10 @@ public class SourceEntity {
      * 所属用户
      */
     private Long memberId;
+    /**
+     * 人脸样本id
+     */
+    private Long faceSampleId;
     /**
      * 原素材类型：1视频，2图像
      */

src/main/java/com/ycwl/basic/model/pc/template/entity/TemplateConfigEntity.java

@@ -0,0 +1,16 @@
+package com.ycwl.basic.model.pc.template.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("template_config")
+public class TemplateConfigEntity {
+    private Long id;
+    private Long templateId;
+    private Integer isDefault;
+    private Date createDate;
+    private Integer minimalPlaceholderFill;
+}

src/main/java/com/ycwl/basic/model/viid/entity/DeviceIdObject.java

@@ -0,0 +1,14 @@
+package com.ycwl.basic.model.viid.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DeviceIdObject implements Serializable {
+
+    @JsonProperty("DeviceID")
+    private String deviceId;
+
+}

src/main/java/com/ycwl/basic/model/viid/entity/FaceListObject.java

@@ -0,0 +1,12 @@
+package com.ycwl.basic.model.viid.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FaceListObject {
+    @JsonProperty("FaceObject")
+    private List<FaceObject> faceObject;
+}

src/main/java/com/ycwl/basic/model/viid/entity/FaceObject.java

@@ -0,0 +1,169 @@
+package com.ycwl.basic.model.viid.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class FaceObject {
+    @JsonProperty("FaceID")
+    private String FaceID;
+    @JsonProperty("InfoKind")
+    private Integer InfoKind;
+    @JsonProperty("SourceID")
+    private String SourceID;
+    @JsonProperty("DeviceID")
+    private String DeviceID;
+    @JsonProperty("LeftTopX")
+    private Integer LeftTopX;
+    @JsonProperty("LeftTopY")
+    private Integer LeftTopY;
+    @JsonProperty("RightBtmX")
+    private Integer RightBtmX;
+    @JsonProperty("RightBtmY")
+    private Integer RightBtmY;
+    @JsonProperty("IDNumber")
+    private String IDNumber;
+    @JsonProperty("Name")
+    private String Name;
+    @JsonProperty("UsedName")
+    private String UsedName;
+    @JsonProperty("Alias")
+    private String Alias;
+    @JsonProperty("AgeUpLimit")
+    private Integer AgeUpLimit;
+    @JsonProperty("AgeLowerLimit")
+    private Integer AgeLowerLimit;
+    @JsonProperty("EthicCode")
+    private String EthicCode;
+    @JsonProperty("NationalityCode")
+    private String NationalityCode;
+    @JsonProperty("NativeCityCode")
+    private String NativeCityCode;
+    @JsonProperty("ResidenceAdminDivision")
+    private String ResidenceAdminDivision;
+    @JsonProperty("ChineseAccentCode")
+    private String ChineseAccentCode;
+    @JsonProperty("JobCategory")
+    private String JobCategory;
+    @JsonProperty("AccompanyNumber")
+    private Integer AccompanyNumber;
+    @JsonProperty("SkinColor")
+    private String SkinColor;
+    @JsonProperty("FaceStyle")
+    private String FaceStyle;
+    @JsonProperty("FacialFeature")
+    private String FacialFeature;
+    @JsonProperty("PhysicalFeature")
+    private String PhysicalFeature;
+    @JsonProperty("IsDriver")
+    private Integer IsDriver;
+    @JsonProperty("IsForeigner")
+    private Integer IsForeigner;
+    @JsonProperty("ImmigrantTypeCode")
+    private String ImmigrantTypeCode;
+    @JsonProperty("IsSuspectedTerrorist")
+    private Integer IsSuspectedTerrorist;
+    @JsonProperty("SuspectedTerroristNumber")
+    private String SuspectedTerroristNumber;
+    @JsonProperty("IsCriminalInvolved")
+    private Integer IsCriminalInvolved;
+    @JsonProperty("CriminalInvolvedSpecilisationCode")
+    private String CriminalInvolvedSpecilisationCode;
+    @JsonProperty("BodySpeciallMark")
+    private String BodySpeciallMark;
+    @JsonProperty("CrimeMethod")
+    private String CrimeMethod;
+    @JsonProperty("CrimeCharacterCode")
+    private String CrimeCharacterCode;
+    @JsonProperty("EscapedCriminalNumber")
+    private String EscapedCriminalNumber;
+    @JsonProperty("IsDetainees")
+    private Integer IsDetainees;
+    @JsonProperty("DetentionHouseCode")
+    private String DetentionHouseCode;
+    @JsonProperty("DetaineesSpecialIdentity")
+    private String DetaineesSpecialIdentity;
+    @JsonProperty("MemberTypeCode")
+    private String MemberTypeCode;
+    @JsonProperty("IsVictim")
+    private String IsVictim;
+    @JsonProperty("VictimType")
+    private String VictimType;
+    @JsonProperty("CorpseConditionCode")
+    private String CorpseConditionCode;
+    @JsonProperty("IsSuspiciousPerson")
+    private String IsSuspiciousPerson;
+    @JsonProperty("Attitude")
+    private String Attitude;
+    @JsonProperty("Similaritydegree")
+    private String Similaritydegree;
+    @JsonProperty("EyebrowStyle")
+    private String EyebrowStyle;
+    @JsonProperty("NoseStyle")
+    private String NoseStyle;
+    @JsonProperty("MustacheStyle")
+    private String MustacheStyle;
+    @JsonProperty("LipStyle")
+    private String LipStyle;
+    @JsonProperty("WrinklePouch")
+    private String WrinklePouch;
+    @JsonProperty("AcneStain")
+    private String AcneStain;
+    @JsonProperty("FreckleBirthmark")
+    private String FreckleBirthmark;
+    @JsonProperty("ScarDimple")
+    private String ScarDimple;
+    @JsonProperty("TabID")
+    private String TabID;
+    @JsonProperty("OtherFeature")
+    private String OtherFeature;
+    @JsonProperty("Maritalstatus")
+    private String Maritalstatus;
+    @JsonProperty("FamilyAddress")
+    private String FamilyAddress;
+    @JsonProperty("CollectorOrg")
+    private String CollectorOrg;
+    @JsonProperty("CollectorID")
+    private String CollectorID;
+    @JsonProperty("DeviceSNNo")
+    private String DeviceSNNo;
+    @JsonProperty("APSId")
+    private String APSId;
+    @JsonProperty("LocationMarkTime")
+    private String LocationMarkTime;
+    @JsonProperty("FaceAppearTime")
+    private String FaceAppearTime;
+    @JsonProperty("FaceDisAppearTime")
+    private String FaceDisAppearTime;
+    @JsonProperty("ShotTime")
+    private String ShotTime;
+    @JsonProperty("IDType")
+    private String IDType;
+    @JsonProperty("GenderCode")
+    private String GenderCode;
+    @JsonProperty("HairStyle")
+    private String HairStyle;
+    @JsonProperty("HairColor")
+    private String HairColor;
+    @JsonProperty("RespiratorColor")
+    private String RespiratorColor;
+    @JsonProperty("CapStyle")
+    private String CapStyle;
+    @JsonProperty("CapColor")
+    private String CapColor;
+    @JsonProperty("GlassStyle")
+    private String GlassStyle;
+    @JsonProperty("GlassColor")
+    private String GlassColor;
+    @JsonProperty("PassportType")
+    private String PassportType;
+    @JsonProperty("DetaineesIdentity")
+    private String DetaineesIdentity;
+    @JsonProperty("InjuredDegree")
+    private String InjuredDegree;
+    @JsonProperty("EntryTime")
+    private String EntryTime;
+    @JsonProperty("SubImageList")
+    private SubImageList subImageList;
+
+}

src/main/java/com/ycwl/basic/model/viid/entity/ResponseStatusObject.java

@@ -0,0 +1,21 @@
+package com.ycwl.basic.model.viid.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ResponseStatusObject {
+
+    @JsonProperty("Id")
+    private String id;
+    @JsonProperty("RequestURL")
+    private String requestUrl;
+    @JsonProperty("StatusCode")
+    private String statusCode;
+    @JsonProperty("StatusString")
+    private String statusString;
+    @JsonProperty("LocalTime")
+    private String localTime;
+}

src/main/java/com/ycwl/basic/model/viid/entity/SubImageInfoObject.java

@@ -0,0 +1,28 @@
+package com.ycwl.basic.model.viid.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class SubImageInfoObject {
+    @JsonProperty("ImageID")
+    private String ImageID;
+    @JsonProperty("EventSort")
+    private Integer EventSort;
+    @JsonProperty("DeviceID")
+    private String DeviceID;
+    @JsonProperty("StoragePath")
+    private String StoragePath;
+    @JsonProperty("Type")
+    private String Type;
+    @JsonProperty("FileFormat")
+    private String FileFormat;
+    @JsonProperty("Width")
+    private String Width;
+    @JsonProperty("Height")
+    private String Height;
+    @JsonProperty("ShotTime")
+    private String ShotTime;
+    @JsonProperty("Data")
+    private String Data;
+}

src/main/java/com/ycwl/basic/model/viid/entity/SubImageList.java

@@ -0,0 +1,13 @@
+package com.ycwl.basic.model.viid.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SubImageList {
+
+    @JsonProperty("SubImageInfoObject")
+    private List<SubImageInfoObject> subImageInfoObject;
+}

src/main/java/com/ycwl/basic/model/viid/entity/SystemTimeObject.java

@@ -0,0 +1,18 @@
+package com.ycwl.basic.model.viid.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SystemTimeObject {
+    @JsonProperty("VIIDServerID")
+    private String viidServerId;
+    @JsonProperty("TimeMode")
+    private String timeMode;
+    @JsonProperty("LocalTime")
+    private String localTime;
+    @JsonProperty("TimeZone")
+    private String timezone;
+}

src/main/java/com/ycwl/basic/model/viid/req/FaceUploadReq.java

@@ -0,0 +1,11 @@
+package com.ycwl.basic.model.viid.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ycwl.basic.model.viid.entity.FaceListObject;
+import lombok.Data;
+
+@Data
+public class FaceUploadReq {
+    @JsonProperty("FaceListObject")
+    private FaceListObject faceListObject;
+}

src/main/java/com/ycwl/basic/model/viid/req/KeepaliveReq.java

@@ -0,0 +1,11 @@
+package com.ycwl.basic.model.viid.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ycwl.basic.model.viid.entity.DeviceIdObject;
+import lombok.Data;
+
+@Data
+public class KeepaliveReq {
+    @JsonProperty("KeepaliveObject")
+    private DeviceIdObject keepaliveObject;
+}

src/main/java/com/ycwl/basic/model/viid/req/RegisterReq.java

@@ -0,0 +1,11 @@
+package com.ycwl.basic.model.viid.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ycwl.basic.model.viid.entity.DeviceIdObject;
+import lombok.Data;
+
+@Data
+public class RegisterReq {
+    @JsonProperty("RegisterObject")
+    private DeviceIdObject registerObject;
+}

src/main/java/com/ycwl/basic/model/viid/req/UnRegisterReq.java

@@ -0,0 +1,12 @@
+package com.ycwl.basic.model.viid.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ycwl.basic.model.viid.entity.DeviceIdObject;
+import lombok.Data;
+
+@Data
+public class UnRegisterReq {
+
+    @JsonProperty("UnRegisterObject")
+    private DeviceIdObject unRegisterObject;
+}

src/main/java/com/ycwl/basic/model/viid/resp/SystemTimeResp.java

@@ -0,0 +1,13 @@
+package com.ycwl.basic.model.viid.resp;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ycwl.basic.model.viid.entity.SystemTimeObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SystemTimeResp {
+    @JsonProperty("SystemTimeObject")
+    private SystemTimeObject systemTimeObject;
+}

src/main/java/com/ycwl/basic/model/viid/resp/VIIDBaseResp.java

@@ -0,0 +1,15 @@
+package com.ycwl.basic.model.viid.resp;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ycwl.basic.model.viid.entity.ResponseStatusObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class VIIDBaseResp {
+
+    @JsonProperty("ResponseStatusObject")
+    private ResponseStatusObject responseStatusObject;
+
+}