drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
@@ -21,6 +21,7 @@ import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; /** @@ -95,6 +96,12 @@ private String contactPhone; /** * 有效范围 km */ @ApiModelProperty(value = "有效范围 km") private BigDecimal effectiveRangeKm; /** * 设备状态,多个状态用逗号隔 */ @ApiModelProperty(value = "设备状态,多个状态用逗号隔开") drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -53,6 +53,12 @@ <if test="param2.deviceSpecification != null and param2.deviceSpecification != ''"> and device_specification = #{param2.deviceSpecification} </if> <if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 1"> and effective_range_km is not null </if> <if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 2"> and effective_range_km is null </if> <if test="param2.manufacturer != null and param2.manufacturer != ''"> and manufacturer = #{param2.manufacturer} </if> drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java
@@ -29,4 +29,9 @@ @ApiModelProperty(value = "所属部门") private Long belongDept; /** * 有效范围是否为空:0-不处理 1-不为空 2-为空 */ @ApiModelProperty(value = "有效范围是否为空:0-不处理 1-不为空 2-为空") private Integer effectiveRangeKmIsNotNull; }