图片json转，垃圾袋编码

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());//当前重量

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;
+}

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;
+}

nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java

@@ -12,6 +12,10 @@ public interface IRecycleBucketService extends IService<RecycleBucket> {
 
     List<RecycleBucket> 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);

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleBucketServiceImpl.java

@@ -66,4 +66,23 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
         }
         return false;
     }
+    @Override
+    public RecycleBucket getBagCode(String deviceCode, String bucketCode) {
+        QueryWrapper<RecycleBucket> 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<RecycleBucket> undate = new UpdateWrapper<>();
+        undate.eq("device_code", deviceCode);
+        undate.eq("bucket_code", bucketCode);
+        undate.set("bag_no",bagNo);
+        this.update(undate);
+        QueryWrapper<RecycleBucket> query = new QueryWrapper<>();
+        query.eq("device_code", deviceCode);
+        query.eq("bucket_code", bucketCode);
+        return recycleBucketMapper.selectOne(query);
+    }
 }