diff --git a/matrix-spray.db b/matrix-spray.db index 595186b..0b9aa07 100644 Binary files a/matrix-spray.db and b/matrix-spray.db differ diff --git a/sql/init.sql b/sql/init.sql index da0a559..973732a 100644 --- a/sql/init.sql +++ b/sql/init.sql @@ -49,14 +49,16 @@ CREATE TABLE IF NOT EXISTS matrix_craft id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, matrix_id INTEGER NOT NULL, - route_type INTEGER, - height INTEGER, - nitrogen_flow_velocity INTEGER, - nitrogen_air_pressure INTEGER, + matrix_path_type TEXT NOT NULL, + motor_z_height INTEGER, + gas_pressure INTEGER, + volume INTEGER, matrix_flow_velocity INTEGER, - voltage INTEGER, - movement_speed INTEGER, - space INTEGER, + high_voltage BOOLEAN, + high_voltage_value INTEGER, + spacing INTEGER, + moving_speed INTEGER, + times INTEGER, create_user INTEGER, create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP diff --git a/src/main/java/com/qyft/ms/app/controller/MatrixCraftController.java b/src/main/java/com/qyft/ms/app/controller/MatrixCraftController.java index 5a13cf6..d4d044f 100644 --- a/src/main/java/com/qyft/ms/app/controller/MatrixCraftController.java +++ b/src/main/java/com/qyft/ms/app/controller/MatrixCraftController.java @@ -1,4 +1,5 @@ package com.qyft.ms.app.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qyft.ms.app.model.dto.MatrixCraftDTO; @@ -31,39 +32,46 @@ public class MatrixCraftController { private final MatrixCraftService matrixCraftService; private final IUserService iUserService; - @Operation(summary = "新增基质工艺") + @Operation(summary = "新增工艺") @PostMapping("/add") - public Result add(@RequestBody @Validated MatrixCraftDTO dto) { + public Result add(@RequestBody MatrixCraft dto) { User user = iUserService.currentUser(); if (user != null) { dto.setCreateUser(user.getId()); } - return Result.success(matrixCraftService.add(dto)); + return Result.success(matrixCraftService.save(dto)); } - @Operation(summary = "基质工艺详情") + @Operation(summary = "工艺详情") @GetMapping("/{id}") public Result getCraftById(@PathVariable Long id) { - return Result.success(matrixCraftService.getCraftById(id)); + return Result.success(matrixCraftService.getBaseMapper().selectOne(new QueryWrapper().eq("id", id))); } - @Operation(summary = "基质工艺列表") + @Operation(summary = "基质所属工艺") @GetMapping("/getListByMatrixId/{matrixId}") public Result> getListByMatrixId(@PathVariable Long matrixId) { - return Result.success(matrixCraftService.getListByMatrixId(matrixId)); + return Result.success(matrixCraftService.getBaseMapper().selectList(new QueryWrapper().eq("matrix_id", matrixId))); } @Operation(summary = "所有工艺列表") @PostMapping("/list") - public PageResult getAll(@RequestBody MatrixCraftPageDTO dto) { -// IPage result = matrixCraftService.page(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), null); - return PageResult.success(matrixCraftService.getAll(dto)); + public PageResult getAll(@RequestBody MatrixCraftPageDTO dto) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (dto.getMatrixId() != null) { + queryWrapper.eq("matrix_id", dto.getMatrixId()); + } + if (dto.getMatrixCraftName() != null) { + queryWrapper.like("name", dto.getMatrixCraftName()); + } + IPage result = matrixCraftService.page(new Page<>(dto.getPageNum(), dto.getPageSize()), queryWrapper); + return PageResult.success(result); } @Operation(summary = "基质工艺更新") @PutMapping public Result update(@RequestBody MatrixCraft matrixCraft) { - return Result.success(matrixCraftService.updateMatrixCraft(matrixCraft)); + return Result.success(matrixCraftService.updateById(matrixCraft)); } @Operation(summary = "基质删除") diff --git a/src/main/java/com/qyft/ms/app/controller/PositionController.java b/src/main/java/com/qyft/ms/app/controller/PositionController.java new file mode 100644 index 0000000..90e142d --- /dev/null +++ b/src/main/java/com/qyft/ms/app/controller/PositionController.java @@ -0,0 +1,65 @@ +package com.qyft.ms.app.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.qyft.ms.app.model.dto.MatrixCraftPageDTO; +import com.qyft.ms.app.model.entity.MatrixCraft; +import com.qyft.ms.app.model.entity.Position; +import com.qyft.ms.app.service.MatrixCraftService; +import com.qyft.ms.app.service.PositionService; +import com.qyft.ms.system.common.base.BasePageQuery; +import com.qyft.ms.system.common.result.PageResult; +import com.qyft.ms.system.common.result.Result; +import com.qyft.ms.system.model.entity.User; +import com.qyft.ms.system.service.IUserService; +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/position") +@RequiredArgsConstructor +@Slf4j +public class PositionController { + + private final PositionService positionService; + + @Operation(summary = "新增坐标") + @PostMapping("/add") + public Result add(@RequestBody Position dto) { + + return Result.success(positionService.save(dto)); + } + + @Operation(summary = "坐标详情") + @GetMapping("/{id}") + public Result getPositionById(@PathVariable Long id) { + return Result.success(positionService.getBaseMapper().selectOne(new QueryWrapper().eq("id", id))); + } + + + @Operation(summary = "坐标list") + @PostMapping("/list") + public PageResult getAll(@RequestBody BasePageQuery pageQuery) { + IPage result = positionService.page(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize())); + return PageResult.success(result); + } + + @Operation(summary = "坐标更新") + @PutMapping + public Result update(@RequestBody Position position) { + return Result.success(positionService.updateById(position)); + } + + @Operation(summary = "坐标删除") + @DeleteMapping("/{ids}") + public Result deleteMatrixCraft(@PathVariable String ids) { + return Result.success(positionService.delete(ids)); + } +} \ No newline at end of file diff --git a/src/main/java/com/qyft/ms/app/mapper/MatrixCraftMapper.java b/src/main/java/com/qyft/ms/app/mapper/MatrixCraftMapper.java index d971140..4041780 100644 --- a/src/main/java/com/qyft/ms/app/mapper/MatrixCraftMapper.java +++ b/src/main/java/com/qyft/ms/app/mapper/MatrixCraftMapper.java @@ -14,5 +14,5 @@ import java.util.List; public interface MatrixCraftMapper extends BaseMapper { List getListByMatrixId(Long matrixId); - Integer add(MatrixCraftDTO dto); + Integer add(MatrixCraft dto); } diff --git a/src/main/java/com/qyft/ms/app/mapper/PositionMapper.java b/src/main/java/com/qyft/ms/app/mapper/PositionMapper.java new file mode 100644 index 0000000..89be117 --- /dev/null +++ b/src/main/java/com/qyft/ms/app/mapper/PositionMapper.java @@ -0,0 +1,15 @@ +package com.qyft.ms.app.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qyft.ms.app.model.entity.MatrixCraft; +import com.qyft.ms.app.model.entity.Position; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 基质持久层接口 + */ +@Mapper +public interface PositionMapper extends BaseMapper { +} diff --git a/src/main/java/com/qyft/ms/app/model/dto/MatrixCraftDTO.java b/src/main/java/com/qyft/ms/app/model/dto/MatrixCraftDTO.java index 7351d63..68562c8 100644 --- a/src/main/java/com/qyft/ms/app/model/dto/MatrixCraftDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/MatrixCraftDTO.java @@ -23,8 +23,6 @@ public class MatrixCraftDTO { @Schema(description = "喷涂高度") private Integer height; - @Schema(description = "氮气流速") - private Integer nitrogenFlowVelocity; @Schema(description = "氮气气压") private Integer nitrogenAirPressure; diff --git a/src/main/java/com/qyft/ms/app/model/entity/MatrixCraft.java b/src/main/java/com/qyft/ms/app/model/entity/MatrixCraft.java index 85d8721..eab8fcf 100644 --- a/src/main/java/com/qyft/ms/app/model/entity/MatrixCraft.java +++ b/src/main/java/com/qyft/ms/app/model/entity/MatrixCraft.java @@ -42,34 +42,35 @@ public class MatrixCraft extends BaseEntity { @NotBlank @Schema(description = "路径类型 0 竖向 1 横向") - private Integer matrixPathType; + private String matrixPathType; @NotBlank @Schema(description = "喷涂高度") - private Integer motorZHeight; + private Double motorZHeight; @NotBlank - @Schema(description = "氮气流速") - private Integer nitrogenFlowVelocity; - @NotBlank @Schema(description = "氮气气压") - private Integer gasPressure; + private Double gasPressure; @NotBlank @Schema(description = "基质流速") - private Integer volume; + private Double volume; + + @NotBlank + @Schema(description = "是否电压") + private Boolean highVoltage; @NotBlank @Schema(description = "电压") - private Integer highVoltage; + private Double highVoltageValue; @NotBlank @Schema(description = "移速") - private Integer movingSpeed; + private Double movingSpeed; @NotBlank @Schema(description = "行间距") - private Integer spacing; + private Double spacing; @NotBlank @Schema(description = "喷涂遍数") diff --git a/src/main/java/com/qyft/ms/app/model/entity/Position.java b/src/main/java/com/qyft/ms/app/model/entity/Position.java index 1495fe3..17a927c 100644 --- a/src/main/java/com/qyft/ms/app/model/entity/Position.java +++ b/src/main/java/com/qyft/ms/app/model/entity/Position.java @@ -3,6 +3,7 @@ package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.qyft.ms.system.common.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,6 +12,21 @@ import lombok.EqualsAndHashCode; @TableName("position") @Data public class Position extends BaseEntity { + @NotBlank + @Schema(description = "名称") + private String pointName; + + @NotBlank + @Schema(description = "x") + private Double x; + + @NotBlank + @Schema(description = "y") + private Double y; + + @NotBlank + @Schema(description = "z") + private Double z; } diff --git a/src/main/java/com/qyft/ms/app/service/MatrixCraftService.java b/src/main/java/com/qyft/ms/app/service/MatrixCraftService.java index ec8df52..f05869d 100644 --- a/src/main/java/com/qyft/ms/app/service/MatrixCraftService.java +++ b/src/main/java/com/qyft/ms/app/service/MatrixCraftService.java @@ -16,7 +16,7 @@ import java.util.List; */ public interface MatrixCraftService extends IService { - Integer add(MatrixCraftDTO dto); + Integer add(MatrixCraft dto); MatrixCraft getCraftById(Long id); diff --git a/src/main/java/com/qyft/ms/app/service/PositionService.java b/src/main/java/com/qyft/ms/app/service/PositionService.java new file mode 100644 index 0000000..2ff0d2e --- /dev/null +++ b/src/main/java/com/qyft/ms/app/service/PositionService.java @@ -0,0 +1,13 @@ +package com.qyft.ms.app.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qyft.ms.app.model.entity.Position; + + +/** + * 日志业务接口 + */ +public interface PositionService extends IService { + + Boolean delete(String ids); +} diff --git a/src/main/java/com/qyft/ms/app/service/impl/MatrixCraftServiceImpl.java b/src/main/java/com/qyft/ms/app/service/impl/MatrixCraftServiceImpl.java index 11614af..8d3ff4c 100644 --- a/src/main/java/com/qyft/ms/app/service/impl/MatrixCraftServiceImpl.java +++ b/src/main/java/com/qyft/ms/app/service/impl/MatrixCraftServiceImpl.java @@ -34,7 +34,7 @@ public class MatrixCraftServiceImpl extends ServiceImpl implements PositionService { + + @Override + public Boolean delete(String ids) { + List idsArr = Arrays.stream(ids.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()); + return this.removeByIds(idsArr); + } + + +}