From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
index 37884d4..ea6ef9e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
@@ -3,11 +3,13 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -15,8 +17,8 @@
/**
* @author ZhuBaoMin
- * @date 2023-12-29 9:59
- * @LastEditTime 2023-12-29 9:59
+ * @date 2024-01-15 16:51
+ * @LastEditTime 2024-01-15 16:51
* @Description
*/
@@ -32,7 +34,7 @@
@AllArgsConstructor
@Schema(name = "鎺у埗鍣ㄥ疄浣�")
public class PrController implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517001L;
/**
* 涓婚敭
@@ -43,54 +45,74 @@
private Long id;
/**
- * 缂栧彿
+ * 鍙栨按鍙D
*/
- @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotBlank(message = "鎺у埗鍣ㄧ紪鍙蜂笉鑳戒负绌�")
- @Length(message = "鎺у埗鍣ㄧ紪鍙蜂笉澶т簬{max}瀛�",max = 25)
- private String code;
+ @Schema(description = "鍙栨按鍙D", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍙栨按鍙D涓嶈兘涓虹┖")
+ private Long intakeId;
+
+ /**
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鎺у埗鍣ㄥ湴鍧�涓嶈兘涓虹┖")
+ private String rtuAddr;
/**
* 閫氳鍗忚
*/
@Schema(description = "閫氳鍗忚", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
- @Length(message = "閫氳鍗忚涓嶅ぇ浜巤max}瀛�",max = 25)
private String protocol;
/**
- * 鍦ㄧ嚎鐘舵��;1-鍦ㄧ嚎锛�2-绂荤嚎
+ * 閫氳鍗忚鐗堟湰鍙�
*/
- @Schema(description = "鍦ㄧ嚎鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private Byte onlinestate;
+ @Schema(description = "鍗忚鐗堟湰鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鍗忚鐗堟湰鍙�")
+ public Integer protocolVersion;
/**
- * 鏈�杩戜笂鎶ユ椂闂�
+ * 鍙戠幇鏃ユ湡鏃堕棿
*/
- @Schema(description = "鏈�杩戜笂鎶ユ椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private Date reporttime;
+ @Schema(description = "鍙戠幇鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Date findDt;
+ /**
+ * 鏈烘瀯tag
+ */
+ @Schema(description = "鏈烘瀯tag", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鏈烘瀯tag涓嶈兘涓虹┖")
+ public String orgTag;
/**
* 娣诲姞鏂瑰紡;1-绯荤粺鑷姩锛�2-鎵嬪姩
*/
@Schema(description = "娣诲姞鏂瑰紡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private Byte addways;
+ private Byte addWays;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long operator;
/**
* 鎿嶄綔鏃堕棿
*/
@Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private Date operatedt;
+ private Date operateDt;
/**
* 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
*/
@Schema(description = "鍒犻櫎鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Byte deleted;
+
+
+ /////////////////////////////////////////
+ // 闈炴暟鎹簱灞炴��
+ /////////////////////////////////////////
+ @TableField(exist = false)
+ @Schema(description = "鍙栨按鍙ｇ紪鍙�")
+ public String intakeName ;
}
\ No newline at end of file
--
Gitblit v1.8.0