From de431df93e90682cbd9282ff90d8e83bef2a6427 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 17 Jun 2019 20:54:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B5=E8=A1=A8=E5=9C=A8=E7=BA=BF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/KwMeter.java | 7 ++----- .../src/main/resources/mapper/KwMeterMapper.xml | 11 ++++++----- 2 files changed, 8 insertions(+), 10 deletions(-) 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}