Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-1030_211020_8.0.14

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java

@@ -10,110 +10,157 @@ import java.io.Serializable;
  * @since: 10/26/21
  */
 public class NoticeTrafficStyleInfo extends BaseData {
-    private String infoId;//事故id
-    private String poiType;//事故类型
-    private long dataCreateTime;//事故发生时间
-    private long dataHandleTime;//事故处理时间
-    private String operaStatus;//事故处理状态
-    private String troubleReasonName;//事故原因
-    private String uploadAddress;//事故地点名称
-    private String troubleTypeName;//事故等级描述
-    private double lat;//纬度
-    private double lon;//经度
+    public NoticeTrafficStyleInfoResult result;
 
-    public String getInfoId() {
-        return infoId;
+    public NoticeTrafficStyleInfoResult getResult() {
+        return result;
     }
 
-    public void setInfoId(String infoId) {
-        this.infoId = infoId;
-    }
-
-    public String getPoiType() {
-        return poiType;
-    }
-
-    public void setPoiType(String poiType) {
-        this.poiType = poiType;
-    }
-
-    public long getDataCreateTime() {
-        return dataCreateTime;
-    }
-
-    public void setDataCreateTime(long dataCreateTime) {
-        this.dataCreateTime = dataCreateTime;
-    }
-
-    public long getDataHandleTime() {
-        return dataHandleTime;
-    }
-
-    public void setDataHandleTime(long dataHandleTime) {
-        this.dataHandleTime = dataHandleTime;
-    }
-
-    public String getOperaStatus() {
-        return operaStatus;
-    }
-
-    public void setOperaStatus(String operaStatus) {
-        this.operaStatus = operaStatus;
-    }
-
-    public String getTroubleReasonName() {
-        return troubleReasonName;
-    }
-
-    public void setTroubleReasonName(String troubleReasonName) {
-        this.troubleReasonName = troubleReasonName;
-    }
-
-    public String getUploadAddress() {
-        return uploadAddress;
-    }
-
-    public void setUploadAddress(String uploadAddress) {
-        this.uploadAddress = uploadAddress;
-    }
-
-    public double getLat() {
-        return lat;
-    }
-
-    public void setLat(double lat) {
-        this.lat = lat;
-    }
-
-    public double getLon() {
-        return lon;
-    }
-
-    public void setLon(double lon) {
-        this.lon = lon;
-    }
-
-    public String getTroubleTypeName() {
-        return troubleTypeName;
-    }
-
-    public void setTroubleTypeName(String troubleTypeName) {
-        this.troubleTypeName = troubleTypeName;
+    public void setResult(NoticeTrafficStyleInfoResult result) {
+        this.result = result;
     }
 
     @Override
     public String toString() {
         return "NoticeTrafficStyleInfo{" +
-                "infoId='" + infoId + '\'' +
-                ", poiType='" + poiType + '\'' +
-                ", dataCreateTime=" + dataCreateTime +
-                ", dataHandleTime=" + dataHandleTime +
-                ", operaStatus='" + operaStatus + '\'' +
-                ", troubleReasonName='" + troubleReasonName + '\'' +
-                ", uploadAddress='" + uploadAddress + '\'' +
-                ", troubleTypeName='" + troubleTypeName + '\'' +
-                ", lat=" + lat +
-                ", lon=" + lon +
+                "result=" + result +
                 '}';
     }
+
+    public class NoticeTrafficAccountInfo implements Serializable{
+        private String infoId;//事故id
+        private String poiType;//事故类型
+        private long dataCreateTime;//事故发生时间
+        private long dataHandleTime;//事故处理时间
+        private String operaStatus;//事故处理状态
+        private String reason;//事故原因
+        private double lon;//经度
+        private double lat;//纬度
+        private String troubleTypeName;//事故等级描述
+        private String uploadType;//事故等级描述
+        private String uploadAddress;//事故地点名称
+        public String getInfoId() {
+            return infoId;
+        }
+
+        public void setInfoId(String infoId) {
+            this.infoId = infoId;
+        }
+
+        public String getPoiType() {
+            return poiType;
+        }
+
+        public void setPoiType(String poiType) {
+            this.poiType = poiType;
+        }
+
+        public long getDataCreateTime() {
+            return dataCreateTime;
+        }
+
+        public void setDataCreateTime(long dataCreateTime) {
+            this.dataCreateTime = dataCreateTime;
+        }
+
+        public long getDataHandleTime() {
+            return dataHandleTime;
+        }
+
+        public void setDataHandleTime(long dataHandleTime) {
+            this.dataHandleTime = dataHandleTime;
+        }
+
+        public String getOperaStatus() {
+            return operaStatus;
+        }
+
+        public void setOperaStatus(String operaStatus) {
+            this.operaStatus = operaStatus;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+
+        public void setReason(String reason) {
+            this.reason = reason;
+        }
+
+        public String getUploadAddress() {
+            return uploadAddress;
+        }
+
+        public void setUploadAddress(String uploadAddress) {
+            this.uploadAddress = uploadAddress;
+        }
+
+        public double getLat() {
+            return lat;
+        }
+
+        public void setLat(double lat) {
+            this.lat = lat;
+        }
+
+        public double getLon() {
+            return lon;
+        }
+
+        public void setLon(double lon) {
+            this.lon = lon;
+        }
+
+        public String getTroubleTypeName() {
+            return troubleTypeName;
+        }
+
+        public void setTroubleTypeName(String troubleTypeName) {
+            this.troubleTypeName = troubleTypeName;
+        }
+
+        public String getUploadType() {
+            return uploadType;
+        }
+
+        public void setUploadType(String uploadType) {
+            this.uploadType = uploadType;
+        }
+
+        @Override
+        public String toString() {
+            return "NoticeTrafficAccountInfo{" +
+                    "infoId='" + infoId + '\'' +
+                    ", poiType='" + poiType + '\'' +
+                    ", dataCreateTime=" + dataCreateTime +
+                    ", dataHandleTime=" + dataHandleTime +
+                    ", operaStatus='" + operaStatus + '\'' +
+                    ", reason='" + reason + '\'' +
+                    ", lon=" + lon +
+                    ", lat=" + lat +
+                    ", troubleTypeName='" + troubleTypeName + '\'' +
+                    ", uploadType='" + uploadType + '\'' +
+                    ", uploadAddress='" + uploadAddress + '\'' +
+                    '}';
+        }
+    }
+
+    public class NoticeTrafficStyleInfoResult implements Serializable{
+        private NoticeTrafficAccountInfo accidentInfo;
+
+        public NoticeTrafficAccountInfo getAccidentInfo() {
+            return accidentInfo;
+        }
+
+        public void setAccidentInfo(NoticeTrafficAccountInfo accidentInfo) {
+            this.accidentInfo = accidentInfo;
+        }
+
+        @Override
+        public String toString() {
+            return "NoticeTrafficStyleInfoResult{" +
+                    "accidentInfo=" + accidentInfo +
+                    '}';
+        }
+    }
 }