From de2f7fe7f23ac338b7d6997a74b3715e9b1a7cc7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 十一月 2023 10:56:18 +0800
Subject: [PATCH] 1、行政区保存功能，修改自动加上行政区级别，及删除标志 2、单点登录中增加了获得所有组织机构的功能，及增加组织机构枚举类型 3、增加农户实体、农户类型实体、分水口实体等相关功能
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
index 9a0eb2c..51f8bd6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
@@ -6,32 +6,79 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.po.BaseEntity;
import com.dy.pipIrrGlobal.util.DistrictLevel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import lombok.*;
+import org.hibernate.validator.constraints.Length;
import java.util.List;
+/**
+ * 琛屾斂鍖哄垝瀹炰綋
+ */
@TableName(value="ba_district", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
+@Schema(name = "琛屾斂鍖哄垝瀹炰綋")
public class BaDistrict implements BaseEntity {
public static final long serialVersionUID = 202311081046001L;
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Long id ;
- public Long supperId;//涓婄骇琛屾斂鍖篒D
+ /**
+ * 涓婄骇琛屼笅鍖篒D
+ */
+ @Schema(description = "涓婄骇瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long supperId;
+ /**
+ * 琛屾斂鍖哄悕绉�
+ */
+ @Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "琛屾斂鍖哄悕绉颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Length(message = "琛屾斂鍖哄悕绉颁笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String name;
+ /**
+ * 琛屾斂鍖虹紪鍙�
+ */
+ @Schema(description = "琛屾斂鍖虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "琛屾斂鍖虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Max(message = "琛屾斂鍖虹紪鍙蜂笉澶т簬99", value = 99)
+ @Min(message = "琛屾斂鍖虹紪鍙蜂笉灏忎簬0",value = 0)
+ public String num;
+
+ /**
+ * 琛屾斂鍖虹骇鍒�
+ */
+ @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "琛屾斂鍖虹骇鍒笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Max(message = "琛屾斂鍖虹骇鍒笉澶т簬10", value = 10)
+ @Min(message = "琛屾斂鍖虹骇鍒笉灏忎簬0",value = 0)
public DistrictLevel level;
+ /**
+ * 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
+ */
+ @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Deleted deleted;
+
+ /**
+ * 涓嬬骇琛屾斂鍖洪泦鍚�
+ */
@TableField(exist = false)
public List<BaDistrict> subDistricts ;
--
Gitblit v1.8.0