diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReportUpdataParam.java b/src/main/java/com/casic/model/ReportUpdataParam.java
new file mode 100644
index 0000000..20c2ca9
--- /dev/null
+++ b/src/main/java/com/casic/model/ReportUpdataParam.java
@@ -0,0 +1,23 @@
+package com.casic.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReportUpdataParam {
+    private String msg_type;
+    private String event_change;
+    private String error_val;
+    private String ch_cnt;
+    private String erro_cnt;
+    private String alarm_low_cnt;
+    private String alarm_high_cnt;
+    private String offline_cnt;
+    private String rtd_val;
+    private String adc_val;
+    private String status_val;
+    private String time;
+}
\ No newline at end of file

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReportUpdataParam.java b/src/main/java/com/casic/model/ReportUpdataParam.java
new file mode 100644
index 0000000..20c2ca9
--- /dev/null
+++ b/src/main/java/com/casic/model/ReportUpdataParam.java
@@ -0,0 +1,23 @@
+package com.casic.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReportUpdataParam {
+    private String msg_type;
+    private String event_change;
+    private String error_val;
+    private String ch_cnt;
+    private String erro_cnt;
+    private String alarm_low_cnt;
+    private String alarm_high_cnt;
+    private String offline_cnt;
+    private String rtd_val;
+    private String adc_val;
+    private String status_val;
+    private String time;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/WirelessData.java b/src/main/java/com/casic/model/WirelessData.java
new file mode 100644
index 0000000..b062c13
--- /dev/null
+++ b/src/main/java/com/casic/model/WirelessData.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class WirelessData {
+    private String model;
+    private String IMEI;
+    private String ICCID;
+    private String sw_ver;
+    private String hw_ver;
+    private String ch_cnt;
+    private String heartbeat_inv;
+    private String up_pcnt;
+    private String up_pcnt_inv;
+    private String csq;
+}
+
+

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReportUpdataParam.java b/src/main/java/com/casic/model/ReportUpdataParam.java
new file mode 100644
index 0000000..20c2ca9
--- /dev/null
+++ b/src/main/java/com/casic/model/ReportUpdataParam.java
@@ -0,0 +1,23 @@
+package com.casic.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReportUpdataParam {
+    private String msg_type;
+    private String event_change;
+    private String error_val;
+    private String ch_cnt;
+    private String erro_cnt;
+    private String alarm_low_cnt;
+    private String alarm_high_cnt;
+    private String offline_cnt;
+    private String rtd_val;
+    private String adc_val;
+    private String status_val;
+    private String time;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/WirelessData.java b/src/main/java/com/casic/model/WirelessData.java
new file mode 100644
index 0000000..b062c13
--- /dev/null
+++ b/src/main/java/com/casic/model/WirelessData.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class WirelessData {
+    private String model;
+    private String IMEI;
+    private String ICCID;
+    private String sw_ver;
+    private String hw_ver;
+    private String ch_cnt;
+    private String heartbeat_inv;
+    private String up_pcnt;
+    private String up_pcnt_inv;
+    private String csq;
+}
+
+
diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index 4591d50..d80102b 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -182,7 +182,7 @@
                     alarmRecordsMapper.updateOldAlarmRecord(dataGasDector.getDevcode(), gasMsgContent);
                     alarmRecord.setJobId(Long.valueOf(jobId));
                 } else {
-                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getStrength(), wellCode, "RQZD", "1");
+                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getDevcode(), wellCode, "RQZD", "1");
                     alarmRecord.setJobId(alarmJob.getId());
                 }
                 alarmRecordsMapper.insert(alarmRecord);

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReportUpdataParam.java b/src/main/java/com/casic/model/ReportUpdataParam.java
new file mode 100644
index 0000000..20c2ca9
--- /dev/null
+++ b/src/main/java/com/casic/model/ReportUpdataParam.java
@@ -0,0 +1,23 @@
+package com.casic.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReportUpdataParam {
+    private String msg_type;
+    private String event_change;
+    private String error_val;
+    private String ch_cnt;
+    private String erro_cnt;
+    private String alarm_low_cnt;
+    private String alarm_high_cnt;
+    private String offline_cnt;
+    private String rtd_val;
+    private String adc_val;
+    private String status_val;
+    private String time;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/WirelessData.java b/src/main/java/com/casic/model/WirelessData.java
new file mode 100644
index 0000000..b062c13
--- /dev/null
+++ b/src/main/java/com/casic/model/WirelessData.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class WirelessData {
+    private String model;
+    private String IMEI;
+    private String ICCID;
+    private String sw_ver;
+    private String hw_ver;
+    private String ch_cnt;
+    private String heartbeat_inv;
+    private String up_pcnt;
+    private String up_pcnt_inv;
+    private String csq;
+}
+
+
diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index 4591d50..d80102b 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -182,7 +182,7 @@
                     alarmRecordsMapper.updateOldAlarmRecord(dataGasDector.getDevcode(), gasMsgContent);
                     alarmRecord.setJobId(Long.valueOf(jobId));
                 } else {
-                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getStrength(), wellCode, "RQZD", "1");
+                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getDevcode(), wellCode, "RQZD", "1");
                     alarmRecord.setJobId(alarmJob.getId());
                 }
                 alarmRecordsMapper.insert(alarmRecord);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4807974..890fffe 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 5907
