diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java index e2e968a5..04cebec2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java @@ -31,16 +31,11 @@ public class FeiBaSetEntity extends BaseEntity { /** * 类型 */ - @Schema(description = "类型") + @Schema(description = "名称") private String fsType; /** * */ @Schema(description = "") - private Short bindQty; - /** - * 名称 - */ - @Schema(description = "名称") - private String fsName; + private Short bindQty = 0; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java index 9d4ffb2b..1cd5ded4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java @@ -31,17 +31,12 @@ public class RackSetEntity extends BaseEntity { /** * 类型 */ - @Schema(description = "类型") + @Schema(description = "名称") private String rsType; /** * */ @Schema(description = "") private Short bindQty; - /** - * 名称 - */ - @Schema(description = "名称") - private String rsName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java index 3297155d..21c8851f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java @@ -66,11 +66,5 @@ public class FeiBaSetExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("") private Short bindQty; - /** - * 名称 - */ - @ColumnWidth(20) - @ExcelProperty("名称") - private String fsName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java index a7109f57..79a5f3bf 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java @@ -66,11 +66,5 @@ public class RackSetExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("") private Short bindQty; - /** - * 名称 - */ - @ColumnWidth(20) - @ExcelProperty("名称") - private String rsName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java index ec4ff859..828adfee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java @@ -68,7 +68,7 @@ public class FeiBaSetController extends BladeController { @Operation(summary = "分页", description = "") @Parameters({ @Parameter(name = "fsCode", description = "飞靶编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "fsName", description = "飞靶名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "fsType", description = "飞靶名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "status", description = "飞靶状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")), }) public R> page(@Parameter(hidden = true) FeiBaSetEntity feiBaSet, Query query) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java index 7e00d93e..dcbc949e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java @@ -93,7 +93,7 @@ public class RackSetController extends BladeController { @Operation(summary = "分页", description = "") @Parameters({ @Parameter(name = "rsCode", description = "挂具编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "rsName", description = "挂具名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "rsType", description = "挂具名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "status", description = "挂具状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")), }) public R> page(@Parameter(hidden = true) RackSetEntity rackSet, Query query) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml index d5fab31b..50ea72c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml @@ -15,7 +15,6 @@ - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml index 55902b8e..c58c50df 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml @@ -15,7 +15,6 @@ - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java index 8f497f29..281ae9a2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java @@ -35,7 +35,7 @@ public class FeiBaSetServiceImpl extends BaseServiceImpl