From 3237ce9bd26d4cc63d224a25e26b19e4966ee384 Mon Sep 17 00:00:00 2001 From: guochaojie Date: Thu, 27 Jun 2024 17:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9E=83=E5=9C=BE=E8=A2=8B=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/yunxi/controller/DeviceController.java | 18 ++++++++++-- .../yunxi/domain/vo/device/BagCodeReqVO.java | 6 ++-- .../yunxi/domain/vo/device/BagCodeRespVO.java | 16 ---------- .../yunxi/service/IRecycleBucketService.java | 5 ++-- .../impl/RecycleBucketServiceImpl.java | 29 ++++++++++--------- 5 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeRespVO.java 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 a70717a..71a25ea 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java +++ b/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 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 checkBag(@RequestBody BagCodeReqVO bag) { + RecycleBucket bucket = bucketService.getByBag(bag); + if (bucket != null) return CommonResult.success("success"); + else return CommonResult.error(400, "error"); + } + } 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 index 1c2d260..64d6b41 100644 --- 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 @@ -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; } 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 deleted file mode 100644 index 3b80c27..0000000 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/BagCodeRespVO.java +++ /dev/null @@ -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; -} 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 32b6517..f32a67a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java +++ b/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 { List 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); 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 813f5a2..c28716d 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 @@ -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 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 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); + public boolean setBagNo(BagCodeReqVO bagNo) { + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.lambda() + .set(RecycleBucket::getBagNo, bagNo.getBagNo()) + .eq(RecycleBucket::getBucketCode, bagNo.getBucketCode()) + .eq(RecycleBucket::getDeviceCode, bagNo.getDeviceCode()); + return this.update(wrapper); } }