+  port: 7901
 ###################  spring配置  ###################
 spring:
   datasource:

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReportUpdataParam.java b/src/main/java/com/casic/model/ReportUpdataParam.java
new file mode 100644
index 0000000..20c2ca9
--- /dev/null
+++ b/src/main/java/com/casic/model/ReportUpdataParam.java
@@ -0,0 +1,23 @@
+package com.casic.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReportUpdataParam {
+    private String msg_type;
+    private String event_change;
+    private String error_val;
+    private String ch_cnt;
+    private String erro_cnt;
+    private String alarm_low_cnt;
+    private String alarm_high_cnt;
+    private String offline_cnt;
+    private String rtd_val;
+    private String adc_val;
+    private String status_val;
+    private String time;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/WirelessData.java b/src/main/java/com/casic/model/WirelessData.java
new file mode 100644
index 0000000..b062c13
--- /dev/null
+++ b/src/main/java/com/casic/model/WirelessData.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class WirelessData {
+    private String model;
+    private String IMEI;
+    private String ICCID;
+    private String sw_ver;
+    private String hw_ver;
+    private String ch_cnt;
+    private String heartbeat_inv;
+    private String up_pcnt;
+    private String up_pcnt_inv;
+    private String csq;
+}
+
+
diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index 4591d50..d80102b 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -182,7 +182,7 @@
                     alarmRecordsMapper.updateOldAlarmRecord(dataGasDector.getDevcode(), gasMsgContent);
                     alarmRecord.setJobId(Long.valueOf(jobId));
                 } else {
-                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getStrength(), wellCode, "RQZD", "1");
+                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getDevcode(), wellCode, "RQZD", "1");
                     alarmRecord.setJobId(alarmJob.getId());
                 }
                 alarmRecordsMapper.insert(alarmRecord);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4807974..890fffe 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 5907
+  port: 7901
 ###################  spring配置  ###################
 spring:
   datasource:
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..6755296
--- /dev/null
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.dao.DeviceMapper">
+
+    <select id="getWellCode" resultType="java.util.Map">
+        select bd.id as "deviceId", bwi.WELL_CODE AS "wellCode"
+        FROM (SELECT *
+              FROM bus_device_well
+              WHERE VALID = 1
+        ) bdw
+        JOIN (SELECT id
+            FROM bus_device
+            WHERE devcode = #{devcode}
+            AND VALID = 1) bd ON bd.id = bdw.device_id
+        JOIN(SELECT *
+             FROM bus_well_info
+             WHERE VALID = 1) bwi ON bwi.id = bdw.well_id
+    </select>
+
+</mapper>
\ No newline at end of file

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReportUpdataParam.java b/src/main/java/com/casic/model/ReportUpdataParam.java
new file mode 100644
index 0000000..20c2ca9
--- /dev/null
+++ b/src/main/java/com/casic/model/ReportUpdataParam.java
@@ -0,0 +1,23 @@
+package com.casic.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReportUpdataParam {
+    private String msg_type;
+    private String event_change;
+    private String error_val;
+    private String ch_cnt;
+    private String erro_cnt;
+    private String alarm_low_cnt;
+    private String alarm_high_cnt;
+    private String offline_cnt;
+    private String rtd_val;
+    private String adc_val;
+    private String status_val;
+    private String time;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/WirelessData.java b/src/main/java/com/casic/model/WirelessData.java
new file mode 100644
index 0000000..b062c13
--- /dev/null
+++ b/src/main/java/com/casic/model/WirelessData.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class WirelessData {
+    private String model;
+    private String IMEI;
+    private String ICCID;
+    private String sw_ver;
+    private String hw_ver;
+    private String ch_cnt;
+    private String heartbeat_inv;
+    private String up_pcnt;
+    private String up_pcnt_inv;
+    private String csq;
+}
+
+
diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index 4591d50..d80102b 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -182,7 +182,7 @@
                     alarmRecordsMapper.updateOldAlarmRecord(dataGasDector.getDevcode(), gasMsgContent);
                     alarmRecord.setJobId(Long.valueOf(jobId));
                 } else {
-                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getStrength(), wellCode, "RQZD", "1");
+                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getDevcode(), wellCode, "RQZD", "1");
                     alarmRecord.setJobId(alarmJob.getId());
                 }
                 alarmRecordsMapper.insert(alarmRecord);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4807974..890fffe 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 5907
