From 614ff877d7dc97bf923e5782d04b222e38ae62b6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 09 八月 2024 09:34:51 +0800
Subject: [PATCH] 图像监测接口优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
index e5fd435..dd863ca 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -1,9 +1,14 @@
package com.ycl.platform.domain.form;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
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.YwPoint;
+import enumeration.general.ImportantTagEnum;
+import enumeration.general.ProvinceTagEnum;
+import jakarta.validation.constraints.NotEmpty;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -14,6 +19,8 @@
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 杩愮淮鐐逛綅琛ㄥ崟
@@ -30,25 +37,36 @@
@ApiModelProperty("鐐逛綅鍚嶇О")
private String pointName;
- @NotNull(message = "鐐逛綅寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
- private LocalDateTime startTime;
-
- @NotNull(message = "鐐逛綅缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
- private LocalDateTime endTime;
-
@NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
-// @NotBlank(message = "杩愮淮鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @NotNull(message = "鐩戠閮ㄩ棬涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐩戠閮ㄩ棬")
+ private Long deptId;
+
+ @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
+ private ProvinceTagEnum provinceTag;
+ @ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
+ private ImportantTagEnum importantTag;
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
-// @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
-// @ApiModelProperty("澶囨敞")
-// private String remark;
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("璁惧缂栧彿")
+ private String serialNumber;
+
+ @TableField("reason")
+ private String reason;
+
+ @TableField("recovery")
+ private Integer recovery;
+
+ @TableField("recovery_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date recoveryTime;
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
--
Gitblit v1.8.0