diff --git a/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfLowcodeServiceImpl.java b/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfLowcodeServiceImpl.java index 8a00f0e1..fac7bef2 100644 --- a/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfLowcodeServiceImpl.java +++ b/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfLowcodeServiceImpl.java @@ -36,7 +36,8 @@ import static org.springblade.plugin.workflow.process.entity.WfNotice.Type.*; @Service public class WfLowcodeServiceImpl implements IWfLowcodeService { - @Autowired + ` + @Autowired` private RuntimeService runtimeService; @Autowired private IWfDeploymentFormService wfDeploymentFormService; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java index 5e1e4ce2..8bf0fdcb 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java @@ -50,11 +50,11 @@ public class RecorderCompareEntity extends BaseEntity { * 曲线X间隔 */ @Schema(description = "曲线X间隔") - private BigDecimal crcX; + private Integer crcX; /** * 曲线Y比例尺 */ @Schema(description = "曲线Y比例尺") - private BigDecimal crcY; + private Integer crcY; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java index 6d168d42..8fe07558 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java @@ -13,12 +13,12 @@ import java.util.List; @Data public class RecorderCompareSave { /** - * 化验含量 + * 记录仪cod */ private String code; /** - * 化验含量明细 + * 记录仪集合 */ private List recorderCompareEntities; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java index 439c12cd..fbb0f70c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java @@ -70,6 +70,7 @@ public class RecorderCompareController extends BladeController { @Parameter(name = "code", description = "设备编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "name", description = "参数名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "showName", description = "参数显示名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "crcX", description = "曲线X间隔", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")), }) public R> page(@Parameter(hidden = true) RecorderCompareEntity recorderCompare, Query query) { IPage pages = recorderCompareService.selectRecorderComparePage(Condition.getPage(query), recorderCompare); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java index 593e9af8..7bc4fef1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java @@ -36,7 +36,8 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl