Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Accident.java

@@ -52,6 +52,11 @@ public class Accident extends BaseEntity {
      */
     private String roadId;
 
+    /**
+     * 公路编码
+     */
+    private String roadCode;
+
     /**
      * 路段ID
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/query/AccidentQuery.java

@@ -0,0 +1,50 @@
+package com.tuoheng.admin.query;
+
+import com.tuoheng.common.core.common.BaseQuery;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author ChengWang
+ * @Date 2023/3/7
+ */
+@Data
+public class AccidentQuery extends BaseQuery {
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     *公路编号
+     */
+    private String code;
+
+    /**
+     * 部门名称
+     */
+    private String name;
+
+    /**
+     *起始日期
+     */
+    private String startTime;
+
+    /**
+     *结束日期
+     */
+    private String endTime;
+
+    /**
+     * 起始日期
+     */
+    private Date accidentStartTime;
+
+    /**
+     * 结束日期
+     */
+    private Date accidentEndTime;
+
+}

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/accident/QueryAccidentPageRequest.java

@@ -0,0 +1,39 @@
+package com.tuoheng.admin.request.accident;
+
+import com.tuoheng.common.core.common.BaseQuery;
+import lombok.Data;
+
+/**
+ * @Author ChengWang
+ * @Date 2023/3/7
+ */
+@Data
+public class QueryAccidentPageRequest extends BaseQuery {
+
+    /**
+     * 公路代号
+     */
+    private String code;
+
+    /**
+     * 监管部门
+     */
+    private String name;
+
+    /**
+     *是否有伤亡：0:无；1：有
+     */
+    private String isCasualties;
+
+    /**
+     * 事故类型
+     */
+    private String questionName;
+
+    /**
+     * 事故状态：1未处理 2处理中 3已忽略 4已处理
+     */
+    private Integer status;
+
+
+}

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/AirWeatherVO.java

@@ -25,9 +25,9 @@ public class AirWeatherVO implements Serializable {
     @Data
     public static class ACDDTO {
         private ParmDTO parm;
-        private Integer mid;
+        private Double mid;
         private String deviceid;
-        private Integer timestamp;
+        private Double timestamp;
 
         @NoArgsConstructor
         @Data
@@ -41,9 +41,9 @@ public class AirWeatherVO implements Serializable {
     public static class WTHDTO {
         private ParmDTO parm;
         private ParmNewDTO parmNew;
-        private Integer mid;
+        private Double mid;
         private String deviceid;
-        private Integer timestamp;
+        private Double timestamp;
 
         @NoArgsConstructor
         @Data
@@ -83,9 +83,9 @@ public class AirWeatherVO implements Serializable {
     @Data
     public static class TAHDTO {
         private ParmDTO parm;
-        private Integer mid;
+        private Double mid;
         private String deviceid;
-        private Integer timestamp;
+        private Double timestamp;
 
         @NoArgsConstructor
         @Data