11 changed files with 209 additions and 593 deletions
-
45src/main/java/com/qyft/ms/app/controller/MatrixCraftController.java
-
2src/main/java/com/qyft/ms/app/mapper/MatrixCraftMapper.java
-
82src/main/java/com/qyft/ms/app/model/bo/SprayTimes.java
-
48src/main/java/com/qyft/ms/app/model/dto/MatrixCraftDTO.java
-
64src/main/java/com/qyft/ms/app/model/entity/MatrixCraft.java
-
35src/main/java/com/qyft/ms/app/model/vo/MatrixCraftListVO.java
-
13src/main/java/com/qyft/ms/app/model/vo/MatrixCraftResult.java
-
35src/main/java/com/qyft/ms/app/service/MatrixCraftService.java
-
265src/main/java/com/qyft/ms/system/common/result/ResultCode.java
-
2src/main/java/com/qyft/ms/system/common/utils/ResponseUtils.java
-
211src/main/resources/sql/init.sql
@ -0,0 +1,82 @@ |
|||
package com.qyft.ms.app.model.bo; |
|||
|
|||
import io.swagger.v3.oas.annotations.media.Schema; |
|||
import lombok.Data; |
|||
|
|||
@Data |
|||
@Schema(description = "多次喷涂每次喷涂的参数") |
|||
public class SprayTimes { |
|||
|
|||
/** |
|||
* 喷涂路径类型 |
|||
*/ |
|||
@Schema(description = "喷涂路径类型") |
|||
private String matrixPathType; |
|||
|
|||
/** |
|||
* Z轴距离玻片的高度 |
|||
*/ |
|||
@Schema(description = "Z轴距离玻片的高度") |
|||
private Double motorZHeight; |
|||
|
|||
/** |
|||
* 氮气气压 |
|||
* Mpa兆帕 不处理 |
|||
*/ |
|||
@Schema(description = "氮气气压") |
|||
private Double gasPressure; |
|||
|
|||
/** |
|||
* 单位uL微升 基质流速(控制注射泵速度) |
|||
*/ |
|||
@Schema(description = "单位uL微升 基质流速(控制注射泵速度)") |
|||
private Double volume; |
|||
|
|||
/** |
|||
* 是否打开高压 |
|||
*/ |
|||
@Schema(description = "是否打开高压") |
|||
private Boolean highVoltage; |
|||
|
|||
/** |
|||
* 高压值 |
|||
*/ |
|||
@Schema(description = "高压值") |
|||
private Double highVoltageValue; |
|||
|
|||
/** |
|||
* 毫米 喷涂间距 |
|||
*/ |
|||
@Schema(description = " 喷涂间距（毫米）") |
|||
private Double spacing; |
|||
|
|||
/** |
|||
* 移动速度 轴速度 |
|||
*/ |
|||
@Schema(description = "轴移动速度") |
|||
private Double movingSpeed; |
|||
|
|||
/** |
|||
* 喷涂左上角x |
|||
*/ |
|||
@Schema(description = "喷涂左上角x") |
|||
private Double x1; |
|||
|
|||
/** |
|||
* 喷涂左上角y |
|||
*/ |
|||
@Schema(description = "喷涂左上角y") |
|||
private Double y1; |
|||
|
|||
/** |
|||
* 喷涂右下角x |
|||
*/ |
|||
@Schema(description = "喷涂右下角x") |
|||
private Double x2; |
|||
|
|||
/** |
|||
* 喷涂右下角y |
|||
*/ |
|||
@Schema(description = "喷涂右下角y") |
|||
private Double y2; |
|||
} |
|||
@ -1,48 +0,0 @@ |
|||
package com.qyft.ms.app.model.dto; |
|||
|
|||
import io.swagger.v3.oas.annotations.media.Schema; |
|||
import jakarta.validation.constraints.NotBlank; |
|||
import lombok.Data; |
|||
|
|||
@Data |
|||
public class MatrixCraftDTO { |
|||
|
|||
@NotBlank |
|||
@Schema(description = "名称") |
|||
private String name; |
|||
|
|||
@NotBlank |
|||
@Schema(description = "基质id") |
|||
private Long matrixId; |
|||
|
|||
@NotBlank |
|||
@Schema(description = "路径类型 0 竖向 1 横向") |
|||
private Integer routeType; |
|||
|
|||
@NotBlank |
|||
@Schema(description = "喷涂高度") |
|||
private Integer height; |
|||
|
|||
|
|||
@Schema(description = "氮气气压") |
|||
private Integer nitrogenAirPressure; |
|||
|
|||
@NotBlank |
|||
@Schema(description = "基质流速") |
|||
private Integer matrixFlowVelocity; |
|||
|
|||
@NotBlank |
|||
@Schema(description = "电压") |
|||
private Integer voltage; |
|||
|
|||
@NotBlank |
|||
@Schema(description = "移速") |
|||
private Integer movementSpeed; |
|||
|
|||
@NotBlank |
|||
@Schema(description = "行间距") |
|||
private Integer space; |
|||
|
|||
@Schema(description = "创建人") |
|||
private Long createUser; |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.qyft.ms.app.model.vo; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.FieldFill; |
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import io.swagger.v3.oas.annotations.media.Schema; |
|||
import lombok.Data; |
|||
|
|||
import java.time.LocalDateTime; |
|||
|
|||
@Data |
|||
public class MatrixCraftListVO { |
|||
|
|||
private Long id; |
|||
|
|||
@Schema(description = "名称") |
|||
private String name; |
|||
|
|||
@Schema(description = "基质id") |
|||
private Long matrixId; |
|||
|
|||
@Schema(description = "基质名称") |
|||
private String matrixName; |
|||
|
|||
@TableField(fill = FieldFill.INSERT) |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
private LocalDateTime createTime; |
|||
|
|||
|
|||
@TableField(fill = FieldFill.INSERT_UPDATE) |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
private LocalDateTime updateTime; |
|||
|
|||
|
|||
} |
|||
@ -1,13 +0,0 @@ |
|||
package com.qyft.ms.app.model.vo; |
|||
|
|||
import com.qyft.ms.app.model.entity.MatrixCraft; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
@EqualsAndHashCode(callSuper = true) |
|||
@Data |
|||
public class MatrixCraftResult extends MatrixCraft { |
|||
|
|||
private String matrixName; |
|||
|
|||
} |
|||
@ -1,177 +1,70 @@ |
|||
-- 创建 matrix 基质类型表 |
|||
CREATE TABLE IF NOT EXISTS matrix |
|||
( |
|||
id |
|||
INTEGER |
|||
PRIMARY |
|||
KEY |
|||
AUTOINCREMENT, |
|||
name |
|||
TEXT |
|||
NOT |
|||
NULL, |
|||
create_time |
|||
TIMESTAMP |
|||
DEFAULT |
|||
CURRENT_TIMESTAMP, |
|||
update_time |
|||
TIMESTAMP |
|||
DEFAULT |
|||
CURRENT_TIMESTAMP |
|||
CREATE TABLE IF NOT EXISTS matrix ( |
|||
id INTEGER PRIMARY KEY AUTOINCREMENT, |
|||
name TEXT NOT NULL, |
|||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, |
|||
update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP |
|||
); |
|||
|
|||
-- 插入 matrix 表数据 |
|||
INSERT |
|||
OR IGNORE INTO matrix (id, name, create_time, update_time) |
|||
VALUES (1, 'DHB', null, null); |
|||
INSERT OR IGNORE INTO matrix (id, name, create_time, update_time) |
|||
VALUES |
|||
(1, 'DHB', NULL, NULL); |
|||
|
|||
-- 创建 matrix_craft 基质工艺表 |
|||
CREATE TABLE IF NOT EXISTS matrix_craft |
|||
( |
|||
id |
|||
INTEGER |
|||
PRIMARY |
|||
KEY |
|||
AUTOINCREMENT, |
|||
name |
|||
TEXT |
|||
NOT |
|||
NULL, |
|||
matrix_id |
|||
INTEGER |
|||
NOT |
|||
NULL, |
|||
matrix_path_type |
|||
TEXT |
|||
NOT |
|||
NULL, |
|||
motor_z_height |
|||
INTEGER, |
|||
gas_pressure |
|||
INTEGER, |
|||
volume |
|||
INTEGER, |
|||
matrix_flow_velocity |
|||
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 |
|||
CREATE TABLE IF NOT EXISTS matrix_craft ( |
|||
id INTEGER PRIMARY KEY AUTOINCREMENT, |
|||
name TEXT NOT NULL, |
|||
matrix_id INTEGER NOT NULL, |
|||
times TEXT, |
|||
create_user INTEGER, |
|||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, |
|||
update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP |
|||
); |
|||
|
|||
-- 创建 operation_log 操作记录表 |
|||
CREATE TABLE IF NOT EXISTS operation_log |
|||
( |
|||
id |
|||
INTEGER |
|||
PRIMARY |
|||
KEY |
|||
AUTOINCREMENT, |
|||
matrix_id |
|||
INTEGER, |
|||
matrix_info |
|||
TEXT, |
|||
status |
|||
INTEGER, |
|||
create_user |
|||
INTEGER, |
|||
create_time |
|||
TIMESTAMP |
|||
DEFAULT |
|||
CURRENT_TIMESTAMP, |
|||
update_time |
|||
TIMESTAMP |
|||
DEFAULT |
|||
CURRENT_TIMESTAMP |
|||
CREATE TABLE IF NOT EXISTS operation_log ( |
|||
id INTEGER PRIMARY KEY AUTOINCREMENT, |
|||
matrix_id INTEGER, |
|||
matrix_info TEXT, |
|||
status INTEGER, |
|||
create_user INTEGER, |
|||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, |
|||
update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP |
|||
); |
|||
|
|||
-- 创建 sys_settings 系统配置表 |
|||
CREATE TABLE IF NOT EXISTS sys_settings |
|||
( |
|||
id |
|||
INTEGER |
|||
PRIMARY |
|||
KEY |
|||
AUTOINCREMENT, |
|||
parent_id |
|||
INTEGER, |
|||
name |
|||
TEXT |
|||
NOT |
|||
NULL, |
|||
code |
|||
TEXT, |
|||
value |
|||
TEXT |
|||
CREATE TABLE IF NOT EXISTS sys_settings ( |
|||
id INTEGER PRIMARY KEY AUTOINCREMENT, |
|||
parent_id INTEGER, |
|||
name TEXT NOT NULL, |
|||
code TEXT, |
|||
value TEXT |
|||
); |
|||
|
|||
|
|||
-- 插入 sys_settings 表数据 |
|||
INSERT |
|||
OR IGNORE INTO sys_settings (id, parent_id, name, code, value) |
|||
VALUES (1, NULL, '玻片高度', 'slide_height', 101.2), |
|||
(2, NULL, 'z轴安全高度', 'safe_z_height', 80); |
|||
|
|||
|
|||
INSERT OR IGNORE INTO sys_settings (id, parent_id, name, code, value) |
|||
VALUES |
|||
(1, NULL, '玻片高度', 'slide_height', 101.2), |
|||
(2, NULL, 'z轴安全高度', 'safe_z_height', 80); |
|||
|
|||
-- 位置表，用来存储设备固定点位 |
|||
CREATE TABLE IF NOT EXISTS position |
|||
( |
|||
id |
|||
INTEGER |
|||
PRIMARY |
|||
KEY |
|||
AUTOINCREMENT, |
|||
point_name |
|||
TEXT |
|||
NOT |
|||
NULL, |
|||
point_code |
|||
TEXT |
|||
NOT |
|||
NULL, |
|||
x |
|||
REAL |
|||
NOT |
|||
NULL, |
|||
y |
|||
REAL |
|||
NOT |
|||
NULL, |
|||
z |
|||
REAL |
|||
NOT |
|||
NULL, |
|||
create_time |
|||
TIMESTAMP |
|||
DEFAULT |
|||
CURRENT_TIMESTAMP, |
|||
update_time |
|||
TIMESTAMP |
|||
DEFAULT |
|||
CURRENT_TIMESTAMP |
|||
-- 创建 position 位置表，用来存储设备固定点位 |
|||
CREATE TABLE IF NOT EXISTS position ( |
|||
id INTEGER PRIMARY KEY AUTOINCREMENT, |
|||
point_name TEXT NOT NULL, |
|||
point_code TEXT NOT NULL, |
|||
x REAL NOT NULL, |
|||
y REAL NOT NULL, |
|||
z REAL NOT NULL, |
|||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, |
|||
update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP |
|||
); |
|||
|
|||
INSERT |
|||
OR IGNORE INTO position (id, point_name, point_code, x, y, z) |
|||
VALUES (1,'玻片1位置', 'slide_position1', 18.08, 0, 101.2), |
|||
(2,'玻片2位置', 'slide_position2', 45.08, 0, 101.2), |
|||
(3,'玻片3位置', 'slide_position3', 72.08, 0, 101.2), |
|||
(4,'玻片4位置', 'slide_position4', 99.08, 0, 101.2), |
|||
(5,'废液桶位置', 'waste_liquor', 173.08, 75, 70); |
|||
-- 插入 position 表数据 |
|||
INSERT OR IGNORE INTO position (id, point_name, point_code, x, y, z) |
|||
VALUES |
|||
(1, '玻片1位置', 'slide_position1', 18.08, 0, 101.2), |
|||
(2, '玻片2位置', 'slide_position2', 45.08, 0, 101.2), |
|||
(3, '玻片3位置', 'slide_position3', 72.08, 0, 101.2), |
|||
(4, '玻片4位置', 'slide_position4', 99.08, 0, 101.2), |
|||
(5, '废液桶位置', 'waste_liquor', 173.08, 75, 70); |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue