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 fb6da54..3b1a657 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java @@ -108,7 +108,7 @@ public class DeviceController { _bucket.put("isShow", bucket.getIsShow());//是否显示 _bucket.put("status", bucket.getStatus());// _bucket.put("showName", bucket.getShowName());//显示名称 - _bucket.put("bucketImg", bucket.getBucketImg());//桶身图片 + _bucket.put("bucketImg", JSONUtil.parseArray(bucket.getBucketImg()));//桶身图片 BigDecimal price = calculatePrice(bucket, config);//综合计算价格 _bucket.put("price", price);//价格 _bucket.put("currentWeight", bucket.getCurrentWeight());//当前重量 diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeReqVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeReqVO.java new file mode 100644 index 0000000..1c2d260 --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeReqVO.java @@ -0,0 +1,16 @@ +package cc.yunxi.domain.vo.device; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("垃圾袋编码") +public class BagCodeReqVO { + @ApiModelProperty("设备编码") + private String deviceCode; + @ApiModelProperty("桶编号") + private String bucketCode; + @ApiModelProperty("垃圾袋编码") + private String bagNo; +} diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeRespVO.java new file mode 100644 index 0000000..3b80c27 --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeRespVO.java @@ -0,0 +1,16 @@ +package cc.yunxi.domain.vo.device; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("垃圾袋编码") +public class BagCodeRespVO { + @ApiModelProperty("设备编码") + private String deviceCode; + @ApiModelProperty("桶编号") + private String bucketCode; + @ApiModelProperty("垃圾袋编码") + private String bagNo; +} diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java index 228fc80..32b6517 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java @@ -12,6 +12,10 @@ public interface IRecycleBucketService extends IService { List getByDeviceCode(@NotBlank(message = "设备编码不能为空") String deviceCode); + RecycleBucket getBagCode(@NotBlank(message = "设备编码不能为空") String deviceCode,@NotBlank(message = "门编码不能为空") String bucketCode); + + RecycleBucket setBagCode(@NotBlank(message = "设备编码不能为空") String deviceCode,@NotBlank(message = "门编码不能为空") String bucketCode,@NotBlank(message = "垃圾袋编码不能为空") String bagNo); + int updateStatus(BucketStatus status); boolean isChanged(BucketStatus old,BucketStatus now); diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleBucketServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleBucketServiceImpl.java index 1da8415..f33057a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleBucketServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleBucketServiceImpl.java @@ -66,4 +66,23 @@ public class RecycleBucketServiceImpl extends ServiceImpl query = new QueryWrapper<>(); + query.eq("device_code", deviceCode); + query.eq("bucket_code", bucketCode); + return recycleBucketMapper.selectOne(query); + } + @Override + public RecycleBucket setBagCode(String deviceCode, String bucketCode, String bagNo) { + UpdateWrapper undate = new UpdateWrapper<>(); + undate.eq("device_code", deviceCode); + undate.eq("bucket_code", bucketCode); + undate.set("bag_no",bagNo); + this.update(undate); + QueryWrapper query = new QueryWrapper<>(); + query.eq("device_code", deviceCode); + query.eq("bucket_code", bucketCode); + return recycleBucketMapper.selectOne(query); + } }