diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index e0c14c29d..7fb374e63 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +17,7 @@ import java.util.List; */ @Table(name = "kw_box") @Data -@ToString(callSuper = true) +@JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) public class KwBox extends BaseEntity { @Id @@ -72,8 +73,10 @@ public class KwBox extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "最大目标数量", name = "maxTagNum") private Integer maxTagNum; + @io.swagger.annotations.ApiModelProperty(value = "已连接电表数", name = "meterCount") + private Integer meterCount; + @Transient private List meters; - } diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index 11038de97..5d9612423 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -19,6 +19,7 @@ + @@ -69,11 +70,17 @@ order by ${sortColumns} - + diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 9094bebd0..b66e6e213 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -64,15 +64,6 @@ - - @@ -81,10 +72,6 @@ - - -