diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java index b9caca4c..fd5f2af5 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * @author 马 */ @@ -20,6 +22,7 @@ public class MbpsDto { @Data @ApiModel(value = "查询吞吐量折线图") public static class SelMbpsByTime{ + @NotNull(message = "请选择查询类型") @ApiModelProperty("查询类型(0-按天,1-按周,2-按月,3-按年)") private Byte queryType; @ApiModelProperty("开始时间") @@ -31,6 +34,7 @@ public class MbpsDto { @Data @ApiModel(value = "查看温度和湿度") public static class SelTeamAndHumidity{ + @NotNull(message = "请选择要查询的仓库") @ApiModelProperty("仓库id") private Long warehouseId; @ApiModelProperty("开始时间") 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/LogisticsHeatImagingRecord.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsHeatImagingRecord.java new file mode 100644 index 00000000..c5181f8c --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsHeatImagingRecord.java @@ -0,0 +1,151 @@ +package com.ccsens.logistics.bean.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class LogisticsHeatImagingRecord implements Serializable { + private Long id; + + private BigDecimal numValue; + + private Byte numType; + + private BigDecimal maxT; + + private String maxTx; + + private String maxTy; + + private Long equipmentId; + + private Long warehouseId; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private String imageData; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public BigDecimal getNumValue() { + return numValue; + } + + public void setNumValue(BigDecimal numValue) { + this.numValue = numValue; + } + + public Byte getNumType() { + return numType; + } + + public void setNumType(Byte numType) { + this.numType = numType; + } + + public BigDecimal getMaxT() { + return maxT; + } + + public void setMaxT(BigDecimal maxT) { + this.maxT = maxT; + } + + public String getMaxTx() { + return maxTx; + } + + public void setMaxTx(String maxTx) { + this.maxTx = maxTx == null ? null : maxTx.trim(); + } + + public String getMaxTy() { + return maxTy; + } + + public void setMaxTy(String maxTy) { + this.maxTy = maxTy == null ? null : maxTy.trim(); + } + + public Long getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(Long equipmentId) { + this.equipmentId = equipmentId; + } + + public Long getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(Long warehouseId) { + this.warehouseId = warehouseId; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + public String getImageData() { + return imageData; + } + + public void setImageData(String imageData) { + this.imageData = imageData == null ? null : imageData.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", numValue=").append(numValue); + sb.append(", numType=").append(numType); + sb.append(", maxT=").append(maxT); + sb.append(", maxTx=").append(maxTx); + sb.append(", maxTy=").append(maxTy); + sb.append(", equipmentId=").append(equipmentId); + sb.append(", warehouseId=").append(warehouseId); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", imageData=").append(imageData); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsHeatImagingRecordExample.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsHeatImagingRecordExample.java new file mode 100644 index 00000000..995cc6de --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsHeatImagingRecordExample.java @@ -0,0 +1,882 @@ +package com.ccsens.logistics.bean.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class LogisticsHeatImagingRecordExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public LogisticsHeatImagingRecordExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNumValueIsNull() { + addCriterion("num_value is null"); + return (Criteria) this; + } + + public Criteria andNumValueIsNotNull() { + addCriterion("num_value is not null"); + return (Criteria) this; + } + + public Criteria andNumValueEqualTo(BigDecimal value) { + addCriterion("num_value =", value, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueNotEqualTo(BigDecimal value) { + addCriterion("num_value <>", value, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueGreaterThan(BigDecimal value) { + addCriterion("num_value >", value, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("num_value >=", value, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueLessThan(BigDecimal value) { + addCriterion("num_value <", value, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueLessThanOrEqualTo(BigDecimal value) { + addCriterion("num_value <=", value, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueIn(List values) { + addCriterion("num_value in", values, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueNotIn(List values) { + addCriterion("num_value not in", values, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("num_value between", value1, value2, "numValue"); + return (Criteria) this; + } + + public Criteria andNumValueNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("num_value not between", value1, value2, "numValue"); + return (Criteria) this; + } + + public Criteria andNumTypeIsNull() { + addCriterion("num_type is null"); + return (Criteria) this; + } + + public Criteria andNumTypeIsNotNull() { + addCriterion("num_type is not null"); + return (Criteria) this; + } + + public Criteria andNumTypeEqualTo(Byte value) { + addCriterion("num_type =", value, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeNotEqualTo(Byte value) { + addCriterion("num_type <>", value, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeGreaterThan(Byte value) { + addCriterion("num_type >", value, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("num_type >=", value, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeLessThan(Byte value) { + addCriterion("num_type <", value, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeLessThanOrEqualTo(Byte value) { + addCriterion("num_type <=", value, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeIn(List values) { + addCriterion("num_type in", values, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeNotIn(List values) { + addCriterion("num_type not in", values, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeBetween(Byte value1, Byte value2) { + addCriterion("num_type between", value1, value2, "numType"); + return (Criteria) this; + } + + public Criteria andNumTypeNotBetween(Byte value1, Byte value2) { + addCriterion("num_type not between", value1, value2, "numType"); + return (Criteria) this; + } + + public Criteria andMaxTIsNull() { + addCriterion("max_t is null"); + return (Criteria) this; + } + + public Criteria andMaxTIsNotNull() { + addCriterion("max_t is not null"); + return (Criteria) this; + } + + public Criteria andMaxTEqualTo(BigDecimal value) { + addCriterion("max_t =", value, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTNotEqualTo(BigDecimal value) { + addCriterion("max_t <>", value, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTGreaterThan(BigDecimal value) { + addCriterion("max_t >", value, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("max_t >=", value, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTLessThan(BigDecimal value) { + addCriterion("max_t <", value, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTLessThanOrEqualTo(BigDecimal value) { + addCriterion("max_t <=", value, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTIn(List values) { + addCriterion("max_t in", values, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTNotIn(List values) { + addCriterion("max_t not in", values, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("max_t between", value1, value2, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("max_t not between", value1, value2, "maxT"); + return (Criteria) this; + } + + public Criteria andMaxTxIsNull() { + addCriterion("max_tx is null"); + return (Criteria) this; + } + + public Criteria andMaxTxIsNotNull() { + addCriterion("max_tx is not null"); + return (Criteria) this; + } + + public Criteria andMaxTxEqualTo(String value) { + addCriterion("max_tx =", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxNotEqualTo(String value) { + addCriterion("max_tx <>", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxGreaterThan(String value) { + addCriterion("max_tx >", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxGreaterThanOrEqualTo(String value) { + addCriterion("max_tx >=", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxLessThan(String value) { + addCriterion("max_tx <", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxLessThanOrEqualTo(String value) { + addCriterion("max_tx <=", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxLike(String value) { + addCriterion("max_tx like", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxNotLike(String value) { + addCriterion("max_tx not like", value, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxIn(List values) { + addCriterion("max_tx in", values, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxNotIn(List values) { + addCriterion("max_tx not in", values, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxBetween(String value1, String value2) { + addCriterion("max_tx between", value1, value2, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTxNotBetween(String value1, String value2) { + addCriterion("max_tx not between", value1, value2, "maxTx"); + return (Criteria) this; + } + + public Criteria andMaxTyIsNull() { + addCriterion("max_ty is null"); + return (Criteria) this; + } + + public Criteria andMaxTyIsNotNull() { + addCriterion("max_ty is not null"); + return (Criteria) this; + } + + public Criteria andMaxTyEqualTo(String value) { + addCriterion("max_ty =", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyNotEqualTo(String value) { + addCriterion("max_ty <>", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyGreaterThan(String value) { + addCriterion("max_ty >", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyGreaterThanOrEqualTo(String value) { + addCriterion("max_ty >=", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyLessThan(String value) { + addCriterion("max_ty <", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyLessThanOrEqualTo(String value) { + addCriterion("max_ty <=", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyLike(String value) { + addCriterion("max_ty like", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyNotLike(String value) { + addCriterion("max_ty not like", value, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyIn(List values) { + addCriterion("max_ty in", values, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyNotIn(List values) { + addCriterion("max_ty not in", values, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyBetween(String value1, String value2) { + addCriterion("max_ty between", value1, value2, "maxTy"); + return (Criteria) this; + } + + public Criteria andMaxTyNotBetween(String value1, String value2) { + addCriterion("max_ty not between", value1, value2, "maxTy"); + return (Criteria) this; + } + + public Criteria andEquipmentIdIsNull() { + addCriterion("equipment_id is null"); + return (Criteria) this; + } + + public Criteria andEquipmentIdIsNotNull() { + addCriterion("equipment_id is not null"); + return (Criteria) this; + } + + public Criteria andEquipmentIdEqualTo(Long value) { + addCriterion("equipment_id =", value, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdNotEqualTo(Long value) { + addCriterion("equipment_id <>", value, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdGreaterThan(Long value) { + addCriterion("equipment_id >", value, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdGreaterThanOrEqualTo(Long value) { + addCriterion("equipment_id >=", value, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdLessThan(Long value) { + addCriterion("equipment_id <", value, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdLessThanOrEqualTo(Long value) { + addCriterion("equipment_id <=", value, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdIn(List values) { + addCriterion("equipment_id in", values, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdNotIn(List values) { + addCriterion("equipment_id not in", values, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdBetween(Long value1, Long value2) { + addCriterion("equipment_id between", value1, value2, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdNotBetween(Long value1, Long value2) { + addCriterion("equipment_id not between", value1, value2, "equipmentId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdIsNull() { + addCriterion("warehouse_id is null"); + return (Criteria) this; + } + + public Criteria andWarehouseIdIsNotNull() { + addCriterion("warehouse_id is not null"); + return (Criteria) this; + } + + public Criteria andWarehouseIdEqualTo(Long value) { + addCriterion("warehouse_id =", value, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdNotEqualTo(Long value) { + addCriterion("warehouse_id <>", value, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdGreaterThan(Long value) { + addCriterion("warehouse_id >", value, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdGreaterThanOrEqualTo(Long value) { + addCriterion("warehouse_id >=", value, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdLessThan(Long value) { + addCriterion("warehouse_id <", value, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdLessThanOrEqualTo(Long value) { + addCriterion("warehouse_id <=", value, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdIn(List values) { + addCriterion("warehouse_id in", values, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdNotIn(List values) { + addCriterion("warehouse_id not in", values, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdBetween(Long value1, Long value2) { + addCriterion("warehouse_id between", value1, value2, "warehouseId"); + return (Criteria) this; + } + + public Criteria andWarehouseIdNotBetween(Long value1, Long value2) { + addCriterion("warehouse_id not between", value1, value2, "warehouseId"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file 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/java/com/ccsens/logistics/persist/mapper/LogisticsHeatImagingRecordMapper.java b/logistics/src/main/java/com/ccsens/logistics/persist/mapper/LogisticsHeatImagingRecordMapper.java new file mode 100644 index 00000000..e37ab612 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/persist/mapper/LogisticsHeatImagingRecordMapper.java @@ -0,0 +1,36 @@ +package com.ccsens.logistics.persist.mapper; + +import com.ccsens.logistics.bean.po.LogisticsHeatImagingRecord; +import com.ccsens.logistics.bean.po.LogisticsHeatImagingRecordExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface LogisticsHeatImagingRecordMapper { + long countByExample(LogisticsHeatImagingRecordExample example); + + int deleteByExample(LogisticsHeatImagingRecordExample example); + + int deleteByPrimaryKey(Long id); + + int insert(LogisticsHeatImagingRecord record); + + int insertSelective(LogisticsHeatImagingRecord record); + + List selectByExampleWithBLOBs(LogisticsHeatImagingRecordExample example); + + List selectByExample(LogisticsHeatImagingRecordExample example); + + LogisticsHeatImagingRecord selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") LogisticsHeatImagingRecord record, @Param("example") LogisticsHeatImagingRecordExample example); + + int updateByExampleWithBLOBs(@Param("record") LogisticsHeatImagingRecord record, @Param("example") LogisticsHeatImagingRecordExample example); + + int updateByExample(@Param("record") LogisticsHeatImagingRecord record, @Param("example") LogisticsHeatImagingRecordExample example); + + int updateByPrimaryKeySelective(LogisticsHeatImagingRecord record); + + int updateByPrimaryKeyWithBLOBs(LogisticsHeatImagingRecord record); + + int updateByPrimaryKey(LogisticsHeatImagingRecord record); +} \ No newline at end of file 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 + select + + distinct + + + , + + from t_logistics_heat_imaging_record + + + + + order by ${orderByClause} + + + + + + delete from t_logistics_heat_imaging_record + where id = #{id,jdbcType=BIGINT} + + + delete from t_logistics_heat_imaging_record + + + + + + insert into t_logistics_heat_imaging_record (id, num_value, num_type, + max_t, max_tx, max_ty, + equipment_id, warehouse_id, created_at, + updated_at, rec_status, image_data + ) + values (#{id,jdbcType=BIGINT}, #{numValue,jdbcType=DECIMAL}, #{numType,jdbcType=TINYINT}, + #{maxT,jdbcType=DECIMAL}, #{maxTx,jdbcType=VARCHAR}, #{maxTy,jdbcType=VARCHAR}, + #{equipmentId,jdbcType=BIGINT}, #{warehouseId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{imageData,jdbcType=LONGVARCHAR} + ) + + + insert into t_logistics_heat_imaging_record + + + id, + + + num_value, + + + num_type, + + + max_t, + + + max_tx, + + + max_ty, + + + equipment_id, + + + warehouse_id, + + + created_at, + + + updated_at, + + + rec_status, + + + image_data, + + + + + #{id,jdbcType=BIGINT}, + + + #{numValue,jdbcType=DECIMAL}, + + + #{numType,jdbcType=TINYINT}, + + + #{maxT,jdbcType=DECIMAL}, + + + #{maxTx,jdbcType=VARCHAR}, + + + #{maxTy,jdbcType=VARCHAR}, + + + #{equipmentId,jdbcType=BIGINT}, + + + #{warehouseId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{imageData,jdbcType=LONGVARCHAR}, + + + + + + update t_logistics_heat_imaging_record + + + id = #{record.id,jdbcType=BIGINT}, + + + num_value = #{record.numValue,jdbcType=DECIMAL}, + + + num_type = #{record.numType,jdbcType=TINYINT}, + + + max_t = #{record.maxT,jdbcType=DECIMAL}, + + + max_tx = #{record.maxTx,jdbcType=VARCHAR}, + + + max_ty = #{record.maxTy,jdbcType=VARCHAR}, + + + equipment_id = #{record.equipmentId,jdbcType=BIGINT}, + + + warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + image_data = #{record.imageData,jdbcType=LONGVARCHAR}, + + + + + + + + update t_logistics_heat_imaging_record + set id = #{record.id,jdbcType=BIGINT}, + num_value = #{record.numValue,jdbcType=DECIMAL}, + num_type = #{record.numType,jdbcType=TINYINT}, + max_t = #{record.maxT,jdbcType=DECIMAL}, + max_tx = #{record.maxTx,jdbcType=VARCHAR}, + max_ty = #{record.maxTy,jdbcType=VARCHAR}, + equipment_id = #{record.equipmentId,jdbcType=BIGINT}, + warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + image_data = #{record.imageData,jdbcType=LONGVARCHAR} + + + + + + update t_logistics_heat_imaging_record + set id = #{record.id,jdbcType=BIGINT}, + num_value = #{record.numValue,jdbcType=DECIMAL}, + num_type = #{record.numType,jdbcType=TINYINT}, + max_t = #{record.maxT,jdbcType=DECIMAL}, + max_tx = #{record.maxTx,jdbcType=VARCHAR}, + max_ty = #{record.maxTy,jdbcType=VARCHAR}, + equipment_id = #{record.equipmentId,jdbcType=BIGINT}, + warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_logistics_heat_imaging_record + + + num_value = #{numValue,jdbcType=DECIMAL}, + + + num_type = #{numType,jdbcType=TINYINT}, + + + max_t = #{maxT,jdbcType=DECIMAL}, + + + max_tx = #{maxTx,jdbcType=VARCHAR}, + + + max_ty = #{maxTy,jdbcType=VARCHAR}, + + + equipment_id = #{equipmentId,jdbcType=BIGINT}, + + + warehouse_id = #{warehouseId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + image_data = #{imageData,jdbcType=LONGVARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_logistics_heat_imaging_record + set num_value = #{numValue,jdbcType=DECIMAL}, + num_type = #{numType,jdbcType=TINYINT}, + max_t = #{maxT,jdbcType=DECIMAL}, + max_tx = #{maxTx,jdbcType=VARCHAR}, + max_ty = #{maxTy,jdbcType=VARCHAR}, + equipment_id = #{equipmentId,jdbcType=BIGINT}, + warehouse_id = #{warehouseId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + image_data = #{imageData,jdbcType=LONGVARCHAR} + where id = #{id,jdbcType=BIGINT} + + + update t_logistics_heat_imaging_record + set num_value = #{numValue,jdbcType=DECIMAL}, + num_type = #{numType,jdbcType=TINYINT}, + max_t = #{maxT,jdbcType=DECIMAL}, + max_tx = #{maxTx,jdbcType=VARCHAR}, + max_ty = #{maxTy,jdbcType=VARCHAR}, + equipment_id = #{equipmentId,jdbcType=BIGINT}, + warehouse_id = #{warehouseId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml b/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml index 79933233..96520adf 100644 --- a/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml +++ b/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml @@ -4,7 +4,7 @@ - + @@ -106,7 +106,7 @@ insert into t_logistics_park_equipment (id, name, equipment_number, equipment_type, park_id, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{equipmentNumber,jdbcType=INTEGER}, + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{equipmentNumber,jdbcType=VARCHAR}, #{equipmentType,jdbcType=TINYINT}, #{parkId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -146,7 +146,7 @@ #{name,jdbcType=VARCHAR}, - #{equipmentNumber,jdbcType=INTEGER}, + #{equipmentNumber,jdbcType=VARCHAR}, #{equipmentType,jdbcType=TINYINT}, @@ -181,7 +181,7 @@ name = #{record.name,jdbcType=VARCHAR}, - equipment_number = #{record.equipmentNumber,jdbcType=INTEGER}, + equipment_number = #{record.equipmentNumber,jdbcType=VARCHAR}, equipment_type = #{record.equipmentType,jdbcType=TINYINT}, @@ -207,7 +207,7 @@ update t_logistics_park_equipment set id = #{record.id,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, - equipment_number = #{record.equipmentNumber,jdbcType=INTEGER}, + equipment_number = #{record.equipmentNumber,jdbcType=VARCHAR}, equipment_type = #{record.equipmentType,jdbcType=TINYINT}, park_id = #{record.parkId,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -224,7 +224,7 @@ name = #{name,jdbcType=VARCHAR}, - equipment_number = #{equipmentNumber,jdbcType=INTEGER}, + equipment_number = #{equipmentNumber,jdbcType=VARCHAR}, equipment_type = #{equipmentType,jdbcType=TINYINT}, @@ -247,7 +247,7 @@ update t_logistics_park_equipment set name = #{name,jdbcType=VARCHAR}, - equipment_number = #{equipmentNumber,jdbcType=INTEGER}, + equipment_number = #{equipmentNumber,jdbcType=VARCHAR}, equipment_type = #{equipmentType,jdbcType=TINYINT}, park_id = #{parkId,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP},