From e114851fadb41cfdf762929c602addbc1bb52ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Wed, 19 Feb 2025 20:01:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qyft/gd/controller/ContainerController.java  |  3 ++-
 src/main/java/com/qyft/gd/mapper/ContainerMapper.java          |  2 ++
 src/main/java/com/qyft/gd/model/dto/ContainerDTO.java          |  2 +-
 src/main/java/com/qyft/gd/service/ContainerService.java        |  3 ++-
 .../java/com/qyft/gd/service/impl/ContainerServiceImpl.java    | 10 ++++++++--
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qyft/gd/controller/ContainerController.java b/src/main/java/com/qyft/gd/controller/ContainerController.java
index 1d7d371..06c2cc6 100644
--- a/src/main/java/com/qyft/gd/controller/ContainerController.java
+++ b/src/main/java/com/qyft/gd/controller/ContainerController.java
@@ -28,6 +28,7 @@ public class ContainerController {
     @Operation(summary = "更新容器配置")
     @PutMapping("/{id}")
     public Result<Boolean> updateContainer(@PathVariable Long id, @RequestBody ContainerDTO dto) {
-        return Result.success(containerService.updateById(id));
+        dto.setId(id);
+        return Result.success(containerService.updateById(dto));
     }
 }
diff --git a/src/main/java/com/qyft/gd/mapper/ContainerMapper.java b/src/main/java/com/qyft/gd/mapper/ContainerMapper.java
index 814e5ee..c46e42d 100644
--- a/src/main/java/com/qyft/gd/mapper/ContainerMapper.java
+++ b/src/main/java/com/qyft/gd/mapper/ContainerMapper.java
@@ -24,5 +24,7 @@ import java.util.List;
 public interface ContainerMapper extends BaseMapper<Container> {
 
     List<ContainerListVO> selectAll();
+
+
 }
 
diff --git a/src/main/java/com/qyft/gd/model/dto/ContainerDTO.java b/src/main/java/com/qyft/gd/model/dto/ContainerDTO.java
index fc22ef1..f5c9405 100644
--- a/src/main/java/com/qyft/gd/model/dto/ContainerDTO.java
+++ b/src/main/java/com/qyft/gd/model/dto/ContainerDTO.java
@@ -10,5 +10,5 @@ public class ContainerDTO {
     @Schema(description = "溶液id")
     private Long solutionId;
     @Schema(description = "已使用容量")
-    private Long capacityUsed;
+    private Integer capacityUsed;
 }
diff --git a/src/main/java/com/qyft/gd/service/ContainerService.java b/src/main/java/com/qyft/gd/service/ContainerService.java
index d5fa6f5..3fdfc1b 100644
--- a/src/main/java/com/qyft/gd/service/ContainerService.java
+++ b/src/main/java/com/qyft/gd/service/ContainerService.java
@@ -1,6 +1,7 @@
 package com.qyft.gd.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qyft.gd.model.dto.ContainerDTO;
 import com.qyft.gd.model.entity.Container;
 import com.qyft.gd.model.vo.ContainerListVO;
 
@@ -12,5 +13,5 @@ import java.util.List;
 public interface ContainerService extends IService<Container> {
     List<ContainerListVO> getAllContainer();
 
-    Boolean updateById(Long id);
+    Boolean updateById(ContainerDTO dto);
 }
diff --git a/src/main/java/com/qyft/gd/service/impl/ContainerServiceImpl.java b/src/main/java/com/qyft/gd/service/impl/ContainerServiceImpl.java
index bb25d2f..2b8468a 100644
--- a/src/main/java/com/qyft/gd/service/impl/ContainerServiceImpl.java
+++ b/src/main/java/com/qyft/gd/service/impl/ContainerServiceImpl.java
@@ -3,12 +3,14 @@ package com.qyft.gd.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qyft.gd.mapper.ContainerMapper;
 import com.qyft.gd.mapper.SysSettingsMapper;
+import com.qyft.gd.model.dto.ContainerDTO;
 import com.qyft.gd.model.entity.Container;
 import com.qyft.gd.model.entity.SysSettings;
 import com.qyft.gd.model.vo.ContainerListVO;
 import com.qyft.gd.service.ContainerService;
 import com.qyft.gd.service.SysSettingsService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -27,7 +29,11 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
     }
 
     @Override
-    public Boolean updateById(Long id) {
-        return null;
+    public Boolean updateById(ContainerDTO dto) {
+        Container container = new Container();
+        container.setId(dto.getId());
+        container.setSolutionId(dto.getSolutionId());
+        container.setCapacityUsed(dto.getCapacityUsed());
+        return this.baseMapper.updateById(container) > 0;
     }
 }