记录仪曲线设置检索条件增加

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;

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;
 
 }

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<RecorderCompareEntity> recorderCompareEntities;
 }

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<IPage<RecorderCompareVO>> page(@Parameter(hidden = true) RecorderCompareEntity recorderCompare, Query query) {
         IPage<RecorderCompareEntity> pages = recorderCompareService.selectRecorderComparePage(Condition.getPage(query), recorderCompare);

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java

@@ -36,7 +36,8 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl<RecorderCompareM
         // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件
         wrapper.like(Objects.nonNull(recorderCompare.getCode()), RecorderCompareEntity::getCode, recorderCompare.getCode())
                 .like(Objects.nonNull(recorderCompare.getName()), RecorderCompareEntity::getName, recorderCompare.getName())
-                .like(Objects.nonNull(recorderCompare.getShowName()), RecorderCompareEntity::getShowName, recorderCompare.getShowName());
+                .like(Objects.nonNull(recorderCompare.getShowName()), RecorderCompareEntity::getShowName, recorderCompare.getShowName())
+                .eq(Objects.nonNull(recorderCompare.getCrcX()), RecorderCompareEntity::getCrcX, recorderCompare.getCrcX());
 
         // 3. 执行分页查询
         return baseMapper.selectPage(page, wrapper);