From 1572276448e0ce56cddb7c7e715f056cef761c37 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 14 Jan 2025 14:22:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A2=AB=E6=A3=80=E8=AE=BE=E5=A4=87-?= =?UTF-8?q?=E5=87=BA=E5=8E=82=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/gather/device/device/pojo/param/PqDevParam.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java index 35ea37ca..5143b0e7 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java +++ b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java @@ -55,8 +55,8 @@ public class PqDevParam { private String manufacturer; @ApiModelProperty(value = "出厂日期", required = true) - @NotBlank(message = DevValidMessage.CREATEDATETIME_NOT_NULL) - @DateTimeStrValid(format = "yyyy-MM-dd", message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR) + //@NotBlank(message = DevValidMessage.CREATEDATETIME_NOT_NULL) + //@DateTimeStrValid(format = "yyyy-MM-dd", message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR) private String createDate; @ApiModelProperty(value = "设备序列号", required = true) From 3f6af6576387e370b9f27ea492f21518a37875d0 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 14 Jan 2025 14:34:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A2=AB=E6=A3=80=E8=AE=BE=E5=A4=87-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A1=E5=88=92=E7=BB=91=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E8=A2=AB=E6=A3=80=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/gather/device/device/pojo/param/PqDevParam.java | 2 +- .../gather/device/device/service/impl/PqDevServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java index 5143b0e7..83cf0b9e 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java +++ b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java @@ -190,7 +190,7 @@ public class PqDevParam { private String manufacturer; @ApiModelProperty("检测计划ID") - @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR) + //@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR) private String planId; @ApiModelProperty("检测状态列表") diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java index b8b62f5f..05afe7f0 100644 --- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java +++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java @@ -249,8 +249,11 @@ public class PqDevServiceImpl extends ServiceImpl implements @Override public List listByPlanId(PqDevParam.QueryParam param) { + if(StrUtil.isBlank(param.getPlanId())){ + return Collections.emptyList(); + } List pqDevList = this.lambdaQuery() - .eq(StrUtil.isNotBlank(param.getPlanId()), PqDev::getPlanId, param.getPlanId()) + .eq(PqDev::getPlanId, param.getPlanId()) .like(StrUtil.isNotBlank(param.getName()), PqDev::getName, param.getName()) .in(ObjectUtil.isNotEmpty(param.getCheckStateList()), PqDev::getCheckState, param.getCheckStateList()) .eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult())