Просмотр исходного кода

[电表][修复]:增加电表在线字段

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
de431df93e
2 измененных файлов: 8 добавлений и 10 удалений
  1. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
  2. +6
    -5
      mallinkService/src/main/resources/mapper/KwMeterMapper.xml

+ 2
- 5
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") @io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate")
private Integer 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") @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config")
private String config; private String config;


@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "registerTime")
private Date registerTime;

@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime") @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime")
private Date lastOnlineTime; private Date lastOnlineTime;




+ 6
- 5
mallinkService/src/main/resources/mapper/KwMeterMapper.xml Просмотреть файл

@@ -10,6 +10,7 @@
<result column="model" jdbcType="VARCHAR" property="model"/> <result column="model" jdbcType="VARCHAR" property="model"/>
<result column="protocol" jdbcType="INTEGER" property="protocol"/> <result column="protocol" jdbcType="INTEGER" property="protocol"/>
<result column="bandrate" jdbcType="INTEGER" property="bandrate"/> <result column="bandrate" jdbcType="INTEGER" property="bandrate"/>
<result column="last_online_time" jdbcType="TIMESTAMP" property="lastOnlineTime"/>
<result column="online_status" jdbcType="INTEGER" property="onlineStatus"/> <result column="online_status" jdbcType="INTEGER" property="onlineStatus"/>
<result column="config" jdbcType="VARCHAR" property="config"/> <result column="config" jdbcType="VARCHAR" property="config"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
@@ -17,7 +18,7 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`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`
</sql> </sql>
<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -31,8 +32,8 @@
and `tenant_id` = #{tenantId} and `tenant_id` = #{tenantId}
</if> </if>
<if test=" null != address and '' != address ">
and `address` like concat('%', #{address},'%')
<if test=" null != address">
and `address` = #{address}
</if> </if>
<if test=" null != brand and '' != brand "> <if test=" null != brand and '' != brand ">
@@ -47,8 +48,8 @@
and `model` = #{model} and `model` = #{model}
</if> </if>
<if test=" null != tenantId ">
and `online` = #{online}
<if test=" null != onlineStatus ">
and `online_status` = #{onlineStatus}
</if> </if>
<if test=" null != ids "> <if test=" null != ids ">


Загрузка…
Отмена
Сохранить