diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecord.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecord.java index b0bf0ff3..47ff7535 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecord.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecord.java @@ -1,12 +1,13 @@ package com.ccsens.logistics.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class LogisticsEnvironmentRecord implements Serializable { private Long id; - private Integer numValue; + private BigDecimal numValue; private Byte numType; @@ -16,6 +17,8 @@ public class LogisticsEnvironmentRecord implements Serializable { private Long recordTime; + private Byte isAlarm; + private Date createdAt; private Date updatedAt; @@ -32,11 +35,11 @@ public class LogisticsEnvironmentRecord implements Serializable { this.id = id; } - public Integer getNumValue() { + public BigDecimal getNumValue() { return numValue; } - public void setNumValue(Integer numValue) { + public void setNumValue(BigDecimal numValue) { this.numValue = numValue; } @@ -72,6 +75,14 @@ public class LogisticsEnvironmentRecord implements Serializable { this.recordTime = recordTime; } + public Byte getIsAlarm() { + return isAlarm; + } + + public void setIsAlarm(Byte isAlarm) { + this.isAlarm = isAlarm; + } + public Date getCreatedAt() { return createdAt; } @@ -108,6 +119,7 @@ public class LogisticsEnvironmentRecord implements Serializable { sb.append(", equipmentId=").append(equipmentId); sb.append(", warehouseId=").append(warehouseId); sb.append(", recordTime=").append(recordTime); + sb.append(", isAlarm=").append(isAlarm); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecordExample.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecordExample.java index a25b8bdd..8260fb10 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecordExample.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEnvironmentRecordExample.java @@ -1,5 +1,6 @@ package com.ccsens.logistics.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -175,52 +176,52 @@ public class LogisticsEnvironmentRecordExample { return (Criteria) this; } - public Criteria andNumValueEqualTo(Integer value) { + public Criteria andNumValueEqualTo(BigDecimal value) { addCriterion("num_value =", value, "numValue"); return (Criteria) this; } - public Criteria andNumValueNotEqualTo(Integer value) { + public Criteria andNumValueNotEqualTo(BigDecimal value) { addCriterion("num_value <>", value, "numValue"); return (Criteria) this; } - public Criteria andNumValueGreaterThan(Integer value) { + public Criteria andNumValueGreaterThan(BigDecimal value) { addCriterion("num_value >", value, "numValue"); return (Criteria) this; } - public Criteria andNumValueGreaterThanOrEqualTo(Integer value) { + public Criteria andNumValueGreaterThanOrEqualTo(BigDecimal value) { addCriterion("num_value >=", value, "numValue"); return (Criteria) this; } - public Criteria andNumValueLessThan(Integer value) { + public Criteria andNumValueLessThan(BigDecimal value) { addCriterion("num_value <", value, "numValue"); return (Criteria) this; } - public Criteria andNumValueLessThanOrEqualTo(Integer value) { + public Criteria andNumValueLessThanOrEqualTo(BigDecimal value) { addCriterion("num_value <=", value, "numValue"); return (Criteria) this; } - public Criteria andNumValueIn(List values) { + public Criteria andNumValueIn(List values) { addCriterion("num_value in", values, "numValue"); return (Criteria) this; } - public Criteria andNumValueNotIn(List values) { + public Criteria andNumValueNotIn(List values) { addCriterion("num_value not in", values, "numValue"); return (Criteria) this; } - public Criteria andNumValueBetween(Integer value1, Integer value2) { + public Criteria andNumValueBetween(BigDecimal value1, BigDecimal value2) { addCriterion("num_value between", value1, value2, "numValue"); return (Criteria) this; } - public Criteria andNumValueNotBetween(Integer value1, Integer value2) { + public Criteria andNumValueNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("num_value not between", value1, value2, "numValue"); return (Criteria) this; } @@ -465,6 +466,66 @@ public class LogisticsEnvironmentRecordExample { return (Criteria) this; } + public Criteria andIsAlarmIsNull() { + addCriterion("is_alarm is null"); + return (Criteria) this; + } + + public Criteria andIsAlarmIsNotNull() { + addCriterion("is_alarm is not null"); + return (Criteria) this; + } + + public Criteria andIsAlarmEqualTo(Byte value) { + addCriterion("is_alarm =", value, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmNotEqualTo(Byte value) { + addCriterion("is_alarm <>", value, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmGreaterThan(Byte value) { + addCriterion("is_alarm >", value, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmGreaterThanOrEqualTo(Byte value) { + addCriterion("is_alarm >=", value, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmLessThan(Byte value) { + addCriterion("is_alarm <", value, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmLessThanOrEqualTo(Byte value) { + addCriterion("is_alarm <=", value, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmIn(List values) { + addCriterion("is_alarm in", values, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmNotIn(List values) { + addCriterion("is_alarm not in", values, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmBetween(Byte value1, Byte value2) { + addCriterion("is_alarm between", value1, value2, "isAlarm"); + return (Criteria) this; + } + + public Criteria andIsAlarmNotBetween(Byte value1, Byte value2) { + addCriterion("is_alarm not between", value1, value2, "isAlarm"); + return (Criteria) this; + } + public Criteria andCreatedAtIsNull() { addCriterion("created_at is null"); return (Criteria) this; diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java index d42c8863..e02cccc4 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java @@ -8,7 +8,7 @@ public class LogisticsEquipment implements Serializable { private String name; - private Integer equipmentNumber; + private String equipmentNumber; private Byte equipmentType; @@ -42,12 +42,12 @@ public class LogisticsEquipment implements Serializable { this.name = name == null ? null : name.trim(); } - public Integer getEquipmentNumber() { + public String getEquipmentNumber() { return equipmentNumber; } - public void setEquipmentNumber(Integer equipmentNumber) { - this.equipmentNumber = equipmentNumber; + public void setEquipmentNumber(String equipmentNumber) { + this.equipmentNumber = equipmentNumber == null ? null : equipmentNumber.trim(); } public Byte getEquipmentType() { diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java index f3d92873..e8376588 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java @@ -245,52 +245,62 @@ public class LogisticsEquipmentExample { return (Criteria) this; } - public Criteria andEquipmentNumberEqualTo(Integer value) { + public Criteria andEquipmentNumberEqualTo(String value) { addCriterion("equipment_number =", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberNotEqualTo(Integer value) { + public Criteria andEquipmentNumberNotEqualTo(String value) { addCriterion("equipment_number <>", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberGreaterThan(Integer value) { + public Criteria andEquipmentNumberGreaterThan(String value) { addCriterion("equipment_number >", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberGreaterThanOrEqualTo(Integer value) { + public Criteria andEquipmentNumberGreaterThanOrEqualTo(String value) { addCriterion("equipment_number >=", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberLessThan(Integer value) { + public Criteria andEquipmentNumberLessThan(String value) { addCriterion("equipment_number <", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberLessThanOrEqualTo(Integer value) { + public Criteria andEquipmentNumberLessThanOrEqualTo(String value) { addCriterion("equipment_number <=", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberIn(List values) { + public Criteria andEquipmentNumberLike(String value) { + addCriterion("equipment_number like", value, "equipmentNumber"); + return (Criteria) this; + } + + public Criteria andEquipmentNumberNotLike(String value) { + addCriterion("equipment_number not like", value, "equipmentNumber"); + return (Criteria) this; + } + + public Criteria andEquipmentNumberIn(List values) { addCriterion("equipment_number in", values, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberNotIn(List values) { + public Criteria andEquipmentNumberNotIn(List values) { addCriterion("equipment_number not in", values, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberBetween(Integer value1, Integer value2) { + public Criteria andEquipmentNumberBetween(String value1, String value2) { addCriterion("equipment_number between", value1, value2, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberNotBetween(Integer value1, Integer value2) { + public Criteria andEquipmentNumberNotBetween(String value1, String value2) { addCriterion("equipment_number not between", value1, value2, "equipmentNumber"); return (Criteria) this; } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java index 09007ad9..6e8d8d8d 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java @@ -8,7 +8,7 @@ public class LogisticsParkEquipment implements Serializable { private String name; - private Integer equipmentNumber; + private String equipmentNumber; private Byte equipmentType; @@ -38,12 +38,12 @@ public class LogisticsParkEquipment implements Serializable { this.name = name == null ? null : name.trim(); } - public Integer getEquipmentNumber() { + public String getEquipmentNumber() { return equipmentNumber; } - public void setEquipmentNumber(Integer equipmentNumber) { - this.equipmentNumber = equipmentNumber; + public void setEquipmentNumber(String equipmentNumber) { + this.equipmentNumber = equipmentNumber == null ? null : equipmentNumber.trim(); } public Byte getEquipmentType() { diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java index 27964a58..ad3cd99c 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java @@ -245,52 +245,62 @@ public class LogisticsParkEquipmentExample { return (Criteria) this; } - public Criteria andEquipmentNumberEqualTo(Integer value) { + public Criteria andEquipmentNumberEqualTo(String value) { addCriterion("equipment_number =", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberNotEqualTo(Integer value) { + public Criteria andEquipmentNumberNotEqualTo(String value) { addCriterion("equipment_number <>", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberGreaterThan(Integer value) { + public Criteria andEquipmentNumberGreaterThan(String value) { addCriterion("equipment_number >", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberGreaterThanOrEqualTo(Integer value) { + public Criteria andEquipmentNumberGreaterThanOrEqualTo(String value) { addCriterion("equipment_number >=", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberLessThan(Integer value) { + public Criteria andEquipmentNumberLessThan(String value) { addCriterion("equipment_number <", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberLessThanOrEqualTo(Integer value) { + public Criteria andEquipmentNumberLessThanOrEqualTo(String value) { addCriterion("equipment_number <=", value, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberIn(List values) { + public Criteria andEquipmentNumberLike(String value) { + addCriterion("equipment_number like", value, "equipmentNumber"); + return (Criteria) this; + } + + public Criteria andEquipmentNumberNotLike(String value) { + addCriterion("equipment_number not like", value, "equipmentNumber"); + return (Criteria) this; + } + + public Criteria andEquipmentNumberIn(List values) { addCriterion("equipment_number in", values, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberNotIn(List values) { + public Criteria andEquipmentNumberNotIn(List values) { addCriterion("equipment_number not in", values, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberBetween(Integer value1, Integer value2) { + public Criteria andEquipmentNumberBetween(String value1, String value2) { addCriterion("equipment_number between", value1, value2, "equipmentNumber"); return (Criteria) this; } - public Criteria andEquipmentNumberNotBetween(Integer value1, Integer value2) { + public Criteria andEquipmentNumberNotBetween(String value1, String value2) { addCriterion("equipment_number not between", value1, value2, "equipmentNumber"); return (Criteria) this; } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java b/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java index 1824a15e..241b3a21 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java @@ -18,7 +18,7 @@ public class EquipmentVo { @ApiModelProperty("设备名称") private String equipmentName; @ApiModelProperty("设备编号") - private Integer equipmentNumber; + private String equipmentNumber; @ApiModelProperty("设备类型(0-摄像头,1-温度测试,2-湿度测试,3-漏水检测)") private Byte equipmentType; @ApiModelProperty("设备地址") diff --git a/logistics/src/main/resources/mapper_raw/LogisticsEnvironmentRecordMapper.xml b/logistics/src/main/resources/mapper_raw/LogisticsEnvironmentRecordMapper.xml index 9dfca11e..fdaf2c87 100644 --- a/logistics/src/main/resources/mapper_raw/LogisticsEnvironmentRecordMapper.xml +++ b/logistics/src/main/resources/mapper_raw/LogisticsEnvironmentRecordMapper.xml @@ -3,11 +3,12 @@ - + + @@ -71,8 +72,8 @@ - id, num_value, num_type, equipment_id, warehouse_id, record_time, created_at, updated_at, - rec_status + id, num_value, num_type, equipment_id, warehouse_id, record_time, is_alarm, created_at, + updated_at, rec_status