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/BaUser.java                        |    2 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java                             |   33 +
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml                            |  114 ++++
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeSv.java   |  106 ++++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml                                  |    4 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java                      |  165 ++++++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml                                |  208 ++++++++
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java     |    8 
 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java                      |   22 
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml                                |  164 ++++++
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java                 |   22 
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java         |    4 
 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml                                          |    0 
 pipIrr-platform/文档/增加一个应用机构.docx                                                                          |    0 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java                       |    4 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java             |   81 +++
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClientType.java                  |   42 +
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java                    |    4 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java                      |  125 +++++
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/QueryVo.java            |   31 +
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java             |    4 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java                 |   49 +
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/QueryVo.java        |   20 
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java       |    2 
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientSv.java           |    4 
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java |  224 ++++++++
 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java                        |    1 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java                        |    2 
 28 files changed, 1,434 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java
new file mode 100644
index 0000000..604fcd0
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java
@@ -0,0 +1,22 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaClient;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BaClientMapper extends BaseMapper<BaClient> {
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(BaClient record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(BaClient record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java
new file mode 100644
index 0000000..3235f90
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java
@@ -0,0 +1,81 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaClientType;
+import com.dy.pipIrrGlobal.pojoBa.BaRole;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface BaClientTypeMapper extends BaseMapper<BaClientType> {
+    /**
+     * 閫氳繃ID寰楀埌绫诲瀷鍚嶇О
+     * @param id
+     * @return
+     */
+    String selectNameById(Long id) ;
+
+    /**
+     * 寰楀埌鍏ㄩ儴瀹炰綋
+     * @return 鍏ㄩ儴瀹炰綋
+     */
+    List<BaClientType> selectAll() ;
+
+    /**
+     * 閫氳繃ID寰楀埌瀹炰綋
+     * @param id 瀹炰綋ID
+     * @return 瀹炰綋
+     */
+    BaClientType selectByPrimaryKey(Long id) ;
+
+
+    /**
+     * 鏌ヨ鎬绘暟
+     * @param params 鏌ヨ鏉′欢
+     * @return 鎬绘暟
+     */
+    Long selectTotal(Map<?, ?> params) ;
+
+    /**
+     * 鍒嗛〉鏌ヨ涓�浜�
+     * @param params 鏌ヨ鏉′欢
+     * @return 瀹炰綋闆嗗悎
+     */
+    List<BaClientType> selectSome(Map<?, ?> params) ;
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(BaClientType record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(BaClientType record);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(BaClientType record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(BaClientType record);
+
+    /**
+     * 閫氳繃ID鍒犻櫎
+     * @param id
+     */
+    void deleteByPrimaryKey(Long id) ;
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
new file mode 100644
index 0000000..a0a09d6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
@@ -0,0 +1,49 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.dy.pipIrrGlobal.pojoBa.BaDivide;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BaDivideMapper {
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(BaDivide record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(BaDivide record);
+
+    /**
+     * select by primary key
+     * @param id primary key
+     * @return object by primary key
+     */
+    BaDivide selectByPrimaryKey(Long id);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(BaDivide record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(BaDivide record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
index 385b88c..c3637fc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
@@ -37,14 +37,14 @@
      */
     @Schema(description = "鐗囧尯鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "鐗囧尯鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    @Length(message = "鐗囧尯鍚嶇О涓嶅ぇ浜巤max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 1, max = 25)
+    @Length(message = "鐗囧尯鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
     public String name;
 
     /**
      * 璐熻矗浜�
      */
     @Schema(description = "鐗囧尯璐熻矗浜�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @Length(message = "鐗囧尯璐熻矗浜哄鍚嶄笉澶т簬{max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 1, max = 25)
+    @Length(message = "鐗囧尯璐熻矗浜哄鍚嶄笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
     public String header;
 
     /**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java
new file mode 100644
index 0000000..fb9273d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java
@@ -0,0 +1,165 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+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.mybatis.envm.Deleted;
+import com.dy.common.mybatis.envm.Disabled;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 鍐滄埛瀹炰綋
+ */
+@TableName(value="ba_client", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍐滄埛瀹炰綋")
+public class BaClient implements BaseEntity {
+
+    public static final long serialVersionUID = 202311141539001L;
+
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Long id ;
+
+    /**
+     * 澶栭敭锛屾寚鍚戣鏀垮尯
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄥ幙ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄥ幙涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long countyId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戣鏀垮尯
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄩ晣ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄩ晣涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long townId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戣鏀垮尯
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄦ潙ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄦ潙涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long villageId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戠墖鍖�
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄧ墖鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄧ墖鍖轰笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long blockId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戝垎姘存埧
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄥ垎姘存埧ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄥ垎姘存埧涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long divideId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戝啘鎴风被鍨�
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鍐滄埛绫诲瀷ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鍐滄埛绫诲瀷涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long typeId;
+
+    /**
+     * 濮撳悕
+     */
+    @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.NOT_REQUIRED)
+    public Integer num;
+
+    /**
+     * 鎵嬫満鍙�
+     */
+    @Schema(description = "鍐滄埛鎵嬫満鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鍐滄埛鎵嬫満鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    @Length(message = "鍐滄埛鎵嬫満鍙峰繀椤粄max}浣嶆暟鎹�", min = 11, max = 11)
+    public String phone;
+
+    /**
+     * 韬唤璇佸彿
+     */
+    @Schema(description = "鍐滄埛韬唤璇佸彿", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鍐滄埛韬唤璇佸彿涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    @Length(message = "鍐滄埛韬唤璇佸彿蹇呴』{max}浣嶆暟鎹�", min = 18, max = 18)
+    public String idcard;
+
+    /**
+     * 绉嶆闈㈢Н
+     */
+    @Schema(description = "鍐滄埛绉嶆闈㈢Н", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double area;
+
+    /**
+     * 鍘垮悕绉�+闀囧悕绉�+鏉戝悕绉帮紝涓嶅彲濉啓锛岃嚜鍔ㄧ敓鎴�
+     */
+    //@Schema(description = "鍘垮悕绉�+闀囧悕绉�+鏉戝悕绉�")
+    public String district;
+
+    /**
+     * 琛楅亾+闂ㄧ墝鍙�
+     */
+    @Schema(description = "琛楅亾+闂ㄧ墝鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "鍦板潃涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
+    public String address;
+
+    /**
+     * 澶囨敞
+     */
+    @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
+    public String remark;
+
+
+    /**
+     * 鏄惁绂佺敤 0:鍚�,1:鏄�
+     */
+    @Schema(description = "鏄惁绂佺敤", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Max(message = "鏄惁绂佺敤鍙兘0鎴�1", value = 1)
+    @Min(message = "鏄惁绂佺敤鍙兘0鎴�1",value = 0)
+    public Disabled disabled;
+
+    /**
+     * 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄�  1琛ㄧず鍒犻櫎.
+     */
+    @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Deleted deleted;
+
+    @TableField(exist = false)
+    @Schema(description = "鎵�鍦ㄧ墖鍖哄悕绉帮紝鍙湪鏌ヨ涓湁鏁�")
+    public String blockName ;
+
+    @TableField(exist = false)
+    @Schema(description = "鎵�灞炲啘鎴风被鍨嬪悕绉帮紝鍙湪鏌ヨ涓湁鏁�")
+    public String typeName ;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClientType.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClientType.java
new file mode 100644
index 0000000..b58c063
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClientType.java
@@ -0,0 +1,42 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+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.NotEmpty;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 鍐滄埛绫诲瀷瀹炰綋
+ */
+@TableName(value="ba_client", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍐滄埛绫诲瀷瀹炰綋")
+public class BaClientType implements BaseEntity {
+
+    public static final long serialVersionUID = 202311141553001L;
+
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Long id ;
+
+    /**
+    * 鍐滄埛绫诲瀷鍚嶇О
+    */
+    @Schema(description = "鍐滄埛绫诲瀷鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鍐滄埛绫诲瀷鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    @Length(message = "鍐滄埛绫诲瀷鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
+    public String name;
+
+}
\ No newline at end of file
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 e9930da..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
@@ -49,7 +49,7 @@
      */
     @Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "琛屾斂鍖哄悕绉颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    @Length(message = "琛屾斂鍖哄悕绉颁笉澶т簬{max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 1, max = 25)
+    @Length(message = "琛屾斂鍖哄悕绉颁笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
     public String name;
 
     /**
@@ -64,7 +64,7 @@
     /**
      * 琛屾斂鍖虹骇鍒�
      */
-    @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @NotNull(message = "琛屾斂鍖虹骇鍒笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
     @Max(message = "琛屾斂鍖虹骇鍒笉澶т簬10", value = 10)
     @Min(message = "琛屾斂鍖虹骇鍒笉灏忎簬0",value = 0)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java
new file mode 100644
index 0000000..d57e95e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java
@@ -0,0 +1,125 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+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.NotEmpty;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 鍒嗘按鍙ｅ疄浣�
+ */
+@TableName(value="ba_divide", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍒嗘按鍙ｅ疄浣�")
+public class BaDivide implements BaseEntity {
+
+    public static final long serialVersionUID = 202311141539001L;
+
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Long id ;
+
+    /**
+     * 澶栭敭锛屾寚鍚戣鏀垮尯
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄥ幙ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄥ幙涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long countyId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戣鏀垮尯
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄩ晣ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄩ晣涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long townId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戣鏀垮尯
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄦ潙ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄦ潙涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long villageId;
+
+    /**
+     * 澶栭敭锛屾寚鍚戠墖鍖�
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @Schema(description = "鎵�鍦ㄧ墖鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鎵�鍦ㄧ墖鍖轰笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public Long blockId;
+
+    /**
+     * 鍒嗘按鍙ｅ悕绉版垨缂栧彿
+     */
+    @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.NOT_REQUIRED)
+    public String villages;
+
+    /**
+    * 瑕嗙洊闈㈢Н锛堝钩鏂瑰叕閲岋級
+    */
+    @Schema(description = "瑕嗙洊闈㈢Н锛堝钩鏂瑰叕閲岋級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double area;
+
+    /**
+    * 璐熻矗浜�
+    */
+    @Schema(description = "璐熻矗浜�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "璐熻矗浜轰笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
+    public String header;
+
+    /**
+    * 鑱旂郴鐢佃瘽
+    */
+    @Schema(description = "鑱旂郴鐢佃瘽", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    @Length(message = "鑱旂郴鐢佃瘽蹇呴』{max}浣嶆暟鎹�", min = 11, max = 11)
+    public String phone;
+
+    /**
+    * 缁忓害
+    */
+    @Schema(description = "缁忓害", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double lng;
+
+    /**
+    * 绾害
+    */
+    @Schema(description = "绾害", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Double lat;
+
+    /**
+    * 澶囨敞
+    */
+    @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
+    public String remark;
+
+    /**
+    * 鍒犻櫎鏍囧織
+    */
+    @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    public Byte deleted;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
index 9c87042..742e247 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
@@ -40,7 +40,7 @@
      */
     @Schema(description = "鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    @Length(message = "鍚嶇О涓嶅ぇ浜巤max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 2, max = 25)
+    @Length(message = "鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 25)
     public String name ;
 
     /**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index fa40e54..561b660 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -59,7 +59,7 @@
      */
     @Schema(description = "濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "濮撳悕涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    @Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楃锛屼笉灏忎簬{min}瀛楃", min = 2, max = 25)
+    @Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 25)
     public String name;
 
     /**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
new file mode 100644
index 0000000..4b344a6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
@@ -0,0 +1,33 @@
+package com.dy.pipIrrGlobal.util;
+
+
+public enum Org {
+
+    Ym("ym", "鍏冭皨"),
+    Pj("pj", "鐗囪闀�") ;
+
+    public String tag ;
+    public String name ;
+
+    Org(String tag, String name){
+        this.tag = tag ;
+        this.name = name ;
+    }
+
+    public String getTag() {
+        return this.tag ;
+    }
+
+    public String getName() {
+        return this.name ;
+    }
+
+    public static Org get(String tag){
+        if(tag.equals(Ym.tag)){
+            return Ym ;
+        }else if(tag.equals(Pj.tag)){
+            return Pj ;
+        }
+        return null ;
+    }
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
similarity index 100%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/init-config.xml
rename to pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
new file mode 100644
index 0000000..c195457
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaClientMapper">
+  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaClient">
+    <!--@mbg.generated-->
+    <!--@Table ba_client-->
+    <result column="id" jdbcType="BIGINT" property="id" />
+    <result column="countyId" jdbcType="BIGINT" property="countyId" />
+    <result column="townId" jdbcType="BIGINT" property="townId" />
+    <result column="villageId" jdbcType="BIGINT" property="villageId" />
+    <result column="blockId" jdbcType="BIGINT" property="blockId" />
+    <result column="divideId" jdbcType="BIGINT" property="divideId" />
+    <result column="typeId" jdbcType="BIGINT" property="typeId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="num" jdbcType="INTEGER" property="num" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="idCard" jdbcType="VARCHAR" property="idcard" />
+    <result column="area" jdbcType="FLOAT" property="area" />
+    <result column="district" jdbcType="VARCHAR" property="district" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="disabled" jdbcType="TINYINT" property="disabled" />
+    <result column="deleted" jdbcType="TINYINT" property="deleted" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, countyId, townId, villageId, blockId, divideId, typeId, `name`, num, phone, idCard, area, district,address, remark,
+    disabled, deleted
+  </sql>
+  <sql id="part_Column_List">
+    <!--@mbg.generated-->
+    id, countyId, townId, villageId, blockId, divideId, typeId, `name`, num, phone, idCard, area, district,address, remark,
+    disabled
+  </sql>
+
+  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+    <!--@mbg.generated-->
+    insert into ba_client (id, countyId, townId, villageId, blockId, divideId,
+      typeId, `name`, num, phone, 
+      idCard, area, district, address,
+      remark, disabled, deleted
+      )
+    values (#{id,jdbcType=BIGINT}, #{countyId,jdbcType=BIGINT},
+      #{townId,jdbcType=BIGINT}, #{villageId,jdbcType=BIGINT},
+      #{blockId,jdbcType=BIGINT}, #{divideId,jdbcType=BIGINT}, #{typeId,jdbcType=BIGINT},
+      #{name,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
+      #{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
+      #{area,jdbcType=FLOAT}, #{district,jdbcType=VARCHAR},
+      #{address,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},
+      #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+      #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+    <!--@mbg.generated-->
+    insert into ba_client
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="countyId != null">
+        countyId,
+      </if>
+      <if test="townId != null">
+        townId,
+      </if>
+      <if test="villageId != null">
+        villageId,
+      </if>
+      <if test="divideId != null">
+        divideId,
+      </if>
+     <if test="blockId != null">
+        blockId,
+      </if>
+      <if test="typeId != null">
+        typeId,
+      </if>
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="num != null">
+        num,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="idcard != null">
+        idCard,
+      </if>
+      <if test="area != null">
+        area,
+      </if>
+      <if test="district != null">
+        district,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
+      <if test="deleted != null">
+        deleted,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="countyId != null">
+        #{countyId,jdbcType=BIGINT},
+      </if>
+      <if test="townId != null">
+        #{townId,jdbcType=BIGINT},
+      </if>
+      <if test="villageId != null">
+        #{villageId,jdbcType=BIGINT},
+      </if>
+      <if test="divideId != null">
+        #{divideId,jdbcType=BIGINT},
+      </if>
+     <if test="blockId != null">
+        #{blockId,jdbcType=BIGINT},
+      </if>
+      <if test="typeId != null">
+        #{typeId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="num != null">
+        #{num,jdbcType=INTEGER},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="idcard != null">
+        #{idcard,jdbcType=VARCHAR},
+      </if>
+      <if test="area != null">
+        #{area,jdbcType=FLOAT},
+      </if>
+      <if test="district != null">
+        #{district,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="disabled != null">
+        #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+      </if>
+      <if test="deleted != null">
+        #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
new file mode 100644
index 0000000..62336f1
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaClientTypeMapper">
+  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaClientType">
+    <!--@mbg.generated-->
+    <!--@Table ba_client_type-->
+    <result column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `name`
+  </sql>
+
+  <select id="selectNameById" parameterType="long" resultType="string">
+    select name
+    from ba_client_type
+    where id=#{id, jdbcType=BIGINT}
+  </select>
+
+  <select id="selectAll" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ba_client_type
+  </select>
+
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from ba_client_type
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+
+  <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
+    select
+    count(*)
+    from ba_client_type
+    <trim prefix="where" suffixOverrides="and">
+      <if test="name != null">
+        name like concat('%', #{name}, '%')
+      </if>
+    </trim>
+  </select>
+
+  <select id="selectSome" parameterType="java.util.Map" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ba_client_type
+    <trim prefix="where" suffixOverrides="and">
+      <if test="name != null">
+        name like concat('%', #{name}, '%')
+      </if>
+    </trim>
+    order by id DESC
+    <trim prefix="limit " >
+      <if test="start != null and count != null">
+        #{start}, #{count}
+      </if>
+    </trim>
+  </select>
+
+  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
+    <!--@mbg.generated-->
+    insert into ba_client_type (id, `name`)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR})
+  </insert>
+
+  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
+    <!--@mbg.generated-->
+    insert into ba_client_type
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        `name`,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+
+
+  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
+    update ba_role
+    <set>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
+    update ba_role
+    set `name` = #{name,jdbcType=VARCHAR},
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from ba_client_type
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
new file mode 100644
index 0000000..ed7f77c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaDivideMapper">
+  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+    <!--@mbg.generated-->
+    <!--@Table ba_divide-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="countyId" jdbcType="BIGINT" property="countyid" />
+    <result column="townId" jdbcType="BIGINT" property="townid" />
+    <result column="villageId" jdbcType="BIGINT" property="villageid" />
+    <result column="blockId" jdbcType="BIGINT" property="blockid" />
+    <result column="villages" jdbcType="VARCHAR" property="villages" />
+    <result column="area" jdbcType="FLOAT" property="area" />
+    <result column="header" jdbcType="VARCHAR" property="header" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="lng" jdbcType="DOUBLE" property="lng" />
+    <result column="lat" jdbcType="DOUBLE" property="lat" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="deleted" jdbcType="TINYINT" property="deleted" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `name`, countyId, townId, villageId, blockId, villages, area, `header`, phone, 
+    lng, lat, remark, deleted
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from ba_divide
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from ba_divide
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+    <!--@mbg.generated-->
+    insert into ba_divide (id, `name`, countyId, 
+      townId, villageId, blockId, 
+      villages, area, `header`, 
+      phone, lng, lat, remark, 
+      deleted)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{countyid,jdbcType=BIGINT}, 
+      #{townid,jdbcType=BIGINT}, #{villageid,jdbcType=BIGINT}, #{blockid,jdbcType=BIGINT}, 
+      #{villages,jdbcType=VARCHAR}, #{area,jdbcType=FLOAT}, #{header,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{lng,jdbcType=DOUBLE}, #{lat,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR}, 
+      #{deleted,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+    <!--@mbg.generated-->
+    insert into ba_divide
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="countyid != null">
+        countyId,
+      </if>
+      <if test="townid != null">
+        townId,
+      </if>
+      <if test="villageid != null">
+        villageId,
+      </if>
+      <if test="blockid != null">
+        blockId,
+      </if>
+      <if test="villages != null">
+        villages,
+      </if>
+      <if test="area != null">
+        area,
+      </if>
+      <if test="header != null">
+        `header`,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="lng != null">
+        lng,
+      </if>
+      <if test="lat != null">
+        lat,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="deleted != null">
+        deleted,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="countyid != null">
+        #{countyid,jdbcType=BIGINT},
+      </if>
+      <if test="townid != null">
+        #{townid,jdbcType=BIGINT},
+      </if>
+      <if test="villageid != null">
+        #{villageid,jdbcType=BIGINT},
+      </if>
+      <if test="blockid != null">
+        #{blockid,jdbcType=BIGINT},
+      </if>
+      <if test="villages != null">
+        #{villages,jdbcType=VARCHAR},
+      </if>
+      <if test="area != null">
+        #{area,jdbcType=FLOAT},
+      </if>
+      <if test="header != null">
+        #{header,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="lng != null">
+        #{lng,jdbcType=DOUBLE},
+      </if>
+      <if test="lat != null">
+        #{lat,jdbcType=DOUBLE},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+    <!--@mbg.generated-->
+    update ba_divide
+    <set>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="countyid != null">
+        countyId = #{countyid,jdbcType=BIGINT},
+      </if>
+      <if test="townid != null">
+        townId = #{townid,jdbcType=BIGINT},
+      </if>
+      <if test="villageid != null">
+        villageId = #{villageid,jdbcType=BIGINT},
+      </if>
+      <if test="blockid != null">
+        blockId = #{blockid,jdbcType=BIGINT},
+      </if>
+      <if test="villages != null">
+        villages = #{villages,jdbcType=VARCHAR},
+      </if>
+      <if test="area != null">
+        area = #{area,jdbcType=FLOAT},
+      </if>
+      <if test="header != null">
+        `header` = #{header,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="lng != null">
+        lng = #{lng,jdbcType=DOUBLE},
+      </if>
+      <if test="lat != null">
+        lat = #{lat,jdbcType=DOUBLE},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        deleted = #{deleted,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+    <!--@mbg.generated-->
+    update ba_divide
+    set `name` = #{name,jdbcType=VARCHAR},
+      countyId = #{countyid,jdbcType=BIGINT},
+      townId = #{townid,jdbcType=BIGINT},
+      villageId = #{villageid,jdbcType=BIGINT},
+      blockId = #{blockid,jdbcType=BIGINT},
+      villages = #{villages,jdbcType=VARCHAR},
+      area = #{area,jdbcType=FLOAT},
+      `header` = #{header,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      lng = #{lng,jdbcType=DOUBLE},
+      lat = #{lat,jdbcType=DOUBLE},
+      remark = #{remark,jdbcType=VARCHAR},
+      deleted = #{deleted,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index d66269c..878688d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -105,7 +105,7 @@
   </insert>
 
 
-  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
     update ba_role
     <set>
       <if test="name != null">
@@ -118,7 +118,7 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
     update ba_role
     set `name` = #{name,jdbcType=VARCHAR},
      deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java
new file mode 100644
index 0000000..e0bb7bd
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java
@@ -0,0 +1,4 @@
+package com.dy.pipIrrBase.client;
+
+public class ClientCtrl {
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientSv.java
new file mode 100644
index 0000000..ffe5a8e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientSv.java
@@ -0,0 +1,4 @@
+package com.dy.pipIrrBase.client;
+
+public class ClientSv {
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/QueryVo.java
new file mode 100644
index 0000000..d830886
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/QueryVo.java
@@ -0,0 +1,31 @@
+package com.dy.pipIrrBase.client;
+
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "鍐滄埛鏌ヨ鏉′欢")
+public class QueryVo extends QueryConditionVo {
+
+    public Long countyId ;
+    public Long townId ;
+    public Long villageId ;
+
+
+    @Schema(description = "鍐滄埛濮撳悕")
+    public String name;
+
+    @Schema(description = "鍐滄埛缂栧彿")
+    public String num;
+
+    @Schema(description = "鍐滄埛鐢佃瘽")
+    public String phone;
+}
+
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java
new file mode 100644
index 0000000..5196939
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java
@@ -0,0 +1,224 @@
+package com.dy.pipIrrBase.clientType;
+
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.mybatis.envm.Deleted;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrBase.role.RoleSv;
+import com.dy.pipIrrBase.user.QueryVo;
+import com.dy.pipIrrGlobal.pojoBa.BaClientType;
+import com.dy.pipIrrGlobal.pojoBa.BaClientType;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Tag(name = "鍐滄埛绫诲瀷绠＄悊", description = "鍐滄埛绫诲瀷澧炲垹鏀规煡绛夋搷浣�")
+@RestController
+@RequestMapping(path="role")
+@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class ClientTypeCtrl {
+
+    private ClientTypeSv sv ;
+
+    @Autowired
+    private void setSv(ClientTypeSv sv){
+        this.sv = sv ;
+    }
+
+    /**
+     * 瀹㈡埛绔姹傚緱鍒版墍鏈夊啘鎴风被鍨嬫暟鎹�
+     * @return 鎵�鏈夊啘鎴风被鍨嬫暟鎹�
+     */
+    @Operation(summary = "鑾峰緱鍏ㄩ儴鍐滄埛绫诲瀷", description = "杩斿洖鍏ㄩ儴鍐滄埛绫诲瀷鏁版嵁")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖鍏ㄩ儴鍐滄埛绫诲瀷鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = BaClientType.class))}
+            )
+    })
+    @GetMapping(path = "all")
+    @SsoAop("-1")
+    public BaseResponse<QueryResultVo<List<BaClientType>>> all(){
+        try {
+            QueryResultVo<List<BaClientType>> res = this.sv.selectAll() ;
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鏌ヨ鍐滄埛绫诲瀷寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 瀹㈡埛绔姹傚緱鍒颁竴椤靛啘鎴风被鍨嬫暟鎹�
+     * @return 鎵�鏈夊啘鎴风被鍨嬫暟鎹�
+     */
+    @Operation(summary = "鑾峰緱涓�椤靛啘鎴风被鍨�", description = "杩斿洖涓�椤靛啘鎴风被鍨嬫暟鎹�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖涓�椤靛啘鎴风被鍨嬫暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = BaClientType.class))}
+            )
+    })
+    @PostMapping(path = "some", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @SsoAop("-1")
+    public BaseResponse<QueryResultVo<List<BaClientType>>> some(@Parameter(description = "鏌ヨform琛ㄥ崟鏁版嵁", required = true) @Valid QueryVo vo){
+        try {
+            QueryResultVo<List<BaClientType>> res = this.sv.selectSome(vo) ;
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鏌ヨ鍐滄埛绫诲瀷寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 寰楀埌涓�涓啘鎴风被鍨嬫暟鎹�
+     * @return 涓�涓啘鎴风被鍨嬫暟鎹�
+     */
+    @Operation(summary = "涓�涓啘鎴风被鍨�", description = "寰楀埌涓�涓啘鎴风被鍨嬫暟鎹�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖涓�涓啘鎴风被鍨嬫暟鎹紙BaseResponse.content:{}锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = BaClientType.class))}
+            )
+    })
+    @GetMapping(path = "one")
+    @SsoAop("-1")
+    public BaseResponse<BaClientType> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
+        return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
+    }
+
+    /**
+     * 淇濆瓨鍐滄埛绫诲瀷
+     * @param po 淇濆瓨鍐滄埛绫诲瀷form琛ㄥ崟瀵硅薄
+     * @return 鏄惁鎴愬姛
+     */
+    @Operation(summary = "淇濆瓨鍐滄埛绫诲瀷", description = "鎻愪氦鍐滄埛绫诲瀷鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇濆瓨")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = Boolean.class))}
+            )
+    })
+    @PostMapping(path = "save", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @SsoAop("-1")//@SsoAop(power = "-1")
+    public BaseResponse<Boolean> save(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid BaClientType po, @Parameter(hidden = true) BindingResult bindingResult){
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        po.id = null ;
+        int count;
+        try {
+            count = this.sv.save(po);
+        } catch (Exception e) {
+            log.error("淇濆瓨鍐滄埛绫诲瀷寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+        if(count <= 0){
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+        }else{
+            return BaseResponseUtils.buildSuccess(true) ;
+        }
+    }
+
+    /**
+     * 缂栬緫淇敼鍐滄埛绫诲瀷
+     * @param po 淇濆瓨鍐滄埛绫诲瀷form琛ㄥ崟瀵硅薄
+     * @return 鏄惁鎴愬姛
+     */
+    @Operation(summary = "缂栬緫淇敼鍐滄埛绫诲瀷", description = "鎻愪氦鍐滄埛绫诲瀷鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇敼")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = Boolean.class))}
+            )
+    })
+    @PostMapping(path = "update", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @SsoAop("-1")//@SsoAop(power = "-1")
+    public BaseResponse<Boolean> update(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid BaClientType po, @Parameter(hidden = true) BindingResult bindingResult){
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        if(po.id == null){
+            return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
+        }
+        int count;
+        try {
+            count = this.sv.update(po);
+        } catch (Exception e) {
+            log.error("淇濆瓨鍐滄埛绫诲瀷寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+        if(count <= 0){
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+        }else{
+            return BaseResponseUtils.buildSuccess(true) ;
+        }
+    }
+
+
+    /**
+     * 鍒犻櫎鍐滄埛绫诲瀷
+     * @param id 鍐滄埛绫诲瀷ID
+     * @return 鏄惁鎴愬姛
+     */
+    @Operation(summary = "鍒犻櫎鍐滄埛绫诲瀷", description = "鎻愪氦鍐滄埛绫诲瀷ID锛岃繘琛岄�昏緫鍒犻櫎")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = Boolean.class))}
+            )
+    })
+    @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+    @SsoAop("-1")//@SsoAop(power = "-1")
+    public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
+        if(id == null){
+            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+        }
+        int count;
+        try {
+            count = this.sv.delete(id);
+        } catch (Exception e) {
+            log.error("淇濆瓨鍐滄埛绫诲瀷寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+        if(count <= 0){
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+        }else{
+            return BaseResponseUtils.buildSuccess(true) ;
+        }
+    }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeSv.java
new file mode 100644
index 0000000..e6bf1e8
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeSv.java
@@ -0,0 +1,106 @@
+package com.dy.pipIrrBase.clientType;
+
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrBase.user.QueryVo;
+import com.dy.pipIrrGlobal.daoBa.BaClientTypeMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaClientType;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class ClientTypeSv {
+
+    private BaClientTypeMapper dao;
+
+    @Autowired
+    private void setDao(BaClientTypeMapper dao){
+        this.dao = dao;
+    }
+
+
+    /**
+     * 寰楀埌鎵�鏈夊啘鎴风被鍨�
+     * @return 鎵�鏈夊啘鎴风被鍨嬮泦鍚�
+     */
+    public QueryResultVo<List<BaClientType>> selectAll(){
+        QueryResultVo<List<BaClientType>> rsVo = new QueryResultVo<>() ;
+        rsVo.obj = this.dao.selectAll() ;
+        return rsVo ;
+    }
+
+
+    /**
+     * 寰楀埌涓�涓啘鎴风被鍨�
+     * @param id 鍐滄埛绫诲瀷ID
+     * @return 鍐滄埛绫诲瀷瀹炰綋
+     */
+    public BaClientType selectById(Long id){
+        return this.dao.selectById(id) ;
+    }
+
+
+    /**
+     * 寰楀埌涓�涓敤鎴�
+     * @param vo 鏌ヨ鏉′欢鍊煎璞�
+     * @return 鐢ㄦ埛瀹炰綋
+     */
+    @SuppressWarnings("unchecked")
+    public QueryResultVo<List<BaClientType>> selectSome(QueryVo vo){
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+        Long itemTotal = this.dao.selectTotal(params) ;
+
+        QueryResultVo<List<BaClientType>> rsVo = new QueryResultVo<>() ;
+        rsVo.pageSize = vo.pageSize ;
+        rsVo.pageCurr = vo.pageCurr ;
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = this.dao.selectSome(params) ;
+
+        return rsVo ;
+    }
+
+    /**
+     * 淇濆瓨瀹炰綋
+     * @param po 瀹炰綋
+     * @return 褰卞搷璁板綍鏁伴噺
+     */
+    @Transactional
+    public int save(BaClientType po){
+        return this.dao.insertSelective(po) ;
+    }
+
+    /**
+     * 淇濆瓨淇敼瀹炰綋
+     * @param po 瀹炰綋
+     * @return 褰卞搷璁板綍鏁伴噺
+     */
+    @Transactional
+    public int update(BaClientType po){
+        return this.dao.updateByPrimaryKeySelective(po) ;
+    }
+
+
+    /**
+     * 淇濆瓨淇敼瀹炰綋
+     * @param id 瀹炰綋ID
+     * @return 褰卞搷璁板綍鏁伴噺
+     */
+    @Transactional
+    public int delete(Long id){
+        //int count = this.dao.deleteLogicById(id) ;
+        //閫昏緫鍒犻櫎锛屾墍浠ヤ笉瀹為檯鍒犻櫎鍏跺叧鑱旂殑鏉冮檺
+        //if(count > 0){
+        //    this.rolePrivDao.deleteByRoleId(id) ;
+        //}
+        //return count ;
+        return 0 ;// this.dao.deleteLogicById(id) ;
+    }
+
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/QueryVo.java
new file mode 100644
index 0000000..ae06259
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/QueryVo.java
@@ -0,0 +1,20 @@
+package com.dy.pipIrrBase.clientType;
+
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "鍐滄埛绫诲瀷鏌ヨ鏉′欢")
+public class QueryVo extends QueryConditionVo {
+
+    @Schema(description = "鍐滄埛绫诲瀷鍚嶇О")
+    public String name;
+}
+
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index 27dd8d3..f28ab04 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -1,6 +1,7 @@
 package com.dy.pipIrrBase.district;
 
 import com.dy.common.aop.SsoAop;
+import com.dy.common.mybatis.envm.Deleted;
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.ResultCodeMsg;
@@ -119,6 +120,13 @@
         BaDistrict po = DistrictVoMapper.INSTANCT.convert(vo);
         int count;
         try {
+            BaDistrict supperPo = this.sv.selectById(po.supperId) ;
+            if(supperPo == null){
+                return BaseResponseUtils.buildFail("鍑洪敊锛屾湭寰楀埌涓婄骇琛屾斂鍖�") ;
+            }else{
+                po.level = DistrictLevel.get((byte)(supperPo.level.code + 1)) ;
+            }
+            po.deleted = Deleted.NO ;
             count = this.sv.save(po);
         } catch (Exception e) {
             log.error("淇濆瓨琛屾斂鍖哄紓甯�", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java
index a542141..39ca1cf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java
@@ -18,7 +18,7 @@
     @Schema(description = "琛屾斂鍖哄疄浣搃d", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     public Long id;
 
-    @Schema(description = "涓婄骇琛屾斂鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Schema(description = "涓婄骇琛屾斂鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED)
     public Long supperId ;
 
     @Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
index 61a0f2a..f2a02b1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
@@ -52,7 +52,7 @@
                             schema = @Schema(implementation = BaRole.class))}
             )
     })
-    @PostMapping(path = "all")
+    @GetMapping(path = "all")
     @SsoAop("-1")
     public BaseResponse<QueryResultVo<List<BaRole>>> all(){
         try {
@@ -65,7 +65,7 @@
     }
 
     /**
-     * 瀹㈡埛绔姹傚緱鍒版墍鏈夎鑹叉暟鎹�
+     * 瀹㈡埛绔姹傚緱鍒颁竴椤佃鑹叉暟鎹�
      * @return 鎵�鏈夎鑹叉暟鎹�
      */
     @Operation(summary = "鑾峰緱涓�椤佃鑹�", description = "杩斿洖涓�椤佃鑹叉暟鎹�")
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index bc7b78e..699d5bc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -7,6 +7,8 @@
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.ResultCodeMsg;
 import com.dy.pipIrrGlobal.pojoBa.BaUser;
+import com.dy.pipIrrGlobal.util.DistrictLevel;
+import com.dy.pipIrrGlobal.util.Org;
 import com.mysql.cj.util.StringUtils;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,6 +27,8 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -54,6 +58,24 @@
 
 
     /**
+     * 瀹㈡埛绔姹傚緱鍒版墍鏈夌粍缁囨満鏋�
+     * @return 鎵�鏈夌粍缁囨満鏋勬暟鎹�
+     */
+    @Operation(summary = "鎵�鏈夌粍缁囨満鏋�", description = "杩斿洖鎵�鏈夋墍鏈夌粍缁囨満鏋勬暟鎹�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖鎵�鏈夌粍缁囨満鏋勬暟鎹紙BaseResponse.content:[ { \"tag\":\"ym\", \"name\":\"鍏冭皨\" }, { \"tag\":\"鐗囪\", \"name\":\"鐗囪闀嘰" }]锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = Org.class))}
+            )
+    })
+    @GetMapping(path = "allOrg")
+    public BaseResponse<List<Org>> allOrg(){
+        List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
+        return BaseResponseUtils.buildSuccess(list);
+    }
+    /**
      * 瀹㈡埛绔姹傜敤鎴风櫥褰曪紝瀹㈡埛绔彁浜son鏁版嵁
      * @param vo 鐢ㄦ埛鐧诲綍鍊煎璞�
      * @param bindingResult 杈撳叆楠岃瘉
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
index f6cad3e..e1ddefe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
@@ -28,6 +28,7 @@
         this.baPrivilegeMapper = baPrivilegeMapper ;
     }
 
+
     /**
      * 闇�瑕丅aUserMapper.xml
      * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
index f8dbac1..49e3ff3 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
Binary files differ

--
Gitblit v1.8.0