rc

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java

@@ -11,6 +11,10 @@ public class MarkerExploreWay implements Serializable {
 
     private String infoId;
     private String type;//卡片类型,
+    /**
+     * @see MarkerPoiTypeEnum
+     */
+    private String poiType;
     private String sn;
     private MarkerLocation location;//位置信息
     private int direction;//方位角度
@@ -21,8 +25,9 @@ public class MarkerExploreWay implements Serializable {
     private String cityName;//:"城市名称",
     private double distance;//距离
     private MarkerUserInfo userInfo;//用户信息
-    private String poiType;
     private List<MarkerExploreWayItem> items;//视频地址和图片地址
+    //上报类型：1-用户上报，2-后台上报 3-三方上报
+    private String uploadType;
 
     public String getAddr() {
         if (TextUtils.isEmpty(addr)) {
@@ -123,35 +128,48 @@ public class MarkerExploreWay implements Serializable {
         this.userInfo = userInfo;
     }
 
-    public String getPoiType() {
-        return poiType;
-    }
-
-
     public String getInfoId() {
         return infoId;
     }
 
-    public MarkerExploreWay setInfoId( String infoId ) {
+    public void setInfoId(String infoId) {
         this.infoId = infoId;
-        return this;
+    }
+
+    public String getPoiType() {
+        return poiType;
+    }
+
+    public void setPoiType(String poiType) {
+        this.poiType = poiType;
+    }
+
+    public String getUploadType() {
+        return uploadType;
+    }
+
+    public void setUploadType(String uploadType) {
+        this.uploadType = uploadType;
     }
 
     @Override
     public String toString() {
         return "MarkerExploreWay{" +
-                "addr='" + addr + '\'' +
-                ", canLive=" + canLive +
-                ", cityName='" + cityName + '\'' +
-                ", direction=" + direction +
-                ", distance=" + distance +
-                ", fileType=" + fileType +
-                ", generateTime=" + generateTime +
-                ", items=" + items +
-                ", location=" + location +
+                "type='" + type + '\'' +
+                ", infoId='" + infoId + '\'' +
+                ", poiType='" + poiType + '\'' +
                 ", sn='" + sn + '\'' +
-                ", type='" + type + '\'' +
+                ", location=" + location +
+                ", direction=" + direction +
+                ", canLive=" + canLive +
+                ", fileType=" + fileType +
+                ", addr='" + addr + '\'' +
+                ", generateTime=" + generateTime +
+                ", cityName='" + cityName + '\'' +
+                ", distance=" + distance +
                 ", userInfo=" + userInfo +
+                ", items=" + items +
+                ", uploadType='" + uploadType + '\'' +
                 '}';
     }
 }