垃圾袋相关

nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java

@@ -414,9 +414,9 @@ public class DeviceController {
         }
         boolean save = deliveryOrderService.save(order);
         // 结算
-        if(save){
+        if (save) {
             deliveryOrderService.settlement(order);
-        }else {
+        } else {
             throw new BizIllegalException("上传失败：订单上传失败！！");
         }
         return CommonResult.success(orderVO.getDeviceOrderNo());
@@ -688,4 +688,18 @@ public class DeviceController {
         }
     }
 
+    @PostMapping("/changeBag")
+    public CommonResult<String> changeBag(@RequestBody BagCodeReqVO bag) {
+        boolean b = bucketService.setBagNo(bag);
+        if (b) return CommonResult.success("success");
+        else return CommonResult.error(400, "error");
+    }
+
+    @PostMapping("/checkBag")
+    public CommonResult<String> checkBag(@RequestBody BagCodeReqVO bag) {
+        RecycleBucket bucket = bucketService.getByBag(bag);
+        if (bucket != null) return CommonResult.success("success");
+        else return CommonResult.error(400, "error");
+    }
+
 }

nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeReqVO.java

@@ -7,10 +7,10 @@ import lombok.Data;
 @Data
 @ApiModel("垃圾袋编码")
 public class BagCodeReqVO {
-    @ApiModelProperty("设备编码")
+    @ApiModelProperty(value = "设备编码",required = true)
     private String deviceCode;
-    @ApiModelProperty("桶编号")
+    @ApiModelProperty(value = "桶编号",required = true)
     private String bucketCode;
-    @ApiModelProperty("垃圾袋编码")
+    @ApiModelProperty(value = "垃圾袋编码",required = true)
     private String bagNo;
 }

nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeRespVO.java

@@ -1,16 +0,0 @@
-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

@@ -1,6 +1,7 @@
 package cc.yunxi.service;
 
 import cc.yunxi.domain.po.RecycleBucket;
+import cc.yunxi.domain.vo.device.BagCodeReqVO;
 import cc.yunxi.domain.vo.device.BucketStatus;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.validation.constraints.NotBlank;
@@ -12,9 +13,9 @@ public interface IRecycleBucketService extends IService<RecycleBucket> {
 
     List<RecycleBucket> getByDeviceCode(@NotBlank(message = "设备编码不能为空") String deviceCode);
 
-    RecycleBucket getBagCode(@NotBlank(message = "设备编码不能为空") String deviceCode,@NotBlank(message = "门编码不能为空") String bucketCode);
+    RecycleBucket getByBag(BagCodeReqVO bag);
 
-    RecycleBucket setBagCode(@NotBlank(message = "设备编码不能为空") String deviceCode,@NotBlank(message = "门编码不能为空") String bucketCode,@NotBlank(message = "垃圾袋编码不能为空") String bagNo);
+    boolean setBagNo(BagCodeReqVO bag);
 
     int updateStatus(BucketStatus status);
 

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

@@ -1,6 +1,7 @@
 package cc.yunxi.service.impl;
 
 import cc.yunxi.domain.po.RecycleBucket;
+import cc.yunxi.domain.vo.device.BagCodeReqVO;
 import cc.yunxi.domain.vo.device.BucketStatus;
 import cc.yunxi.mapper.RecycleBucketMapper;
 import cc.yunxi.service.IRecycleBucketService;
@@ -62,23 +63,25 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
         }
         return old.isDeliveryDoor() != now.isDeliveryDoor();
     }
+
     @Override
-    public RecycleBucket getBagCode(String deviceCode, String bucketCode) {
+    public RecycleBucket getByBag(BagCodeReqVO bag) {
         QueryWrapper<RecycleBucket> query = new QueryWrapper<>();
-        query.eq("device_code", deviceCode);
-        query.eq("bucket_code", bucketCode);
+        query.lambda()
+                .eq(RecycleBucket::getBagNo, bag.getBagNo())
+                .eq(RecycleBucket::getDeviceCode, bag.getDeviceCode())
+                .eq(RecycleBucket::getBucketCode, bag.getBucketCode())
+                .last("limit 1");
         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);
+    public boolean setBagNo(BagCodeReqVO bagNo) {
+        UpdateWrapper<RecycleBucket> wrapper = new UpdateWrapper<>();
+        wrapper.lambda()
+                .set(RecycleBucket::getBagNo, bagNo.getBagNo())
+                .eq(RecycleBucket::getBucketCode, bagNo.getBucketCode())
+                .eq(RecycleBucket::getDeviceCode, bagNo.getDeviceCode());
+        return this.update(wrapper);
     }
 }