diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java index 2f43840..a300258 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java @@ -103,7 +103,9 @@ public class DeviceController { _bucket.put("productCode", bucket.getProductCode());//产品大类 _bucket.put("productSubCode", bucket.getProductSubCode());//产品子类 _bucket.put("isShow", bucket.getIsShow());//是否显示 + _bucket.put("status", bucket.getStatus());// _bucket.put("showName", bucket.getShowName());//显示名称 + _bucket.put("bucketImg", bucket.getBucketImg());//桶身图片 BigDecimal price = calculatePrice(bucket, config);//综合计算价格 _bucket.put("price", price);//价格 _bucket.put("currentWeight", bucket.getCurrentWeight());//当前重量 @@ -171,6 +173,7 @@ public class DeviceController { DeviceRespVO.Bucket _bucket = new DeviceRespVO.Bucket(); BigDecimal price = calculatePrice(bucket, config);//计算价格 _bucket.setBucketCode(bucket.getBucketCode()); + _bucket.setStatus(bucket.getStatus()); _bucket.setDoorNum(bucket.getDoorNum()); _bucket.setOrdNum(bucket.getShowOrd()); _bucket.setProductCode(bucket.getProductCode()); diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleDevice.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleDevice.java index 1174dc0..7716c11 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleDevice.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleDevice.java @@ -44,9 +44,9 @@ public class RecycleDevice { @TableField(value = "BOX_WEIGHT") @ApiModelProperty("箱体重量") private Double boxWeight; - @TableField(value = "BE_LONG_STATION_CODE") + @TableField(value = "BE_LONG_STATION_ID") @ApiModelProperty("所属回收站") - private String beLongStationCode; + private String beLongStationId; @TableField(value = "BE_LONG_COMPANY_ID") @ApiModelProperty("所属商户") private String beLongCompanyId; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/DeviceRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/DeviceRespVO.java index d0bc971..7ce9a65 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/DeviceRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/DeviceRespVO.java @@ -2,6 +2,7 @@ package cc.yunxi.domain.vo.device; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; import lombok.experimental.Accessors; @@ -49,6 +50,9 @@ public class DeviceRespVO { @ApiModelProperty(value = "桶编码", required = true, example = "bk00001") @NotBlank(message = "桶编码不能为空") private String bucketCode; + @ApiModelProperty(value = "状态 1使用 0停用", required = true, example = "1") + @NotNull(message = "桶状态不能为空") + private Integer status; @ApiModelProperty(value = "门号", required = true, example = "1") @NotBlank(message = "门号不能为空") private Integer doorNum;