From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
index 95a5a34..254b036 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -1,19 +1,21 @@
package com.ycl.platform.domain.form;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.WorkOrder;
-import org.springframework.beans.BeanUtils;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
+import com.ycl.system.domain.group.Add;
+import com.ycl.system.domain.group.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 宸ュ崟琛ㄥ崟
@@ -26,7 +28,7 @@
@ApiModel(value = "WorkOrder琛ㄥ崟", description = "宸ュ崟琛ㄥ崟")
public class WorkOrderForm extends AbsForm {
- @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
+ // @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("宸ュ崟鍙�")
private String workOrderNo;
@@ -34,23 +36,35 @@
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
- @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @NotBlank(message = "宸ュ崟鏉ユ簮涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("宸ュ崟鏉ユ簮")
+ private String source;
+
+ @NotNull(message = "鐐逛綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("璁惧缂栧彿")
+ private String serialNumber;
+
+ @NotEmpty(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鏁呴殰绫诲瀷")
+ private List<String> errorType;
+
+ // @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮浜哄憳")
private Integer ywPeopleId;
- @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ // @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
private LocalDateTime ywHandleTime;
- @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ // @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮缁撴灉")
private String ywResult;
- @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ // @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鎯呭喌")
private String ywCondition;
- @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
+ // @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
private String ywCheckResult;
@@ -59,6 +73,7 @@
entity = new WorkOrder();
}
BeanUtils.copyProperties(form, entity);
+ entity.setErrorTypeList(form.getErrorType());
return entity;
}
--
Gitblit v1.8.0