diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
index ea84c8338..e158a2329 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
@@ -53,15 +53,12 @@ public class KwMeter extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate")
private Integer bandrate;
- @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online_status")
- private Integer online_status;
+ @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "onlineStatus")
+ private Integer onlineStatus;
@io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config")
private String config;
- @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "registerTime")
- private Date registerTime;
-
@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime")
private Date lastOnlineTime;
diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml
index a9219c26c..e8e010248 100644
--- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml
+++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml
@@ -10,6 +10,7 @@
+
@@ -17,7 +18,7 @@
- `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`online_status`,`config`,`create_time`,`update_time`
+ `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`last_online_time`,`online_status`,`config`,`create_time`,`update_time`
@@ -31,8 +32,8 @@
and `tenant_id` = #{tenantId}
-
- and `address` like concat('%', #{address},'%')
+
+ and `address` = #{address}
@@ -47,8 +48,8 @@
and `model` = #{model}
-
- and `online` = #{online}
+
+ and `online_status` = #{onlineStatus}