diff --git a/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java new file mode 100644 index 0000000..ea49417 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java @@ -0,0 +1,55 @@ +package com.iflytop.handacid.app.controller; + +import com.iflytop.handacid.common.model.entity.AuditRecord; +import com.iflytop.handacid.common.service.AuditRecordService; +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.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +/** + * 审计 + */ +@Tag(name = "审计") +@RestController +@RequestMapping("/api/audit-record") +@RequiredArgsConstructor +@Slf4j +public class AuditRecordController { + @Autowired + private AuditRecordService auditRecordService; + + @GetMapping + @Operation(summary = "获取list数据") + public List getAll() { + return auditRecordService.list(); + } + + @GetMapping("/{id}") + @Operation(summary = "根据ID获取记录") + public AuditRecord getById(@PathVariable Integer id) { + return auditRecordService.getById(id); + } + + @PostMapping + @Operation(summary = "增加记录") + public boolean create(@RequestBody AuditRecord auditRecord) { + return auditRecordService.save(auditRecord); + } + + @PutMapping + @Operation(summary = "修改记录") + public boolean update(@RequestBody AuditRecord auditRecord) { + return auditRecordService.updateById(auditRecord); + } + + @DeleteMapping("/{id}") + @Operation(summary = "删除记录") + public boolean delete(@PathVariable Integer id) { + return auditRecordService.removeById(id); + } +} + diff --git a/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java b/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java new file mode 100644 index 0000000..8880c23 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java @@ -0,0 +1,44 @@ +package com.iflytop.handacid.app.controller; + +import com.iflytop.handacid.common.model.entity.Channel; +import com.iflytop.handacid.common.service.ChannelService; +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.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +/** + * 通道 + */ +@Tag(name = "通道") +@RestController +@RequestMapping("/api/channel") +@RequiredArgsConstructor +@Slf4j +public class ChannelController { + @Autowired + private ChannelService channelService; + + @GetMapping + @Operation(summary = "获取list数据") + public List getAll() { + return channelService.list(); + } + + @GetMapping("/{id}") + @Operation(summary = "根据ID获取记录") + public Channel getById(@PathVariable Integer id) { + return channelService.getById(id); + } + + @PutMapping + @Operation(summary = "修改记录") + public boolean update(@RequestBody Channel channel) { + return channelService.updateById(channel); + } + +} + diff --git a/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java b/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java new file mode 100644 index 0000000..fff5568 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java @@ -0,0 +1,48 @@ +package com.iflytop.handacid.app.controller; + +import com.iflytop.handacid.common.model.entity.Formulation; +import com.iflytop.handacid.common.service.FormulationService; +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.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +/** + * 配方 + */ +@Tag(name = "配方") +@RestController +@RequestMapping("/api/formulation") +@RequiredArgsConstructor +@Slf4j +public class FormulationController { + @Autowired + private FormulationService formulationService; + + @GetMapping + @Operation(summary = "获取List数据") + public List getAll() { + return formulationService.list(); + } + + @GetMapping("/{id}") + @Operation(summary = "根据ID获取") + public Formulation getById(@PathVariable Integer id) { + return formulationService.getById(id); + } + + @PostMapping + @Operation(summary = "创建配方") + public boolean create(@RequestBody Formulation formulation) { + return formulationService.save(formulation); + } + @DeleteMapping("/{id}") + @Operation(summary = "删除配方") + public boolean delete(@PathVariable Integer id) { + return formulationService.removeById(id); + } + +} diff --git a/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java new file mode 100644 index 0000000..21f7409 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java @@ -0,0 +1,55 @@ +package com.iflytop.handacid.app.controller; + +import com.iflytop.handacid.common.model.entity.ReceiveRecord; +import com.iflytop.handacid.common.service.ReceiveRecordService; +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.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +/** + * 领取 + */ +@Tag(name = "领取记录") +@RestController +@RequestMapping("/api/receive-record") +@RequiredArgsConstructor +@Slf4j +public class ReceiveRecordController { + @Autowired + private ReceiveRecordService receiveRecordService; + + @GetMapping + @Operation(summary = "获取List数据") + public List getAll() { + return receiveRecordService.list(); + } + + @GetMapping("/{id}") + @Operation(summary = "根据ID获取") + public ReceiveRecord getById(@PathVariable Integer id) { + return receiveRecordService.getById(id); + } + + @PostMapping + @Operation(summary = "新增记录") + public boolean create(@RequestBody ReceiveRecord receiveRecord) { + return receiveRecordService.save(receiveRecord); + } + + @PutMapping + @Operation(summary = "修改记录") + public boolean update(@RequestBody ReceiveRecord receiveRecord) { + return receiveRecordService.updateById(receiveRecord); + } + + @DeleteMapping("/{id}") + @Operation(summary = "删除记录") + public boolean delete(@PathVariable Integer id) { + return receiveRecordService.removeById(id); + } +} + diff --git a/src/main/java/com/iflytop/handacid/app/controller/SolutionsController.java b/src/main/java/com/iflytop/handacid/app/controller/SolutionController.java similarity index 76% rename from src/main/java/com/iflytop/handacid/app/controller/SolutionsController.java rename to src/main/java/com/iflytop/handacid/app/controller/SolutionController.java index d2b68a1..7294013 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/SolutionsController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/SolutionController.java @@ -2,10 +2,10 @@ package com.iflytop.handacid.app.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iflytop.handacid.common.base.BasePageQuery; -import com.iflytop.handacid.common.model.entity.Solutions; +import com.iflytop.handacid.common.model.entity.Solution; import com.iflytop.handacid.common.result.PageResult; import com.iflytop.handacid.common.result.Result; -import com.iflytop.handacid.common.service.SolutionsService; +import com.iflytop.handacid.common.service.SolutionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -17,28 +17,28 @@ import java.util.Arrays; @Tag(name = "\uD83D\uDCA7溶液接口") @RestController -@RequestMapping("/api/solutions") +@RequestMapping("/api/solution") @RequiredArgsConstructor @Slf4j -public class SolutionsController { +public class SolutionController { - private final SolutionsService solutionsService; + private final SolutionService solutionsService; @Operation(summary = "分页查询溶液") @PostMapping("/list") - public PageResult list(@RequestBody BasePageQuery query) { + public PageResult list(@RequestBody BasePageQuery query) { return PageResult.success(solutionsService.page(new Page<>(query.getPageNum(), query.getPageSize()))); } @Operation(summary = "添加溶液") @PostMapping("") - public Result add(@Valid @RequestBody Solutions solutions) { + public Result add(@Valid @RequestBody Solution solutions) { return solutionsService.save(solutions) ? Result.success() : Result.failed(); } @Operation(summary = "修改溶液") @PutMapping("") - public Result update(@Valid @RequestBody Solutions solutions) { + public Result update(@Valid @RequestBody Solution solutions) { return solutionsService.updateById(solutions) ? Result.success() : Result.failed(); } diff --git a/src/main/java/com/iflytop/handacid/common/mapper/AuditRecordMapper.java b/src/main/java/com/iflytop/handacid/common/mapper/AuditRecordMapper.java new file mode 100644 index 0000000..9256149 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/mapper/AuditRecordMapper.java @@ -0,0 +1,11 @@ +package com.iflytop.handacid.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iflytop.handacid.common.model.entity.AuditRecord; +import org.apache.ibatis.annotations.Mapper; +/** + * 审计记录置持久层接口 + */ +@Mapper +public interface AuditRecordMapper extends BaseMapper { +} diff --git a/src/main/java/com/iflytop/handacid/common/mapper/ChannelMapper.java b/src/main/java/com/iflytop/handacid/common/mapper/ChannelMapper.java new file mode 100644 index 0000000..da3973c --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/mapper/ChannelMapper.java @@ -0,0 +1,11 @@ +package com.iflytop.handacid.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iflytop.handacid.common.model.entity.Channel; +import org.apache.ibatis.annotations.Mapper; +/** + * 通道持久层接口 + */ +@Mapper +public interface ChannelMapper extends BaseMapper { +} diff --git a/src/main/java/com/iflytop/handacid/common/mapper/FormulationMapper.java b/src/main/java/com/iflytop/handacid/common/mapper/FormulationMapper.java new file mode 100644 index 0000000..30ae42d --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/mapper/FormulationMapper.java @@ -0,0 +1,11 @@ +package com.iflytop.handacid.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iflytop.handacid.common.model.entity.Formulation; +import org.apache.ibatis.annotations.Mapper; +/** + * 配方持久层接口 + */ +@Mapper +public interface FormulationMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/handacid/common/mapper/ReceiveRecordMapper.java b/src/main/java/com/iflytop/handacid/common/mapper/ReceiveRecordMapper.java new file mode 100644 index 0000000..188b76d --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/mapper/ReceiveRecordMapper.java @@ -0,0 +1,11 @@ +package com.iflytop.handacid.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iflytop.handacid.common.model.entity.ReceiveRecord; +import org.apache.ibatis.annotations.Mapper; +/** + * 领取记录持久层接口 + */ +@Mapper +public interface ReceiveRecordMapper extends BaseMapper { +} diff --git a/src/main/java/com/iflytop/handacid/common/mapper/SolutionsMapper.java b/src/main/java/com/iflytop/handacid/common/mapper/SolutionMapper.java similarity index 60% rename from src/main/java/com/iflytop/handacid/common/mapper/SolutionsMapper.java rename to src/main/java/com/iflytop/handacid/common/mapper/SolutionMapper.java index 4c625b6..e03072d 100644 --- a/src/main/java/com/iflytop/handacid/common/mapper/SolutionsMapper.java +++ b/src/main/java/com/iflytop/handacid/common/mapper/SolutionMapper.java @@ -2,12 +2,12 @@ package com.iflytop.handacid.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.iflytop.handacid.common.model.entity.Solutions; +import com.iflytop.handacid.common.model.entity.Solution; import org.apache.ibatis.annotations.Mapper; /** * 溶液持久层接口 */ @Mapper -public interface SolutionsMapper extends BaseMapper { +public interface SolutionMapper extends BaseMapper { } \ No newline at end of file diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java b/src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java new file mode 100644 index 0000000..958613b --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java @@ -0,0 +1,26 @@ +package com.iflytop.handacid.common.model.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.iflytop.handacid.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("audit_record") +@Schema(description = "审计记录") +public class AuditRecord extends BaseEntity { + @Schema(description = "用户ID") + private Integer userId; + @Schema(description = "用户名称") + private String userName; + @Schema(description = "酸液ID") + private Integer solutionId; + @Schema(description = "酸液名称") + private String solutionName; + @Schema(description = "通道ID") + private Integer channelId; + @Schema(description = "加液量") + private String volume; +} diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/Channel.java b/src/main/java/com/iflytop/handacid/common/model/entity/Channel.java new file mode 100644 index 0000000..efda367 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/model/entity/Channel.java @@ -0,0 +1,20 @@ +package com.iflytop.handacid.common.model.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.iflytop.handacid.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("channel") +@Schema(description = "通道") +public class Channel extends BaseEntity { + @Schema(description = "名称") + private String name; + @Schema(description = "酸液ID") + private Integer solutionId; + +} + diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java b/src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java new file mode 100644 index 0000000..46a70d4 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java @@ -0,0 +1,26 @@ +package com.iflytop.handacid.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.handacid.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@TableName("formulation") +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "配方") +public class Formulation extends BaseEntity { + @Schema(description = "名称") + private String name; + @Schema(description = "酸液ID") + private Integer solutionId; + @Schema(description = "酸液名称") + private String solutionName; + @Schema(description = "浓度") + private String concentration; + @Schema(description = "系数") + private String scale; + @Schema(description = "转数") + private String revolutions; +} diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java b/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java new file mode 100644 index 0000000..c9b5f99 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java @@ -0,0 +1,27 @@ +package com.iflytop.handacid.common.model.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.iflytop.handacid.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +@TableName("receive_record") +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "领取记录") +public class ReceiveRecord extends BaseEntity { + @Schema(description = "用户ID") + private Integer userId; + @Schema(description = "用户名称") + private String userName; + @Schema(description = "酸液ID") + private Integer solutionId; + @Schema(description = "酸液名称") + private String solutionName; + @Schema(description = "通道ID") + private Integer channelId; + @Schema(description = "申请量") + private String volume; +} diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/Solutions.java b/src/main/java/com/iflytop/handacid/common/model/entity/Solution.java similarity index 85% rename from src/main/java/com/iflytop/handacid/common/model/entity/Solutions.java rename to src/main/java/com/iflytop/handacid/common/model/entity/Solution.java index bf9a347..58a07c8 100644 --- a/src/main/java/com/iflytop/handacid/common/model/entity/Solutions.java +++ b/src/main/java/com/iflytop/handacid/common/model/entity/Solution.java @@ -7,10 +7,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; @Data -@TableName("solutions") +@TableName("solution") @EqualsAndHashCode(callSuper = true) @Schema(description = "溶液") -public class Solutions extends BaseEntity { +public class Solution extends BaseEntity { @Schema(description = "溶液名称") private String name; diff --git a/src/main/java/com/iflytop/handacid/common/service/AuditRecordService.java b/src/main/java/com/iflytop/handacid/common/service/AuditRecordService.java new file mode 100644 index 0000000..ad08593 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/service/AuditRecordService.java @@ -0,0 +1,14 @@ +package com.iflytop.handacid.common.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iflytop.handacid.common.mapper.AuditRecordMapper; +import com.iflytop.handacid.common.model.entity.AuditRecord; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +/** + * 审计记录接口服务 + */ +@Service +@RequiredArgsConstructor +public class AuditRecordService extends ServiceImpl { +} diff --git a/src/main/java/com/iflytop/handacid/common/service/ChannelService.java b/src/main/java/com/iflytop/handacid/common/service/ChannelService.java new file mode 100644 index 0000000..a73c83e --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/service/ChannelService.java @@ -0,0 +1,14 @@ +package com.iflytop.handacid.common.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iflytop.handacid.common.mapper.ChannelMapper; +import com.iflytop.handacid.common.model.entity.Channel; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +/** + * 通道接口服务 + */ +@Service +@RequiredArgsConstructor +public class ChannelService extends ServiceImpl { +} diff --git a/src/main/java/com/iflytop/handacid/common/service/FormulationService.java b/src/main/java/com/iflytop/handacid/common/service/FormulationService.java new file mode 100644 index 0000000..12cd751 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/service/FormulationService.java @@ -0,0 +1,14 @@ +package com.iflytop.handacid.common.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iflytop.handacid.common.mapper.FormulationMapper; +import com.iflytop.handacid.common.model.entity.Formulation; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +/** + * 配方接口服务 + */ +@Service +@RequiredArgsConstructor +public class FormulationService extends ServiceImpl { +} diff --git a/src/main/java/com/iflytop/handacid/common/service/ReceiveRecordService.java b/src/main/java/com/iflytop/handacid/common/service/ReceiveRecordService.java new file mode 100644 index 0000000..d29daa1 --- /dev/null +++ b/src/main/java/com/iflytop/handacid/common/service/ReceiveRecordService.java @@ -0,0 +1,14 @@ +package com.iflytop.handacid.common.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iflytop.handacid.common.mapper.ReceiveRecordMapper; +import com.iflytop.handacid.common.model.entity.ReceiveRecord; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +/** + * 领取记录接口服务 + */ +@Service +@RequiredArgsConstructor +public class ReceiveRecordService extends ServiceImpl { +} diff --git a/src/main/java/com/iflytop/handacid/common/service/SolutionsService.java b/src/main/java/com/iflytop/handacid/common/service/SolutionService.java similarity index 57% rename from src/main/java/com/iflytop/handacid/common/service/SolutionsService.java rename to src/main/java/com/iflytop/handacid/common/service/SolutionService.java index 52d7278..aeefcc1 100644 --- a/src/main/java/com/iflytop/handacid/common/service/SolutionsService.java +++ b/src/main/java/com/iflytop/handacid/common/service/SolutionService.java @@ -1,8 +1,8 @@ package com.iflytop.handacid.common.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.iflytop.handacid.common.model.entity.Solutions; -import com.iflytop.handacid.common.mapper.SolutionsMapper; +import com.iflytop.handacid.common.mapper.SolutionMapper; +import com.iflytop.handacid.common.model.entity.Solution; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -11,6 +11,6 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class SolutionsService extends ServiceImpl { +public class SolutionService extends ServiceImpl { } \ No newline at end of file