diff --git a/src/main/java/com/iflytop/gd/app/controller/ContainerController.java b/src/main/java/com/iflytop/gd/app/controller/ContainerController.java new file mode 100644 index 0000000..c2799e8 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/controller/ContainerController.java @@ -0,0 +1,33 @@ +package com.iflytop.gd.app.controller; + +import com.iflytop.gd.app.model.entity.Container; +import com.iflytop.gd.app.service.ContainerService; +import com.iflytop.gd.common.result.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Tag(name = "容器") +@RestController +@RequestMapping("/api/container") +@RequiredArgsConstructor +@Slf4j +public class ContainerController { + private final ContainerService containerService; + + @Operation(summary = "容器列表") + @GetMapping("/list") + public Result> getAllContainer() { + return Result.success(containerService.getAllContainer()); + } + + @Operation(summary = "更新容器配置") + @PutMapping("") + public Result updateContainer(@RequestBody Container container) { + return Result.success(containerService.updateById(container)); + } +} diff --git a/src/main/java/com/iflytop/gd/app/mapper/ContainerMapper.java b/src/main/java/com/iflytop/gd/app/mapper/ContainerMapper.java new file mode 100644 index 0000000..bc271a9 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/mapper/ContainerMapper.java @@ -0,0 +1,15 @@ +package com.iflytop.gd.app.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iflytop.gd.app.model.entity.Container; +import org.apache.ibatis.annotations.Mapper; + + +/** + * 容器持久层接口 + */ +@Mapper +public interface ContainerMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/iflytop/gd/app/model/entity/Container.java b/src/main/java/com/iflytop/gd/app/model/entity/Container.java new file mode 100644 index 0000000..7e667ac --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/model/entity/Container.java @@ -0,0 +1,32 @@ +package com.iflytop.gd.app.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.gd.infrastructure.repository.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = false) +@Schema(description = "容器表") +@TableName("container") +@Data +public class Container extends BaseEntity { + @NotBlank + @Schema(description = "类型 0 溶液 1 废液") + private Long type; + + @Schema(description = "溶液id") + private Long solutionId; + + @Schema(description = "机器id") + private String pumpId; + + @NotBlank + @Schema(description = "总容量") + private Integer capacityTotal; + + @NotBlank + @Schema(description = "使用容量") + private Integer capacityUsed; +} diff --git a/src/main/java/com/iflytop/gd/app/model/vo/ContainerListVO.java b/src/main/java/com/iflytop/gd/app/model/vo/ContainerListVO.java new file mode 100644 index 0000000..307f24c --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/model/vo/ContainerListVO.java @@ -0,0 +1,13 @@ +package com.iflytop.gd.app.model.vo; + +import com.iflytop.gd.app.model.entity.Container; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Schema(description = "容器") +@Data +public class ContainerListVO extends Container { + +} diff --git a/src/main/java/com/iflytop/gd/app/service/ContainerService.java b/src/main/java/com/iflytop/gd/app/service/ContainerService.java new file mode 100644 index 0000000..49b3af9 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/service/ContainerService.java @@ -0,0 +1,27 @@ +package com.iflytop.gd.app.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iflytop.gd.app.mapper.ContainerMapper; +import com.iflytop.gd.app.model.entity.Container; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 容器实现类 + */ +@Service +@RequiredArgsConstructor +public class ContainerService extends ServiceImpl{ + private final ContainerMapper containerMapper; + + public List getAllContainer() { + return this.list(); + } + + public Boolean updateContainer(Container container) { + return this.updateById(container); + } + +}