+  port: 7901
 ###################  spring配置  ###################
 spring:
   datasource:
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..6755296
--- /dev/null
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.dao.DeviceMapper">
+
+    <select id="getWellCode" resultType="java.util.Map">
+        select bd.id as "deviceId", bwi.WELL_CODE AS "wellCode"
+        FROM (SELECT *
+              FROM bus_device_well
+              WHERE VALID = 1
+        ) bdw
+        JOIN (SELECT id
+            FROM bus_device
+            WHERE devcode = #{devcode}
+            AND VALID = 1) bd ON bd.id = bdw.device_id
+        JOIN(SELECT *
+             FROM bus_well_info
+             WHERE VALID = 1) bwi ON bwi.id = bdw.well_id
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
index 5c64ca8..890fffe 100644
--- a/target/classes/application-dev.yml
+++ b/target/classes/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 11520
+  port: 7901
 ###################  spring配置  ###################
 spring:
   datasource:

diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java
index 6152cb6..45a2996 100644
--- a/src/main/java/com/casic/controller/DeviceController.java
+++ b/src/main/java/com/casic/controller/DeviceController.java
@@ -30,7 +30,7 @@
         return deviceService.testMysql();
     }
 
-    @PostMapping("/data/gas")
+    @PostMapping("/household/gas")
     public ResponseData saveDataGas(@RequestBody Map<String, Object> receiveData) {
         log.error("----------------------第三方燃气数据上报为{}",JSONObject.toJSONString(receiveData));
         return deviceService.saveDataGas(receiveData);
diff --git a/src/main/java/com/casic/entity/Device.java b/src/main/java/com/casic/entity/Device.java
new file mode 100644
index 0000000..4235f56
--- /dev/null
+++ b/src/main/java/com/casic/entity/Device.java
@@ -0,0 +1,103 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author cz
+ * @since 2023-5-8
+ */
+@TableName("bus_device")
+@Data
+public class Device extends Model<Device> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 设备编号
+     */
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 设备名称
+     */
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+    /**
+     * 在线状态
+     */
+    @TableField("ONLINE_STATE")
+    private String onlineState;
+    /**
+     * 设备类型
+     */
+
+    @TableField("DEVICE_TYPE")
+    private Long deviceType;
+
+    /**
+     * 是否有效
+     */
+    @TableField("VALID")
+    private String valid;
+    /**
+     * 安装时间
+     */
+    @TableField("INSTALL_DATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date installDate;
+    /**
+     * 最新状态时间
+     */
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 设备型号（关联型号表）
+     */
+    @TableField("VERSION")
+    private Long modelId;
+
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
+    @TableField(exist = false)
+    private Long concenId;
+    //闸井ID
+    @TableField(exist = false)
+    private Long wellId;
+
+    @TableField(exist = false)
+    private String installDateFmt;
+
+    @Override
+    public String toString() {
+        return "Device{" +
+                "id=" + id +
+                ", devcode=" + devcode +
+                ", deviceName=" + deviceName +
+                ", onlineState=" + onlineState +
+                ", deviceType=" + deviceType +
+                ", valid=" + valid +
+                ", installDate=" + installDate +
+                ", logtime=" + logtime +
+                "}";
+    }
+}
diff --git a/src/main/java/com/casic/model/HostData.java b/src/main/java/com/casic/model/HostData.java
new file mode 100644
index 0000000..40cefa7
--- /dev/null
+++ b/src/main/java/com/casic/model/HostData.java
@@ -0,0 +1,16 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class HostData {
+    private String model;
+    private String dev_id;
+    private String chip_id;
+    private String mfd_day;
+    private String sw_ver;
+    private String hw_ver;
+    private String duration;
+    private String d_ch_cnt;
+    private String a_ch_cnt;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReceiveDataParam.java b/src/main/java/com/casic/model/ReceiveDataParam.java
new file mode 100644
index 0000000..3a17d24
--- /dev/null
+++ b/src/main/java/com/casic/model/ReceiveDataParam.java
@@ -0,0 +1,20 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.HashMap;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReceiveDataParam {
+    private String deviceType;
+    private String iotId;
+    private String requestId;
+    private Object checkFailedData;
+    private String productKey;
+    private String deviceName;
+    private HashMap<String, Object> items;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/ReportUpdataParam.java b/src/main/java/com/casic/model/ReportUpdataParam.java
new file mode 100644
index 0000000..20c2ca9
--- /dev/null
+++ b/src/main/java/com/casic/model/ReportUpdataParam.java
@@ -0,0 +1,23 @@
+package com.casic.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @data 2022-6-20
+ */
+@Data
+public class ReportUpdataParam {
+    private String msg_type;
+    private String event_change;
+    private String error_val;
+    private String ch_cnt;
+    private String erro_cnt;
+    private String alarm_low_cnt;
+    private String alarm_high_cnt;
+    private String offline_cnt;
+    private String rtd_val;
+    private String adc_val;
+    private String status_val;
+    private String time;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/WirelessData.java b/src/main/java/com/casic/model/WirelessData.java
new file mode 100644
index 0000000..b062c13
--- /dev/null
+++ b/src/main/java/com/casic/model/WirelessData.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+@Data
+public class WirelessData {
+    private String model;
+    private String IMEI;
+    private String ICCID;
+    private String sw_ver;
+    private String hw_ver;
+    private String ch_cnt;
+    private String heartbeat_inv;
+    private String up_pcnt;
+    private String up_pcnt_inv;
+    private String csq;
+}
+
+
diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index 4591d50..d80102b 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -182,7 +182,7 @@
                     alarmRecordsMapper.updateOldAlarmRecord(dataGasDector.getDevcode(), gasMsgContent);
                     alarmRecord.setJobId(Long.valueOf(jobId));
                 } else {
-                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getStrength(), wellCode, "RQZD", "1");
+                    AlarmJob alarmJob = alarmJobDao.saveData(dataGasDector.getDevcode(), wellCode, "RQZD", "1");
                     alarmRecord.setJobId(alarmJob.getId());
                 }
                 alarmRecordsMapper.insert(alarmRecord);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4807974..890fffe 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 5907
+  port: 7901
 ###################  spring配置  ###################
 spring:
   datasource:
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..6755296
--- /dev/null
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.dao.DeviceMapper">
+
+    <select id="getWellCode" resultType="java.util.Map">
+        select bd.id as "deviceId", bwi.WELL_CODE AS "wellCode"
+        FROM (SELECT *
+              FROM bus_device_well
+              WHERE VALID = 1
+        ) bdw
+        JOIN (SELECT id
+            FROM bus_device
+            WHERE devcode = #{devcode}
+            AND VALID = 1) bd ON bd.id = bdw.device_id
+        JOIN(SELECT *
+             FROM bus_well_info
+             WHERE VALID = 1) bwi ON bwi.id = bdw.well_id
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
index 5c64ca8..890fffe 100644
--- a/target/classes/application-dev.yml
+++ b/target/classes/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 11520
+  port: 7901
 ###################  spring配置  ###################
 spring:
   datasource:
diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
index 44bf167..13b11a1 100644
--- a/target/classes/com/casic/service/impl/DeviceServiceImpl.class
+++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
Binary files differ